code cleaning

include/pcbstruct.h

@@ -129,7 +129,7 @@ class RATSNEST_ITEM;
 
 
 /* main window classes : */
-#include "wxPcbStruct.h"
+#include "wxBasePcbFrame.h"
 
 /* Class to handle a board */
 #include "class_board.h"

pcbnew/attribut.cpp

@@ -7,6 +7,7 @@
 #include "class_drawpanel.h"
 
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "autorout.h"
 #include "protos.h"
 

pcbnew/automove.cpp

@@ -12,6 +12,7 @@
 #include "confirm.h"
 #include "kicad_string.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "autorout.h"
 #include "cell.h"
 #include "id.h"

pcbnew/autoplac.cpp

@@ -10,6 +10,7 @@
 #include "class_drawpanel.h"
 #include "confirm.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "autorout.h"
 #include "zones.h"
 #include "cell.h"

pcbnew/autorout.cpp

@@ -8,6 +8,7 @@
 #include "class_drawpanel.h"
 #include "confirm.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "autorout.h"
 #include "cell.h"
 #include "zones.h"

pcbnew/block.cpp

@@ -11,6 +11,7 @@
 #include "block_commande.h"
 
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "autorout.h"
 #include "pcbplot.h"
 #include "trigo.h"

pcbnew/block_module_editor.cpp

@@ -12,6 +12,7 @@
 #include "block_commande.h"
 
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "autorout.h"
 #include "pcbplot.h"
 #include "trigo.h"

pcbnew/board_undo_redo.cpp

@@ -7,6 +7,7 @@
 #include "class_drawpanel.h"
 
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 
 /* Functions to undo and redo edit commands.
  *  commmands to undo are stored in CurrentScreen->m_UndoList

pcbnew/build_BOM_from_board.cpp

@@ -7,6 +7,7 @@
 #include "kicad_string.h"
 #include "gestfich.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 
 #include <wx/listimpl.cpp>
 

pcbnew/class_track.cpp

@@ -854,7 +854,7 @@ void TRACK::DisplayInfo( WinEDA_DrawFrame* frame )
 {
     wxString msg;
     int      text_pos;
-    BOARD*   board = ( (WinEDA_PcbFrame*) frame )->GetBoard();
+    BOARD*   board = ( (WinEDA_BasePcbFrame*)frame)->GetBoard();
 
 #ifdef RATSNET_DEBUG
     DbgDisplayTrackInfos( this );

pcbnew/class_zone.cpp

@@ -883,7 +883,7 @@ void ZONE_CONTAINER::DisplayInfo( WinEDA_DrawFrame* frame )
     {
         if( GetNet() >= 0 )
         {
-            NETINFO_ITEM* equipot = ( (WinEDA_PcbFrame*) frame )->GetBoard()->FindNet( GetNet() );
+            NETINFO_ITEM* equipot = ( (WinEDA_BasePcbFrame*) frame )->GetBoard()->FindNet( GetNet() );
 
             if( equipot )
                 msg = equipot->GetNetname();

pcbnew/clean.cpp

@@ -11,6 +11,7 @@
 #include "class_drawpanel.h"
 
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "autorout.h"
 #include "protos.h"
 

pcbnew/controle.cpp

@@ -8,6 +8,7 @@
 #include "common.h"
 #include "class_drawpanel.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "protos.h"
 
 #include "id.h"

pcbnew/cotation.cpp

@@ -6,7 +6,7 @@
 #include "common.h"
 #include "class_drawpanel.h"
 #include "pcbnew.h"
-#include "protos.h"
+#include "wxPcbStruct.h"
 
 /* Routines Locales */
 static void Exit_EditCotation( WinEDA_DrawPanel* Panel, wxDC* DC );

pcbnew/cross-probing.cpp

@@ -15,6 +15,7 @@
 #include "appl_wxstruct.h"
 #include "common.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "eda_dde.h"
 #include "id.h"
 #include "collectors.h"

pcbnew/deltrack.cpp

@@ -4,11 +4,13 @@
 /*********************************************/
 
 #include "fctsys.h"
-#include "gr_basic.h"
+
 #include "common.h"
 #include "class_drawpanel.h"
 #include "confirm.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
+
 #include "protos.h"
 
 

pcbnew/dialog_copper_zones.cpp

@@ -16,6 +16,7 @@
 #include "confirm.h"
 #include "PolyLine.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "trigo.h"
 #include "autorout.h"
 #include "zones.h"

pcbnew/dialog_design_rules.cpp

@@ -12,6 +12,7 @@
 
 #include "confirm.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 
 #include "id.h"
 #include "dialog_design_rules.h"

