Loading common/drawpanel.cpp +1 −1 Original line number Diff line number Diff line Loading @@ -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 Loading kicad/minizip/CMakeLists.txt +2 −2 Original line number Diff line number Diff line Loading @@ -8,8 +8,8 @@ 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) find_path(ZLIB_INCLUDE_DIR zlib.h 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} Loading pcbnew/class_board.cpp +6 −0 Original line number Diff line number Diff line Loading @@ -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() ); Loading @@ -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 ); Loading pcbnew/class_drc_item.cpp +1 −0 Original line number Diff line number Diff line Loading @@ -30,6 +30,7 @@ #include "common.h" #include "pcbnew.h" #include "drc_stuff.h" wxString DRC_ITEM::GetErrorText() const { Loading pcbnew/class_marker_pcb.h +1 −2 Original line number Diff line number Diff line Loading @@ -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 { Loading Loading
common/drawpanel.cpp +1 −1 Original line number Diff line number Diff line Loading @@ -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 Loading
kicad/minizip/CMakeLists.txt +2 −2 Original line number Diff line number Diff line Loading @@ -8,8 +8,8 @@ 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) find_path(ZLIB_INCLUDE_DIR zlib.h 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} Loading
pcbnew/class_board.cpp +6 −0 Original line number Diff line number Diff line Loading @@ -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() ); Loading @@ -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 ); Loading
pcbnew/class_drc_item.cpp +1 −0 Original line number Diff line number Diff line Loading @@ -30,6 +30,7 @@ #include "common.h" #include "pcbnew.h" #include "drc_stuff.h" wxString DRC_ITEM::GetErrorText() const { Loading
pcbnew/class_marker_pcb.h +1 −2 Original line number Diff line number Diff line Loading @@ -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 { Loading