removed in drawpanel an erroneous change (was made only for a test, not for...

removed in drawpanel an erroneous change (was made only for a test, not for commit). drc code cleaning. cmakelist.txt changes in minizip.

common/drawpanel.cpp

@@ -866,7 +866,7 @@ void WinEDA_DrawPanel::DrawGrid( wxDC* DC )
     wxMemoryDC tmpDC;
     wxBitmap tmpBM( 1, screenSize.y );
     tmpDC.SelectObject( tmpBM );
-    GRSetColorPen( &tmpDC, WHITE/*g_DrawBgColor*/ );
+    GRSetColorPen( &tmpDC, g_DrawBgColor );
     tmpDC.DrawLine( 0, 0, 0, screenSize.y-1 );        // init background
     GRSetColorPen( &tmpDC, m_Parent->GetGridColor() );
     for( jj = 0; ; jj++ )   // draw grid points

kicad/minizip/CMakeLists.txt

@@ -8,8 +8,10 @@ else(ZLIB_FOUND)
     # include files are in ${wxWidgets_ROOT_DIR}/src/zlib
     # and the corresponding library is libwxzlib-<version>.a (like libwxzlib-2.8.a)
     # and we try to use it
-    find_path(ZLIB_INCLUDE_DIR zlib.h PATHS ${wxWidgets_ROOT_DIR}/src/zlib/ DOC "location of zlib include files")
-    set(ZLIB_LIBRARIES ${wxWidgets_ROOT_DIR}/lib/libwxzlib-2.8.a)
+    # Unfortunately, we have no way to know exactlty the path of zlib.h becuase this file
+    # is in wxWidgets sources, not in wxWidgets include path.
+    find_path(ZLIB_INCLUDE_DIR  PATHS ${wxWidgets_ROOT_DIR}/../src/zlib/ ${wxWidgets_ROOT_DIR}/src/zlib/ DOC "location of zlib include files")
+	find_file(ZLIB_LIBRARIES NAMES ${wxWidgets_LIB_DIR}/libwxzlib-2.8.a ZLIB_LIBRARIES NAMES ${wxWidgets_LIB_DIR}/libwxzlib-2.9.a libwxzlib.a PATHS ${wxWidgets_ROOT_DIR}/lib/ PATH_SUFFIXES gcc_dll DOC "location of wxzlib library file")
 endif(ZLIB_FOUND)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}

pcbnew/class_board.cpp

@@ -869,10 +869,13 @@ void BOARD::DisplayInfo( WinEDA_DrawFrame* frame )
     frame->ClearMsgPanel();
 
     int viasCount = 0;
+    int trackSegmentsCount = 0;
     for( BOARD_ITEM* item = m_Track; item; item = item->Next() )
     {
         if( item->Type() == TYPE_VIA )
             viasCount++;
+        else
+            trackSegmentsCount++;
     }
 
     txt.Printf( wxT( "%d" ), GetPadsCount() );
@@ -881,6 +884,9 @@ void BOARD::DisplayInfo( WinEDA_DrawFrame* frame )
     txt.Printf( wxT( "%d" ), viasCount );
     frame->AppendMsgPanel( _( "Vias" ), txt, DARKGREEN );
 
+    txt.Printf( wxT( "%d" ), trackSegmentsCount );
+    frame->AppendMsgPanel( _( "trackSegm" ), txt, DARKGREEN );
+
     txt.Printf( wxT( "%d" ), GetNodesCount() );
     frame->AppendMsgPanel( _( "Nodes" ), txt, DARKCYAN );
 

pcbnew/class_drc_item.cpp

@@ -30,6 +30,7 @@
 #include "common.h"
 
 #include "pcbnew.h"
+#include "drc_stuff.h"
 
 wxString DRC_ITEM::GetErrorText() const
 {

pcbnew/class_marker_pcb.h

@@ -6,8 +6,7 @@
 #define CLASS_MARKER_PCB_H
 
 #include "base_struct.h"
-
-#include "drc_stuff.h"
+#include "class_marker_base.h"
 
 class MARKER_PCB : public BOARD_ITEM, public MARKER_BASE
 {

pcbnew/edit_track_width.cpp

@@ -11,6 +11,7 @@
 #include "pcbnew.h"
 #include "wxPcbStruct.h"
 #include "class_board_design_settings.h"
+#include "drc_stuff.h"
 #include "protos.h"
 
 

pcbnew/editrack-part2.cpp

@@ -10,6 +10,7 @@
 #include "pcbnew.h"
 #include "wxPcbStruct.h"
 #include "class_board_design_settings.h"
+#include "drc_stuff.h"
 
 #include "protos.h"
 

pcbnew/move_or_drag_track.cpp

@@ -11,6 +11,7 @@
 #include "pcbnew.h"
 #include "wxPcbStruct.h"
 #include "trigo.h"
+#include "drc_stuff.h"
 
 #include "drag.h"
 #include "pcbnew_id.h"
@@ -274,7 +275,7 @@ static void Show_Drag_Track_Segment_With_Cte_Slope( WinEDA_DrawPanel* panel,
         {
             // Get the segment connected to the start point
             if( ii >= 0 )
-                tSegmentToStart = g_DragSegmentList[ii].m_Segm; 
+                tSegmentToStart = g_DragSegmentList[ii].m_Segm;
         }
     }
 

pcbnew/zones_by_polygon.cpp

@@ -15,6 +15,7 @@
 #include "pcbnew_id.h"
 #include "protos.h"
 #include "zones_functions_for_undo_redo.h"
+#include "drc_stuff.h"
 
 bool s_Verbose = false;       // false if zone outline diags must not be shown
 

pcbnew/zones_test_and_combine_areas.cpp

@@ -11,11 +11,11 @@
 #include "common.h"
 #include "confirm.h"
 #include "pcbnew.h"
+#include "drc_stuff.h"
 
-bool bDontShowSelfIntersectionArcsWarning;
-bool bDontShowSelfIntersectionWarning;
-bool bDontShowIntersectionArcsWarning;
-bool bDontShowIntersectionWarning;
+static bool bDontShowSelfIntersectionArcsWarning;
+static bool bDontShowSelfIntersectionWarning;
+static bool bDontShowIntersectionArcsWarning;
 
 
 /** Function AddArea