pcbnew/dialog_display_options.cpp

@@ -10,6 +10,7 @@
 #include "class_drawpanel.h"
 #include "confirm.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 
 #include "id.h"
 

pcbnew/dialog_drc.cpp

@@ -10,6 +10,7 @@
 #include "wxstruct.h"
 #include "dialog_drc.h"
 #include "common.h"
+#include "wxPcbStruct.h"
 
 /* class DIALOG_DRC_CONTROL: a dialog to set DRC parameters (clearance, min cooper size)
  * and run DRC tests

pcbnew/dialog_freeroute_exchange.cpp

@@ -20,6 +20,7 @@
 #include "common.h"
 #include "gestfich.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 
 #include "dialog_freeroute_exchange.h"
 

pcbnew/dialog_general_options.cpp

@@ -11,6 +11,7 @@
 #include "class_drawpanel.h"
 #include "confirm.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 
 #include "id.h"
 

pcbnew/dialog_netlist.cpp

@@ -7,6 +7,7 @@
 #include "fctsys.h"
 #include "common.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 
 
 #include "dialog_netlist.h"

pcbnew/dialog_orient_footprints.cpp

@@ -19,6 +19,7 @@
 #include "confirm.h"
 #include "kicad_string.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 
 #include "dialog_orient_footprints.h"
 

pcbnew/dialog_pcb_text_properties.cpp

@@ -7,6 +7,7 @@
 #include "common.h"
 #include "class_drawpanel.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "drawtxt.h"
 #include "confirm.h"
 

pcbnew/dialog_pcbnew_config_libs_and_paths.cpp

@@ -15,6 +15,7 @@
 #include "confirm.h"
 #include "gestfich.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 
 #include "dialog_pcbnew_config_libs_and_paths.h"
 

pcbnew/dialog_print_using_printer.cpp

@@ -176,7 +176,7 @@ void DIALOG_PRINT_USING_PRINTER::OnInitDialog( wxInitDialogEvent& event )
         msg = _( "Layer" );
         msg << wxT( " " ) << ii + 1;
 #else
-        msg = ( (WinEDA_PcbFrame*) m_Parent )->GetBoard()->GetLayerName( ii );
+        msg = ( (WinEDA_BasePcbFrame*) m_Parent )->GetBoard()->GetLayerName( ii );
 #endif
         m_BoxSelectLayer[ii] = new wxCheckBox( this, -1, msg );
 

pcbnew/dialog_track_options.cpp

@@ -10,6 +10,7 @@
 #include "fctsys.h"
 #include "common.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 
 #include "dialog_track_options.h"
 

pcbnew/drc.cpp

@@ -31,8 +31,9 @@
 
 #include "fctsys.h"
 #include "common.h"
-#include "pcbnew.h"
 #include "class_drawpanel.h"
+#include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "autorout.h"
 #include "trigo.h"
 #include "gestfich.h"

pcbnew/edgemod.cpp

@@ -10,14 +10,13 @@
  */
 
 #include "fctsys.h"
-#include "gr_basic.h"
 #include "trigo.h"
 #include "common.h"
 #include "class_drawpanel.h"
 #include "confirm.h"
 
 #include "pcbnew.h"
-#include "protos.h"
+#include "wxPcbStruct.h"
 
 
 /* Routines Locales */

pcbnew/edit.cpp

@@ -11,6 +11,7 @@
 #include "id.h"
 
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "autorout.h"
 #include "protos.h"
 

pcbnew/edit_pcb_text.cpp

@@ -8,7 +8,7 @@
 #include "class_drawpanel.h"
 
 #include "pcbnew.h"
-#include "protos.h"
+#include "wxPcbStruct.h"
 
 /* Local functions */
 static void Move_Texte_Pcb( WinEDA_DrawPanel* panel, wxDC* DC, bool erase );

pcbnew/edit_track_width.cpp

@@ -4,13 +4,12 @@
 /***************************************************************/
 
 #include "fctsys.h"
-#include "gr_basic.h"
 #include "common.h"
 #include "class_drawpanel.h"
 #include "confirm.h"
 
 #include "pcbnew.h"
-#include "autorout.h"
+#include "wxPcbStruct.h"
 #include "protos.h"
 
 /* Routines Locales */

pcbnew/editedge.cpp

@@ -5,12 +5,13 @@
 /******************************************************/
 
 #include "fctsys.h"
-#include "gr_basic.h"
 #include "common.h"
 #include "class_drawpanel.h"
 #include "confirm.h"
 
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
+
 #include "protos.h"
 
 /* Routines Locales */

pcbnew/editmod.cpp

@@ -9,7 +9,7 @@
 #include "confirm.h"
 #include "gestfich.h"
 #include "pcbnew.h"
-#include "autorout.h"
+#include "wxPcbStruct.h"
 #include "trigo.h"
 #include "bitmaps.h"
 #include "3d_struct.h"

pcbnew/editrack-part2.cpp

@@ -4,12 +4,13 @@
 /*******************************/
 
 #include "fctsys.h"
-#include "gr_basic.h"
 #include "common.h"
 #include "class_drawpanel.h"
 #include "confirm.h"
 
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
+
 #include "protos.h"
 
 

pcbnew/editrack.cpp

@@ -4,17 +4,16 @@
 /*******************************/
 
 #include "fctsys.h"
-#include "gr_basic.h"
 #include "common.h"
 #include "class_drawpanel.h"
 
 #include "pcbnew.h"
-#include "autorout.h"
+#include "wxPcbStruct.h"
 
-#include "protos.h"
 #include "drc_stuff.h"
 #include "trigo.h"
 
+#include "protos.h"
 
 /* Routines Locales */
 static void Exit_Editrack( WinEDA_DrawPanel* panel, wxDC* DC );

pcbnew/export_gencad.cpp

@@ -10,12 +10,9 @@
 #include "appl_wxstruct.h"
 
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "trigo.h"
 
-#include "bitmaps.h"
-#include "protos.h"
-#include "id.h"
-
 bool        CreateHeaderInfoData( FILE* file, WinEDA_PcbFrame* frame );
 static void CreateTracksInfoData( FILE* file, BOARD* pcb );
 static void CreateBoardSection( FILE* file, BOARD* pcb );

pcbnew/files.cpp

@@ -9,6 +9,7 @@
 #include "kicad_string.h"
 #include "gestfich.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "protos.h"
 #include "id.h"
 

pcbnew/find.cpp

@@ -17,6 +17,7 @@
 #include "confirm.h"
 #include "kicad_string.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 
 #include "id.h"
 

pcbnew/gen_modules_placefile.cpp

@@ -12,6 +12,7 @@
 #include "kicad_string.h"
 #include "gestfich.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "trigo.h"
 #include "appl_wxstruct.h"
 

pcbnew/gendrill.cpp

@@ -5,8 +5,6 @@
 #include "fctsys.h"
 #include "appl_wxstruct.h"
 
-using namespace std;
-
 #include <vector>
 
 #include "common.h"
@@ -16,6 +14,7 @@ using namespace std;
 #include "kicad_string.h"
 #include "gestfich.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "pcbplot.h"
 #include "macros.h"
 #include "appl_wxstruct.h"

pcbnew/hotkeys.cpp

@@ -5,6 +5,7 @@
 #include "fctsys.h"
 #include "common.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "id.h"
 #include "class_drawpanel.h"
 #include "confirm.h"

pcbnew/initpcb.cpp

@@ -8,7 +8,7 @@
 #include "class_drawpanel.h"
 #include "confirm.h"
 #include "pcbnew.h"
-#include "autorout.h"
+#include "wxPcbStruct.h"
 
 #include "protos.h"
 

pcbnew/ioascii.cpp

@@ -12,6 +12,7 @@
 #include "kicad_string.h"
 
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 
 #ifdef PCBNEW
 #include "autorout.h"

pcbnew/librairi.cpp

@@ -12,6 +12,7 @@
 #include "kicad_string.h"
 #include "gestfich.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "protos.h"
 
 /*

pcbnew/loadcmp.cpp

@@ -14,6 +14,7 @@
 #include "appl_wxstruct.h"
 
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "protos.h"
 
 class ModList

pcbnew/menubarmodedit.cpp

@@ -2,14 +2,11 @@
 /* menubarmodedit.cpp - creation du menu general de l'editeur de module*/
 /***********************************************************************/
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "fctsys.h"
 #include "common.h"
 
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 
 #include "bitmaps.h"
 #include "protos.h"

pcbnew/menubarpcb.cpp

@@ -5,6 +5,7 @@
 #include "appl_wxstruct.h"
 #include "common.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "bitmaps.h"
 #include "protos.h"
 #include "hotkeys.h"

pcbnew/mirepcb.cpp

@@ -3,12 +3,11 @@
 /*********************************************/
 
 #include "fctsys.h"
-#include "gr_basic.h"
 #include "common.h"
 #include "class_drawpanel.h"
 
 #include "pcbnew.h"
-#include "protos.h"
+#include "wxPcbStruct.h"
 
 
 /* Routines Locales */

pcbnew/modedit.cpp

@@ -14,6 +14,7 @@
 
 #include "3d_viewer.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "protos.h"
 
 #include "collectors.h"

pcbnew/modedit_onclick.cpp

@@ -2,16 +2,13 @@
 /* modedit_onclick.cpp  */
 /************************/
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "fctsys.h"
 #include "common.h"
 #include "class_drawpanel.h"
 #include "confirm.h"
 
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 
 #include "bitmaps.h"
 #include "protos.h"

pcbnew/modedit_undo_redo.cpp

@@ -7,7 +7,7 @@
 
 #include "common.h"
 #include "pcbnew.h"
-#include "id.h"
+#include "wxPcbStruct.h"
 
 #include "protos.h"
 

pcbnew/modeditoptions.cpp

@@ -9,22 +9,17 @@
 */
 
 #include "fctsys.h"
-#include "gr_basic.h"
 #include "common.h"
 #include "class_drawpanel.h"
 #include "confirm.h"
 
 #include "pcbnew.h"
-#include "pcbplot.h"
-#include "autorout.h"
+#include "wxPcbStruct.h"
 
 #include "id.h"
 
 #include "protos.h"
 
-/* Fonctions locales */
-
-/* variables locales */
 
 
 /***********************************************************************/

pcbnew/moduleframe.cpp

@@ -12,6 +12,7 @@
 #include "class_drawpanel.h"
 #include "confirm.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "bitmaps.h"
 #include "protos.h"
 #include "id.h"

pcbnew/modules.cpp

@@ -11,6 +11,7 @@
 #include "confirm.h"
 
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "trigo.h"
 
 #include "protos.h"

pcbnew/move_or_drag_track.cpp

@@ -4,13 +4,12 @@
 /****************************************************/
 
 #include "fctsys.h"
-#include "gr_basic.h"
 #include "common.h"
 #include "class_drawpanel.h"
 #include "confirm.h"
 
 #include "pcbnew.h"
-#include "autorout.h"
+#include "wxPcbStruct.h"
 #include "trigo.h"
 
 #include "drag.h"

pcbnew/muonde.cpp

@@ -12,6 +12,7 @@
 #include "kicad_string.h"
 #include "gestfich.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "protos.h"
 
 /* Fonctions locales */

pcbnew/muwave_command.cpp

@@ -7,6 +7,7 @@
 #include "class_drawpanel.h"
 #include "confirm.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 
 #include "id.h"
 

pcbnew/netlist.cpp

@@ -29,6 +29,7 @@
 #include "kicad_string.h"
 #include "gestfich.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 
 #include "dialog_netlist.h"
 

pcbnew/onleftclick.cpp

@@ -5,16 +5,13 @@
 /**************************************************************/
 
 #include "fctsys.h"
-#include "gr_basic.h"
 #include "common.h"
 #include "class_drawpanel.h"
 #include "confirm.h"
 #include "pcbnew.h"
-#include "autorout.h"
+#include "wxPcbStruct.h"
 
 #include "id.h"
-#include "protos.h"
-#include "eda_dde.h"
 
 
 

pcbnew/onrightclick.cpp

@@ -10,11 +10,12 @@
 #include "confirm.h"
 
 #include "pcbnew.h"
-#include "autorout.h"
+#include "wxPcbStruct.h"
+//#include "autorout.h"
 #include "id.h"
 #include "hotkeys.h"
 #include "collectors.h"
-#include "protos.h"
+//#include "protos.h"
 
 
 /* Bitmaps */

pcbnew/pcbcfg.cpp

@@ -11,6 +11,7 @@
 #include "confirm.h"
 #include "gestfich.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "pcbplot.h"
 #include "pcbcfg.h"
 #include "worksheet.h"

pcbnew/pcbframe.cpp

@@ -8,6 +8,7 @@
 #include "class_drawpanel.h"
 #include "confirm.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "collectors.h"
 #include "bitmaps.h"
 #include "protos.h"

pcbnew/pcbnew.cpp

@@ -11,6 +11,7 @@
 
 #include "common.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "plot_common.h"
 #include "gestfich.h"
 #include "pcbplot.h"

pcbnew/pcbplot.cpp

@@ -9,6 +9,7 @@
 #include "confirm.h"
 #include "gestfich.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "pcbplot.h"
 #include "worksheet.h"
 #include "id.h"

pcbnew/router.cpp

@@ -11,6 +11,7 @@
 #include "kicad_string.h"
 #include "gestfich.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "autorout.h"
 #include "zones.h"
 #include "cell.h"

pcbnew/set_color.cpp

@@ -5,17 +5,15 @@
 /*Set up the items and layer colors and show/no show options
  */
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma implementation "set_color.h"
-#endif
-
 #include "fctsys.h"
 #include "gr_basic.h"
 #include "common.h"
 #include "class_drawpanel.h"
 
 #include "pcbnew.h"
-#include "protos.h"
+#include "wxPcbStruct.h"
+
+//#include "protos.h"
 
 // temporary variable used to handle grid visibility:
 bool s_showGrid;

pcbnew/set_color.h

@@ -5,10 +5,6 @@
 #ifndef SET_COLOR_H
 #define SET_COLOR_H
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "set_color.cpp"
-#endif
-
 #include "wx/statline.h"
 
 class wxBoxSizer;

pcbnew/solve.cpp

@@ -11,11 +11,11 @@
 #include "confirm.h"
 
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "autorout.h"
 #include "zones.h"
 #include "protos.h"
 
-#include <fcntl.h>
 #include "cell.h"
 
 /* Routines definies ici : */

pcbnew/specctra_import.cpp

@@ -37,6 +37,7 @@
 #include "class_drawpanel.h"    // DrawPanel
 #include "confirm.h"            // DisplayError()
 #include "gestfich.h"           // EDA_FileSelector()
+#include "wxPcbStruct.h"
 
 
 

pcbnew/surbrill.cpp

@@ -9,7 +9,7 @@
 #include "kicad_string.h"
 
 #include "pcbnew.h"
-#include "protos.h"
+#include "wxPcbStruct.h"
 #include "collectors.h"
 
 

pcbnew/swap_layers.cpp

@@ -9,6 +9,7 @@
 #include "class_drawpanel.h"
 #include "confirm.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "protos.h"
 
 

pcbnew/tool_modedit.cpp

@@ -6,6 +6,7 @@
 
 #include "common.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 
 #include "protos.h"
 

pcbnew/tool_onrightclick.cpp

@@ -3,16 +3,13 @@
 /********************************************************************************/
 
 #include "fctsys.h"
-#include "gr_basic.h"
 #include "common.h"
 #include "confirm.h"
 #include "pcbnew.h"
-#include "autorout.h"
+#include "wxPcbStruct.h"
 
 #include "id.h"
 
-#include "protos.h"
-
 
 /*****************************************************************/
 void WinEDA_PcbFrame::ToolOnRightClick( wxCommandEvent& event )

pcbnew/tool_pcb.cpp

@@ -6,8 +6,7 @@
 
 #include "common.h"
 #include "pcbnew.h"
-
-#include "protos.h"
+#include "wxPcbStruct.h"
 
 #include "bitmaps.h"
 

pcbnew/tracepcb.cpp

@@ -16,7 +16,7 @@
 #include "class_drawpanel.h"
 
 #include "pcbnew.h"
-#include "autorout.h"
+#include "wxPcbStruct.h"
 #include "pcbplot.h"
 #include "protos.h"
 

pcbnew/via_edit.cpp

@@ -3,11 +3,11 @@
 /**********************************************/
 
 #include "fctsys.h"
-#include "gr_basic.h"
 #include "common.h"
 #include "class_drawpanel.h"
 #include "confirm.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "id.h"
 
 
@@ -105,7 +105,7 @@ void WinEDA_PcbFrame::Via_Edit_Control( wxDC* DC, int command_type, SEGVIA* via
         break;
 
     default:
-        DisplayError( this, wxT( "WinEDA_PcbFrame::Via_Edition() error: unknown command" ) );
+        wxMessageBox( wxT( "WinEDA_PcbFrame::Via_Edition() error: unknown command" ) );
         break;
     }
 

pcbnew/xchgmod.cpp

@@ -10,6 +10,7 @@
 #include "confirm.h"
 #include "kicad_string.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 
 #include "dialog_exchange_modules_base.h"
 

pcbnew/zone_filling_algorithm.cpp

@@ -9,6 +9,7 @@
 
 #include "common.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 
 #include "autorout.h"
 #include "zones.h"

pcbnew/zones_by_polygon.cpp

@@ -10,6 +10,7 @@
 #include "class_drawpanel.h"
 #include "confirm.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 #include "zones.h"
 #include "id.h"
 #include "protos.h"

pcbnew/zones_non_copper_type_functions.cpp

@@ -5,6 +5,7 @@
 #include "confirm.h"
 #include "common.h"
 #include "pcbnew.h"
+#include "wxPcbStruct.h"
 
 #include "zones.h"