More header file realignments to reduce recompiling and general code cleaning.

3d-viewer/3d_canvas.cpp

@@ -22,8 +22,8 @@
 #include "wx/clipbrd.h"
 
 #include "fctsys.h"
-#include "common.h"
 #include "id.h"
+#include "gestfich.h"
 
 #include "3d_viewer.h"
 #include "trackball.h"

3d-viewer/3d_class.cpp

@@ -11,8 +11,6 @@
 
 #include "fctsys.h"
 
-#include "common.h"
-
 #include "3d_struct.h"
 #include "3d_viewer.h"
 

3d-viewer/3d_draw.cpp

@@ -17,9 +17,10 @@
 #error Please set wxUSE_GLCANVAS to 1 in setup.h.
 #endif
 
-#include "common.h"
 #include "pcbstruct.h"
 #include "macros.h"
+#include "drawtxt.h"
+#include "confirm.h"
 
 #include "3d_viewer.h"
 #include "trackball.h"
@@ -460,7 +461,8 @@ static void Draw3dTextSegm( int x0, int y0, int xf, int yf )
     double endx   = xf * g_Parm_3D_Visu.m_BoardScale;
     double endy   = yf * g_Parm_3D_Visu.m_BoardScale;
 
-    Draw3D_FilledSegment( startx, -starty, endx, -endy, s_Text3DWidth, s_Text3DZPos );
+    Draw3D_FilledSegment( startx, -starty, endx, -endy,
+                          s_Text3DWidth, s_Text3DZPos );
 }
 
 
@@ -480,11 +482,9 @@ void Pcb3D_GLCanvas::Draw3D_DrawText( TEXTE_PCB* text )
     s_Text3DZPos  = g_Parm_3D_Visu.m_LayerZcoord[layer];
     s_Text3DWidth = text->m_Width * g_Parm_3D_Visu.m_BoardScale;
     glNormal3f( 0.0, 0.0, Get3DLayerSide( layer ) );
-    DrawGraphicText( NULL, NULL,
-                     text->m_Pos, (EDA_Colors) color, text->m_Text,
-                     text->m_Orient, text->m_Size,
-                     text->m_HJustify,
-                     text->m_VJustify,
+    DrawGraphicText( NULL, NULL, text->m_Pos, (EDA_Colors) color,
+                     text->m_Text, text->m_Orient, text->m_Size,
+                     text->m_HJustify, text->m_VJustify,
                      text->m_Width, text->m_Italic,
                      Draw3dTextSegm );
 }
@@ -668,7 +668,8 @@ void D_PAD::Draw3D( Pcb3D_GLCanvas* glcanvas )
     if( holeX && holeY )
     {
         SetGLColor( DARKGRAY );
-        Draw3D_FilledCylinder( drillx, -drilly, hole, g_Parm_3D_Visu.m_LayerZcoord[CMP_N], 0.0 );
+        Draw3D_FilledCylinder( drillx, -drilly, hole,
+                               g_Parm_3D_Visu.m_LayerZcoord[CMP_N], 0.0 );
     }
 
     glNormal3f( 0.0, 0.0, 1.0 ); // Normal is Z axis

3d-viewer/3d_frame.cpp

@@ -11,8 +11,7 @@
 
 
 #include "fctsys.h"
-
-#include <wx/colordlg.h>
+#include "appl_wxstruct.h"
 
 #if !wxUSE_GLCANVAS
 #error Please set wxUSE_GLCANVAS to 1 in setup.h.
@@ -25,6 +24,8 @@
 #include "3d_viewer.h"
 #include "trackball.h"
 
+#include <wx/colordlg.h>
+
 
 BEGIN_EVENT_TABLE( WinEDA3D_DrawFrame, wxFrame )
     EVT_TOOL_RANGE( ID_ZOOM_IN, ID_ZOOM_PAGE, WinEDA3D_DrawFrame::Process_Zoom )

3d-viewer/3d_read_mesh.cpp

@@ -10,10 +10,9 @@
 #endif
 
 #include "fctsys.h"
-
 #include "common.h"
 #include "macros.h"
-
+#include "kicad_string.h"
 
 #include "3d_struct.h"
 #include "3d_viewer.h"

CHANGELOG.txt

@@ -5,6 +5,14 @@ Started 2007-June-11
 Please add newer entries at the top, list the date and your name with
 email address.
 
+2009-Feb-04 UPDATE Wayne Stambaugh <stambaughw@verizon.net>
+================================================================================
+++All
+  * Refactor header files to reduce the number of files that need recompiled
+    when making changes to base classes.
+  * Move sine and cosine look up tables from trigo.h to trigo.cpp to avoid
+    multiple recompiles.
+
 2009-feb-01 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
 ================================================================================
 ++All:

CMakeModules/FindSubversion.cmake

@@ -85,7 +85,7 @@ IF(Subversion_SVN_EXECUTABLE)
       OUTPUT_STRIP_TRAILING_WHITESPACE)
 
     IF(NOT ${Subversion_svn_info_result} EQUAL 0)
-      MESSAGE(SEND_ERROR "Command \"${Subversion_SVN_EXECUTABLE} info ${dir}\" failed with output:\n${Subversion_svn_info_error}")
+      MESSAGE(STATUS "Command \"${Subversion_SVN_EXECUTABLE} info ${dir}\" failed with output:\n${Subversion_svn_info_error}")
     ELSE(NOT ${Subversion_svn_info_result} EQUAL 0)
 
       STRING(REGEX REPLACE "^(.*\n)?svn, version ([.0-9]+).*"
@@ -121,7 +121,7 @@ IF(Subversion_SVN_EXECUTABLE)
       OUTPUT_STRIP_TRAILING_WHITESPACE)
 
     IF(NOT ${Subversion_svn_log_result} EQUAL 0)
-      MESSAGE(SEND_ERROR "Command \"${Subversion_SVN_EXECUTABLE} log -r BASE ${dir}\" failed with output:\n${Subversion_svn_log_error}")
+      MESSAGE(STATUS "Command \"${Subversion_SVN_EXECUTABLE} log -r BASE ${dir}\" failed with output:\n${Subversion_svn_log_error}")
     ENDIF(NOT ${Subversion_svn_log_result} EQUAL 0)
   ENDMACRO(Subversion_WC_LOG)
 

common/about_kicad.cpp

@@ -9,8 +9,7 @@
 extern wxString g_Main_Title; // Import program title
 
 /**********************************/
-wxString
-SetMsg( const wxString& msg )
+wxString SetMsg( const wxString& msg )
 /**********************************/
 /* add \n at the beginning of msg under Windows, and do nothing under other version of wxWidgets
  * Needed under wxWidgets 2.8 because wxGTK and wxMSW do not have the same behavior
@@ -30,8 +29,7 @@ SetMsg( const wxString& msg )
 
 
 /**************************************************/
-void
-InitKiCadAbout( wxAboutDialogInfo& info )
+void InitKiCadAbout( wxAboutDialogInfo& info )
 /**************************************************/
 {
 	/* Set name and title */

common/base_screen.cpp

@@ -8,8 +8,9 @@
 
 #include "fctsys.h"
 #include "common.h"
-
+#include "base_struct.h"
 #include "sch_item_struct.h"
+#include "class_base_screen.h"
 
 /* Implement wxSize array for grid list implementation. */
 #include <wx/arrimpl.cpp>

common/base_struct.cpp

@@ -10,10 +10,13 @@
 #include "gr_basic.h"
 #include "trigo.h"
 #include "common.h"
-#include "wxstruct.h"
-#include "base_struct.h"
 #include "grfonte.h"
 #include "macros.h"
+#include "wxstruct.h"
+#include "class_drawpanel.h"
+#include "class_base_screen.h"
+#include "drawtxt.h"
+
 
 enum textbox {
     ID_TEXTBOX_LIST = 8010

common/basicframe.cpp

@@ -10,12 +10,16 @@
 #include <wx/aboutdlg.h>
 #include "wx/statline.h"
 #include "wx/generic/aboutdlgg.h"
+#include <wx/fontdlg.h>
 
 #include "fctsys.h"
-#include <wx/fontdlg.h>
+#include "appl_wxstruct.h"
 #include "common.h"
 #include "online_help.h"
 #include "id.h"
+#include "confirm.h"
+#include "eda_doc.h"
+#include "wxstruct.h"
 
 
 /*******************************************************/

common/block_commande.cpp

@@ -9,8 +9,13 @@
 #include "gr_basic.h"
 #include "wxstruct.h"
 #include "common.h"
-#include "sch_item_struct.h"
 #include "macros.h"
+#include "base_struct.h"
+#include "sch_item_struct.h"
+#include "class_base_screen.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "block_commande.h"
 
 
 /*******************/

common/class_drawpickedstruct.cpp

@@ -4,6 +4,7 @@
 
 #include "fctsys.h"
 #include "common.h"
+#include "base_struct.h"
 #include "sch_item_struct.h"
 
 

common/common.cpp

@@ -12,6 +12,7 @@
 #include "common.h"
 #include "macros.h"
 #include "build_version.h"
+#include "confirm.h"
 #include <wx/process.h>
 
 /*****************************/

common/common_plotGERBER_functions.cpp

@@ -10,6 +10,7 @@
 #include "common.h"
 #include "plot_common.h"
 #include "macros.h"
+#include "kicad_string.h"
 
 
 /***************************************************************************/

common/common_plotHPGL_functions.cpp

@@ -7,9 +7,9 @@
 #include "trigo.h"
 #include "wxstruct.h"
 #include "base_struct.h"
-#include "common.h"
 #include "plot_common.h"
 #include "macros.h"
+#include "kicad_string.h"
 
 /* parametre HPGL pour trace de cercle: */
 #define CHORD_ANGLE 10

common/common_plotPS_functions.cpp

@@ -9,6 +9,7 @@
 #include "common.h"
 #include "plot_common.h"
 #include "macros.h"
+#include "kicad_string.h"
 
 // Locales
 static Ki_PageDescr* SheetPS;

common/common_plot_functions.cpp

@@ -11,6 +11,8 @@
 #include "plot_common.h"
 #include "worksheet.h"
 #include "macros.h"
+#include "class_base_screen.h"
+#include "drawtxt.h"
 
 
 // Variables partagees avec Common plot Postscript et HPLG Routines

common/copy_to_clipboard.cpp

@@ -5,12 +5,17 @@
 // Created:     18 aug 2006
 // Licence:   License GNU
 /////////////////////////////////////////////////////////////////////////////
+
 #include "wx/metafile.h"
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
 #include "id.h"
+#include "class_drawpanel.h"
+#include "class_base_screen.h"
+#include "confirm.h"
+#include "wxstruct.h"
+
 
 extern BASE_SCREEN* ActiveScreen;
 

common/displlst.cpp

@@ -3,11 +3,11 @@
 /********************************/
 
 #include "fctsys.h"
-
 #include "wxstruct.h"
 #include "gr_basic.h"
 #include "common.h"
 #include "macros.h"
+#include "kicad_string.h"
 
 
 /***********************/

common/drawframe.cpp

@@ -7,11 +7,16 @@
 #endif
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "gr_basic.h"
 #include "common.h"
 #include "bitmaps.h"
 #include "macros.h"
 #include "id.h"
+#include "class_drawpanel.h"
+#include "class_base_screen.h"
+#include "wxstruct.h"
+#include "confirm.h"
 
 #include <wx/fontdlg.h>
 

common/drawpanel.cpp

 /******************************************/
 /* drawpanel.cpp - WinEDA_DrawPanel class */
 /******************************************/
+
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "gr_basic.h"
 #include "common.h"
-
 #include "macros.h"
 #include "id.h"
+#include "class_drawpanel.h"
+#include "class_base_screen.h"
+#include "wxstruct.h"
+
 
 // Local defines
 #define CURSOR_SIZE 12           // Cursor size in pixels

common/drawtxt.cpp

@@ -10,6 +10,8 @@
 
 #include "trigo.h"
 #include "macros.h"
+#include "class_drawpanel.h"
+#include "class_base_screen.h"
 
 #ifndef DEFAULT_SIZE_TEXT
 #define DEFAULT_SIZE_TEXT 50

common/eda_doc.cpp

@@ -2,24 +2,16 @@
 /* eda_doc.cpp */
 /***************/
 
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
+#include "fctsys.h"
+#include "appl_wxstruct.h"
+#include "common.h"
+#include "confirm.h"
+#include "gestfich.h"
 
-// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
-#ifndef WX_PRECOMP
-#include <wx/wx.h>
-#endif
 #include <wx/mimetype.h>
 #include <wx/tokenzr.h>
+#include <wx/filename.h>
 
-#include "fctsys.h"
-#include "wxstruct.h"
-#include "common.h"
 
 /*****************************************/
 void WinEDA_App::ReadPdfBrowserInfos()

common/edaappl.cpp

@@ -22,7 +22,9 @@
 #include <wx/filename.h>
 #include <wx/stdpaths.h>
 #include <wx/apptrait.h>
+#include <wx/snglinst.h>
 
+#include "appl_wxstruct.h"
 #include "common.h"
 #include "worksheet.h"
 #include "id.h"
@@ -31,6 +33,7 @@
 #include "macros.h"
 #include "online_help.h"
 #include "bitmaps.h"
+#include "gestfich.h"
 
 
 #ifdef __UNIX__

common/gestfich.cpp

@@ -5,8 +5,8 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "fctsys.h"
-
-#include "wx/mimetype.h"
+#include "appl_wxstruct.h"
+#include "confirm.h"
 
 #ifdef  __WINDOWS__
 #ifndef _MSC_VER
@@ -16,6 +16,11 @@
 
 #include "common.h"
 #include "macros.h"
+#include "gestfich.h"
+
+#include "wx/mimetype.h"
+#include "wx/filename.h"
+
 
 /* List of default paths used to locate help files and kicad library files.
  *

common/get_component_dialog.cpp

@@ -4,9 +4,10 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
 #include "macros.h"
+#include "wxstruct.h"
+
 
 /****************************************************************************/
 /* Show a dialog frame to choose a name from an history list, or a new name */

common/gr_basic.cpp

@@ -8,6 +8,8 @@
 #include "common.h"
 #include "trigo.h"
 #include "macros.h"
+#include "base_struct.h"
+#include "class_base_screen.h"
 
 #ifndef FILLED
 #define FILLED 1

common/hotkeys_basic.cpp

@@ -6,12 +6,16 @@
  */
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "common.h"
-#include "wxstruct.h"
 #include "hotkeys_basic.h"
 #include "macros.h"
 #include "bitmaps.h"
 #include "id.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
+#include "wxstruct.h"
 
 
 /* Class to handle hotkey commnands. hotkeys have a default value

common/msgpanel.cpp

@@ -7,13 +7,14 @@
 #endif
 
 #include "fctsys.h"
-
 #include "wxstruct.h"
 #include "common.h"
+#include "colors.h"
+
 
 /* table des evenements captes par un WinEDA_MsgPanel */
 BEGIN_EVENT_TABLE( WinEDA_MsgPanel, wxPanel )
-EVT_PAINT( WinEDA_MsgPanel::OnPaint )
+    EVT_PAINT( WinEDA_MsgPanel::OnPaint )
 END_EVENT_TABLE()
 
 

common/projet_config.cpp

@@ -4,8 +4,10 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "kicad_string.h"
+#include "gestfich.h"
 
 #define CONFIG_VERSION 1
 

common/string.cpp

@@ -5,8 +5,8 @@
 
 #include "fctsys.h"
 #include <time.h>
-#include "common.h"
 #include "macros.h"
+#include "kicad_string.h"
 
 
 /*********************************************************************/

common/toolbars.cpp

-	/******************************************************************/
-	/* toolbars.cpp - fonctions des classes du type WinEDA_ttolbar */
-	/******************************************************************/
+/******************************************************************/
+/* toolbars.cpp - fonctions des classes du type WinEDA_ttolbar */
+/******************************************************************/
 
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
 #include "fctsys.h"
-#include "common.h"
+#include "wxstruct.h"
 
+/*************************/
+/* class WinEDA_HToolbar */
+/*************************/
 
-#include "id.h"
-
-	/*************************/
-	/* class WinEDA_HToolbar */
-	/*************************/
-
-WinEDA_Toolbar::WinEDA_Toolbar(id_toolbar type, wxWindow * parent,
-				wxWindowID id, bool horizontal):
-			wxToolBar(parent,id, wxPoint(-1,-1), wxSize(-1,-1),
-						horizontal ? wxTB_HORIZONTAL : wxTB_VERTICAL)
+WinEDA_Toolbar::WinEDA_Toolbar( id_toolbar type, wxWindow * parent,
+                                wxWindowID id, bool horizontal ):
+    wxToolBar( parent, id, wxPoint( -1,-1 ), wxSize( -1,-1 ),
+               horizontal ? wxTB_HORIZONTAL : wxTB_VERTICAL )
 {
     m_Parent = parent;
     Pnext = NULL;
@@ -32,5 +29,3 @@ WinEDA_Toolbar::WinEDA_Toolbar(id_toolbar type, wxWindow * parent,
     SetToolSeparation(1);
     SetToolPacking(1);
 }
-
-

common/worksheet.cpp

@@ -4,12 +4,16 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
 #include "macros.h"
-
+#include "class_drawpanel.h"
+#include "class_base_screen.h"
+#include "drawtxt.h"
+#include "confirm.h"
+#include "wxstruct.h"
 #include "worksheet.h"
 
+
 /* Must be defined in main applications: */
 extern wxString g_Main_Title;
 

common/wxwineda.cpp

@@ -8,6 +8,7 @@
 
 #include "fctsys.h"
 #include "common.h"
+#include "wxstruct.h"
 
 
 /**********************************************************************************/

common/zoom.cpp

@@ -8,14 +8,13 @@
  */
 
 #include "fctsys.h"
-
 #include "common.h"
 #include "macros.h"
-
 #include "bitmaps.h"
-
 #include "id.h"
-
+#include "class_drawpanel.h"
+#include "class_base_screen.h"
+#include "wxstruct.h"
 
 /**************************************************/
 void WinEDA_DrawFrame::Recadre_Trace( bool ToMouse )

cvpcb/autosel.cpp

@@ -5,11 +5,13 @@
 /* Routines de selection automatique des modules */
 
 #include "fctsys.h"
-
 #include "common.h"
-#include "cvpcb.h"
+#include "confirm.h"
+#include "gestfich.h"
 
+#include "cvpcb.h"
 #include "protos.h"
+#include "cvstruct.h"
 
 #define QUOTE '\''
 

cvpcb/cfg.cpp

@@ -5,11 +5,12 @@
 /* lit ou met a jour la configuration de CVPCB */
 
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "gestfich.h"
 #include "cvpcb.h"
 #include "protos.h"
-
+#include "cvstruct.h"
 #include "cfg.h"
 
 /* Routines Locales */

cvpcb/cvframe.cpp

@@ -2,17 +2,21 @@
 /* File: cvframe.cpp */
 /*********************/
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "confirm.h"
+#include "eda_doc.h"
+#include "gestfich.h"
+#include "id.h"
+
 #include <wx/fontdlg.h>
 
 #include "cvpcb.h"
 #include "pcbnew.h"
-
 #include "bitmaps.h"
-
 #include "protos.h"
+#include "cvstruct.h"
 
-#include "id.h"
 
 #define FRAME_MIN_SIZE_X 450
 #define FRAME_MIN_SIZE_Y 300

cvpcb/cvpcb.cpp

@@ -5,17 +5,19 @@
 #define eda_global
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "confirm.h"
+#include "gestfich.h"
+#include "id.h"
 
 #include "cvpcb.h"
-#include "trigo.h"
 #include "zones.h"
-
 #include "bitmaps.h"
-
 #include "protos.h"
+#include "cvstruct.h"
 
-#include "id.h"
+#include <wx/snglinst.h>
 
 wxString g_Main_Title = wxT( "CVpcb" );
 

cvpcb/cvpcb.h

@@ -7,12 +7,7 @@
 #define eda_global extern
 #endif
 
-#include "wxstruct.h"
 #include "pcbnew.h"
-#include "cvstruct.h"
-
-#include "gr_basic.h"
-#include "colors.h"
 
 // config for footprints doc file acces
 #define DOC_FOOTPRINTS_LIST_KEY wxT("footprints_doc_file")

cvpcb/dialog_display_options.cpp

@@ -15,17 +15,6 @@
 #pragma implementation "dialog_display_options.h"
 #endif
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
 ////@begin includes
 ////@end includes
 #include "fctsys.h"
@@ -34,6 +23,8 @@
 #include "common.h"
 #include "cvpcb.h"
 #include "protos.h"
+#include "class_drawpanel.h"
+#include "cvstruct.h"
 
 #include "dialog_display_options.h"
 

cvpcb/displayframe.cpp

@@ -3,13 +3,15 @@
 /*********************************************************************/
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "id.h"
 
 #include "cvpcb.h"
-#include "id.h"
 #include "bitmaps.h"
-
 #include "protos.h"
+#include "cvstruct.h"
 
 
 /*****************************************************************/

cvpcb/genequiv.cpp

-	/***************/
-	/* genstf()  */
-	/***************/
+/***************/
+/* genstf()  */
+/***************/
 
 /* genere le fichier STF type 'ref' 'nom_empreinte' pour DRAFT */
 
 #include "fctsys.h"
-
 #include "wxstruct.h"
-#include "common.h"
-#include "cvpcb.h"
+#include "confirm.h"
+#include "gestfich.h"
 
+#include "cvpcb.h"
 #include "protos.h"
+#include "cvstruct.h"
+
 
-void WinEDA_CvpcbFrame::WriteStuffList(wxCommandEvent & event)
+void WinEDA_CvpcbFrame::WriteStuffList( wxCommandEvent& event )
 {
-FILE * FileEquiv;
-STORECMP * Cmp;
-wxString Line, FullFileName, Mask;
+    FILE*     FileEquiv;
+    STORECMP* Cmp;
+    wxString  Line, FullFileName, Mask;
 
-	if( nbcomp <= 0 ) return;
+    if( nbcomp <= 0 )
+        return;
 
     /* calcul du nom du fichier */
-	Mask = wxT("*") + ExtRetroBuffer;
+    Mask = wxT( "*" ) + ExtRetroBuffer;
     FullFileName = FFileName;
-	ChangeFileNameExt(FullFileName, ExtRetroBuffer);
+    ChangeFileNameExt( FullFileName, ExtRetroBuffer );
 
-	FullFileName = EDA_FileSelector( wxT("Create Stuff File"),
+    FullFileName = EDA_FileSelector( wxT( "Create Stuff File" ),
                                      wxGetCwd(),    /* Chemin par defaut */
                                      FullFileName,  /* nom fichier par defaut */
                                      ExtRetroBuffer, /* extension par defaut */
                                      Mask,          /* Masque d'affichage */
                                      this,
                                      wxFD_SAVE,
-					TRUE
-					);
-	if ( FullFileName.IsEmpty() ) return;
+                                     TRUE  );
+    if( FullFileName.IsEmpty() )
+        return;
 
-	FileEquiv = wxFopen(FullFileName, wxT("wt") );
-	if (FileEquiv == 0 )
+    FileEquiv = wxFopen( FullFileName, wxT( "wt" ) );
+    if( FileEquiv == 0 )
     {
-		Line = _("Unable to create ") + FullFileName;
-		DisplayError(this, Line,30);
+        Line = _( "Unable to create " ) + FullFileName;
+        DisplayError( this, Line, 30 );
         return;
     }
 
     /* Generation de la liste */
-	for (Cmp = g_BaseListeCmp ; Cmp != NULL ; Cmp = Cmp->Pnext )
+    for( Cmp = g_BaseListeCmp; Cmp != NULL; Cmp = Cmp->Pnext )
     {
         /* gnration du composant si son empreinte est dfinie */
-		if ( Cmp->m_Module.IsEmpty() ) continue;
-		fprintf(FileEquiv, "comp = \"%s\" module = \"%s\"\n",
-				CONV_TO_UTF8(Cmp->m_Reference),
-				CONV_TO_UTF8(Cmp->m_Module));
+        if( Cmp->m_Module.IsEmpty() )
+            continue;
+        fprintf( FileEquiv, "comp = \"%s\" module = \"%s\"\n",
+                 CONV_TO_UTF8( Cmp->m_Reference ),
+                 CONV_TO_UTF8( Cmp->m_Module ) );
     }
 
-	fclose(FileEquiv);
+    fclose( FileEquiv );
 }
-

cvpcb/listboxes.cpp

@@ -3,14 +3,14 @@
 /*************************************************************************/
 
 #include "fctsys.h"
-
 #include "wxstruct.h"
 #include "common.h"
-#include "cvpcb.h"
-
 #include "id.h"
 
+#include "cvpcb.h"
 #include "protos.h"
+#include "cvstruct.h"
+
 
 /******************************************************************************/
 /* Basic class (from wxListView) for displaying component and footprint lists */

cvpcb/loadcmp.cpp

@@ -3,11 +3,15 @@
 /***************************************************/
 
 #include "fctsys.h"
-
 #include "wxstruct.h"
 #include "common.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
+
 #include "cvpcb.h"
 #include "protos.h"
+#include "cvstruct.h"
 
 
 /*****************************************************************/
@@ -103,7 +107,8 @@ MODULE* WinEDA_DisplayFrame::Get_Module( const wxString& CmpName )
             }
         }
 
-        fclose( lib_module ); lib_module = 0;
+        fclose( lib_module );
+        lib_module = 0;
     }
 
     if( lib_module )

cvpcb/menucfg.cpp

@@ -5,10 +5,14 @@
 /* cree et/ou affiche et modifie la configuration de CVPCB */
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "confirm.h"
+#include "gestfich.h"
 
 #include "cvpcb.h"
 #include "protos.h"
+#include "cvstruct.h"
 
 
 /*****************************************/

cvpcb/readschematicnetlist.cpp

@@ -8,12 +8,15 @@
  */
 
 #include "fctsys.h"
-
 #include "wxstruct.h"
 #include "common.h"
-#include "cvpcb.h"
+#include "confirm.h"
+#include "kicad_string.h"
 
+#include "cvpcb.h"
 #include "protos.h"
+#include "cvstruct.h"
+
 
 #define SEPARATEUR '|'  /* caractere separateur dans netliste */
 

cvpcb/savecmp.cpp

-	/**************/
-	/* savecmp()  */
-	/**************/
+/**************/
+/* savecmp()  */
+/**************/
 
 /* sauvegarde la liste des associations composants/empreintes */
 
 #include "fctsys.h"
-
 #include "wxstruct.h"
 #include "common.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
+
 #include "cvpcb.h"
 #include "protos.h"
+#include "cvstruct.h"
+
 
 /* Chaines de caractere d'identification */
-char EnteteCmpMod[] = {"Cmp-Mod V01"};
+char EnteteCmpMod[] = { "Cmp-Mod V01" };
 
 /****************************************************************************/
-int WinEDA_CvpcbFrame::SaveComponentList(const wxString & NetlistFullFileName)
+int WinEDA_CvpcbFrame::SaveComponentList( const wxString& NetlistFullFileName )
 /*****************************************************************************/
+
 /* Routine de sauvegarde du fichier des modules
-	Retourne 1 si OK
-			0 si ecriture non faite
-*/
+ *   Retourne 1 si OK
+ *           0 si ecriture non faite
+ */
 {
-STORECMP * Cmp;
-wxString FullFileName;
-char Line[1024];
-wxString Title = g_Main_Title + wxT(" ") + GetBuildVersion();
+    STORECMP* Cmp;
+    wxString  FullFileName;
+    char      Line[1024];
+    wxString  Title = g_Main_Title + wxT( " " ) + GetBuildVersion();
 
     /* calcul du nom du fichier */
     FullFileName = NetlistFullFileName;
-	ChangeFileNameExt(FullFileName, g_ExtCmpBuffer);
+    ChangeFileNameExt( FullFileName, g_ExtCmpBuffer );
 
-	dest = wxFopen(FullFileName, wxT("wt") );
-	if( dest == NULL ) return(0);	/* Erreur ecriture */
+    dest = wxFopen( FullFileName, wxT( "wt" ) );
+    if( dest == NULL )
+        return 0;                   /* Erreur ecriture */
 
-	fprintf(dest,"%s", EnteteCmpMod);
-	fprintf(dest," Created by %s", CONV_TO_UTF8(Title));
-	fprintf(dest," date = %s\n", DateAndTime(Line));
+    fprintf( dest, "%s", EnteteCmpMod );
+    fprintf( dest, " Created by %s", CONV_TO_UTF8( Title ) );
+    fprintf( dest, " date = %s\n", DateAndTime( Line ) );
 
-	for ( Cmp = g_BaseListeCmp ; Cmp != NULL ; Cmp = Cmp->Pnext )
+    for( Cmp = g_BaseListeCmp; Cmp != NULL; Cmp = Cmp->Pnext )
     {
-		fprintf(dest,"\nBeginCmp\n");
-		fprintf(dest,"TimeStamp = %s;\n", CONV_TO_UTF8(Cmp->m_TimeStamp));
-		fprintf(dest,"Reference = %s;\n", CONV_TO_UTF8(Cmp->m_Reference));
-		fprintf(dest,"ValeurCmp = %s;\n", CONV_TO_UTF8(Cmp->m_Valeur));
-		fprintf(dest,"IdModule  = %s;\n", CONV_TO_UTF8(Cmp->m_Module));
-		fprintf(dest,"EndCmp\n");
+        fprintf( dest, "\nBeginCmp\n" );
+        fprintf( dest, "TimeStamp = %s;\n", CONV_TO_UTF8( Cmp->m_TimeStamp ) );
+        fprintf( dest, "Reference = %s;\n", CONV_TO_UTF8( Cmp->m_Reference ) );
+        fprintf( dest, "ValeurCmp = %s;\n", CONV_TO_UTF8( Cmp->m_Valeur ) );
+        fprintf( dest, "IdModule  = %s;\n", CONV_TO_UTF8( Cmp->m_Module ) );
+        fprintf( dest, "EndCmp\n" );
     }
-	fprintf(dest,"\nEndListe\n") ;
-	fclose(dest) ;
 
-	return(1) ;
+    fprintf( dest, "\nEndListe\n" );
+    fclose( dest );
+
+    return 1;
 }
 
+
 /****************/
 int loadcmp()
 /***************/
+
 /* recupere la liste des associations composants/empreintes
-*/
+ */
 {
-wxString timestamp, valeur, ilib, namecmp;
-bool read_cmp_data = FALSE, eof = FALSE;
-STORECMP * Cmp;
-char Line[1024], * ident, *data;
-wxString FullFileName;
+    wxString  timestamp, valeur, ilib, namecmp;
+    bool      read_cmp_data = FALSE, eof = FALSE;
+    STORECMP* Cmp;
+    char      Line[1024], * ident, * data;
+    wxString  FullFileName;
 
     /* calcul du nom du fichier */
     FullFileName = FFileName;
-	ChangeFileNameExt(FullFileName, g_ExtCmpBuffer);
+    ChangeFileNameExt( FullFileName, g_ExtCmpBuffer );
 
-	source = wxFopen(FullFileName, wxT("rt") );
-	if (source == NULL )
+    source = wxFopen( FullFileName, wxT( "rt" ) );
+    if( source == NULL )
     {
-		return(0) ;
+        return 0;
     }
 
     /* Identification du Type de fichier CmpMod */
-	if ( fgets(Line,79,source) == 0 ) return(0);
-	if( strnicmp(Line, EnteteCmpMod, 11 ) != 0 ) /* old file version*/
+    if( fgets( Line, 79, source ) == 0 )
+        return 0;
+    if( strnicmp( Line, EnteteCmpMod, 11 ) != 0 ) /* old file version*/
     {
-		fclose(source) ;
-		DisplayError( NULL, wxT("Old version of Componaent file, recreate it!"));
-		return(0) ;
+        fclose( source );
+        DisplayError( NULL,
+                      wxT( "Old version of Componaent file, recreate it!" ) );
+        return 0;
     }
 
     /* lecture de la liste */
-	while( ! eof && fgets(Line,79,source) != 0 )
+    while( !eof && fgets( Line, 79, source ) != 0 )
     {
-		if( strnicmp(Line, "EndListe", 8 ) == 0 ) break;
+        if( strnicmp( Line, "EndListe", 8 ) == 0 )
+            break;
 
         /* Recherche du debut de description du composant */
-		if( strnicmp(Line, "BeginCmp", 8 ) != 0 ) continue;
+        if( strnicmp( Line, "BeginCmp", 8 ) != 0 )
+            continue;
         timestamp.Empty();
         valeur.Empty();
         ilib.Empty();
         namecmp.Empty();
         read_cmp_data = TRUE;
 
-		while( ! eof && read_cmp_data )
+        while( !eof && read_cmp_data )
         {
-			if( fgets(Line, 1024,source) == 0 )
+            if( fgets( Line, 1024, source ) == 0 )
             {
                 eof = TRUE; break;
             }
 
-			if( strnicmp(Line, "EndCmp", 6 ) == 0 )
+            if( strnicmp( Line, "EndCmp", 6 ) == 0 )
             {
                 read_cmp_data = TRUE; break;
             }
 
-			ident = strtok ( Line,"=;\n\r");
-			data = strtok ( NULL,";\n\r");
-			if( strnicmp(ident, "TimeStamp", 9) == 0)
+            ident = strtok( Line, "=;\n\r" );
+            data  = strtok( NULL, ";\n\r" );
+            if( strnicmp( ident, "TimeStamp", 9 ) == 0 )
             {
-				timestamp = CONV_FROM_UTF8(data);
-				timestamp.Trim(TRUE);
-				timestamp.Trim(FALSE);
+                timestamp = CONV_FROM_UTF8( data );
+                timestamp.Trim( TRUE );
+                timestamp.Trim( FALSE );
                 continue;
             }
 
-			if( strnicmp(ident, "Reference", 9) == 0)
+            if( strnicmp( ident, "Reference", 9 ) == 0 )
             {
-				namecmp = CONV_FROM_UTF8(data);
-				namecmp.Trim(TRUE);
-				namecmp.Trim(FALSE);
+                namecmp = CONV_FROM_UTF8( data );
+                namecmp.Trim( TRUE );
+                namecmp.Trim( FALSE );
                 continue;
             }
 
-			if( strnicmp(ident, "ValeurCmp", 9) == 0)
+            if( strnicmp( ident, "ValeurCmp", 9 ) == 0 )
             {
-				valeur = CONV_FROM_UTF8(data);
-				valeur.Trim(TRUE);
-				valeur.Trim(FALSE);
+                valeur = CONV_FROM_UTF8( data );
+                valeur.Trim( TRUE );
+                valeur.Trim( FALSE );
                 continue;
             }
 
-			if( strnicmp(ident, "IdModule", 8) == 0)
+            if( strnicmp( ident, "IdModule", 8 ) == 0 )
             {
-				ilib = CONV_FROM_UTF8(data);
-				ilib.Trim(TRUE);
-				ilib.Trim(FALSE);
+                ilib = CONV_FROM_UTF8( data );
+                ilib.Trim( TRUE );
+                ilib.Trim( FALSE );
                 continue;
             }
         } /* Fin lecture description de 1 composant */
 
         /* Recherche du composant correspondant en netliste et
-			 mise a jour de ses parametres */
-		for ( Cmp = g_BaseListeCmp ; Cmp != NULL ; Cmp = Cmp->Pnext )
+         *    mise a jour de ses parametres */
+        for( Cmp = g_BaseListeCmp; Cmp != NULL; Cmp = Cmp->Pnext )
         {
-			if (selection_type == 1 )
+            if( selection_type == 1 )
             {
                 if( timestamp != Cmp->m_TimeStamp )
-					continue ;
+                    continue;
             }
             else
-				if( namecmp != Cmp->m_Reference ) continue;
+                if( namecmp != Cmp->m_Reference )
+                    continue;
 
             /* composant identifie , copie du nom du module correspondant */
-			Cmp->m_Module= ilib;
+            Cmp->m_Module = ilib;
         }
     }
-	fclose(source) ;
-	return(1) ;
-}
-
 
+    fclose( source );
+    return 1;
+}

cvpcb/setvisu.cpp

@@ -3,14 +3,17 @@
 /*********************************************************************/
 
 #include "fctsys.h"
-
 #include "common.h"
-#include "cvpcb.h"
-#include "3d_viewer.h"
+#include "class_drawpanel.h"
 #include "id.h"
-#include "bitmaps.h"
 
+#include "3d_viewer.h"
+
+#include "bitmaps.h"
+#include "cvpcb.h"
 #include "protos.h"
+#include "cvstruct.h"
+
 
 /*******************************************/
 void WinEDA_CvpcbFrame::CreateScreenCmp()

cvpcb/tool_cvpcb.cpp

@@ -3,16 +3,15 @@
 /***************************************************/
 
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
-#include "cvpcb.h"
+#include "id.h"
 #include "trigo.h"
 
-#include "protos.h"
-
 #include "bitmaps.h"
-
-#include "id.h"
+#include "cvpcb.h"
+#include "protos.h"
+#include "cvstruct.h"
 
 
 /*********************************************/

eeschema/affiche.cpp

@@ -7,6 +7,7 @@
 #include "fctsys.h"
 #include "gr_basic.h"
 #include "common.h"
+#include "wxstruct.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"

eeschema/annotate.cpp

@@ -7,6 +7,9 @@
 
 #include "fctsys.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "wxstruct.h"
 #include "program.h"
 #include "libcmp.h"
 #include "protos.h"

eeschema/annotate_dialog.cpp

@@ -15,17 +15,6 @@
 #pragma implementation "annotate_dialog.h"
 #endif
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
 ////@begin includes
 ////@end includes
 
@@ -33,6 +22,7 @@
 #include "bitmaps.h"
 #include "common.h"
 #include "program.h"
+
 #include "annotate_dialog.h"
 
 extern void AnnotateComponents( WinEDA_SchematicFrame* parent,

eeschema/annotate_dialog.h

@@ -32,6 +32,7 @@
 
 ////@begin forward declarations
 class wxBoxSizer;
+class WinEDA_SchematicFrame;
 ////@end forward declarations
 
 /*!

eeschema/backanno.cpp

@@ -4,9 +4,11 @@
 ****************************************************************/
 
 #include "fctsys.h"
-
 #include "common.h"
 #include "program.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
 #include "libcmp.h"
 #include "general.h"
 
@@ -15,8 +17,7 @@
 /*******************************************************************************************/
 bool WinEDA_SchematicFrame::FillFootprintFieldForAllInstancesofComponent(
     const wxString& aReference,
-    const wxString&
-    aFootPrint,
+    const wxString& aFootPrint,
     bool            aSetVisible )
 /********************************************************************************************/
 

eeschema/block.cpp

@@ -4,12 +4,16 @@
 /****************************************************/
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "gr_basic.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "block_commande.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 

eeschema/block_libedit.cpp

@@ -5,12 +5,14 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "block_commande.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 /* Variables Locales */

eeschema/build_BOM.cpp

@@ -9,9 +9,10 @@
 #include <vector>
 
 #include "fctsys.h"
-
-
 #include "common.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"

eeschema/bus-wire-junction.cpp

@@ -4,12 +4,13 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 

eeschema/busentry.cpp

@@ -4,13 +4,14 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "id.h"
+#include "confirm.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-#include "id.h"
-
 #include "protos.h"
 
 /* Routines Locales */

eeschema/class_drawsheet.cpp

@@ -13,12 +13,14 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "drawtxt.h"
+#include "confirm.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 

eeschema/class_hierarchical_PIN_sheet.cpp

@@ -13,12 +13,13 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "drawtxt.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 

eeschema/class_library.cpp

@@ -4,8 +4,7 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
-#include "common.h"
+#include "kicad_string.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"

eeschema/class_pin.cpp

@@ -3,8 +3,11 @@
 /*****************/
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "gr_basic.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "drawtxt.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"

eeschema/class_screen.cpp

@@ -2,12 +2,12 @@
 #include "fctsys.h"
 #include "gr_basic.h"
 #include "common.h"
+#include "id.h"
+#include "class_drawpanel.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
-#include "id.h"
 
 
 /******************************************************************/

eeschema/class_text-label.cpp

@@ -4,15 +4,15 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
 #include "trigo.h"
+#include "id.h"
+#include "class_drawpanel.h"
+#include "drawtxt.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
-#include "id.h"
-
 #include "protos.h"
 
 

eeschema/classes_body_items.cpp

@@ -4,8 +4,10 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "drawtxt.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"

eeschema/cleanup.cpp

@@ -3,8 +3,9 @@
 /*********************************/
 
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "confirm.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"

eeschema/component_class.cpp

@@ -4,8 +4,8 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "confirm.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"

eeschema/controle.cpp

@@ -3,18 +3,15 @@
 /****************/
 
 #include "fctsys.h"
-
 #include "gr_basic.h"
-
 #include "common.h"
-#include "program.h"
-#include "libcmp.h"
-#include "general.h"
-
+#include "class_drawpanel.h"
 #include "eda_dde.h"
-
 #include "id.h"
 
+#include "program.h"
+#include "libcmp.h"
+#include "general.h"
 #include "protos.h"
 
 /**************************************************************************************/

eeschema/cross-probing.cpp

@@ -3,7 +3,7 @@
 /*********************/
 
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
 #include "program.h"
 #include "libcmp.h"

eeschema/database.cpp

-	/****************************/
-	/*	EESchema - database.cpp	*/
-	/****************************/
+/****************************/
+/*	EESchema - database.cpp	*/
+/****************************/
 
 /* Routine de selection d'un composant en librairie
-*/
+ */
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "confirm.h"
+#include "eda_doc.h"
+#include "kicad_string.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
@@ -22,86 +25,96 @@
 
 
 /********************************************************************************/
-bool DataBaseGetName(WinEDA_DrawFrame * frame,
-		wxString & Keys, wxString & BufName)
+bool DataBaseGetName( WinEDA_DrawFrame* frame,
+                      wxString& Keys, wxString& BufName )
 /********************************************************************************/
+
 /*
-	Routine de selection du nom d'un composant en librairie pour chargement,
-	Keys pointe la liste des mots cles de filtrage
-	Si Keys = "", recherche des composants qui correspondent
-au masque BufName( avec * et ? )
-
- Retourne
-	TRUE si composant selectionne
-	FALSE si commande annulee
-	place le nom du composant a charger, selectionne a partir d'une liste dans
-	BufName
-*/
+ *   Routine de selection du nom d'un composant en librairie pour chargement,
+ *   Keys pointe la liste des mots cles de filtrage
+ *   Si Keys = "", recherche des composants qui correspondent
+ *  au masque BufName( avec * et ? )
+ *
+ *  Retourne
+ *   TRUE si composant selectionne
+ *   FALSE si commande annulee
+ *   place le nom du composant a charger, selectionne a partir d'une liste dans
+ *   BufName
+ */
 {
-int ii;
-EDA_LibComponentStruct * LibEntry;
-LibraryStruct * Lib;
-WinEDAListBox * ListBox;
-const wxChar ** ListNames;
+    int ii;
+    EDA_LibComponentStruct* LibEntry;
+    LibraryStruct*          Lib;
+    WinEDAListBox*          ListBox;
+    const wxChar**          ListNames;
 
     BufName.MakeUpper();
     Keys.MakeUpper();
 
     /* Examen de la liste des librairies pour comptage */
-	for (Lib = g_LibraryList, ii = 0; Lib != NULL; Lib = Lib->m_Pnext)
+    for( Lib = g_LibraryList, ii = 0; Lib != NULL; Lib = Lib->m_Pnext )
     {
-		LibEntry = (EDA_LibComponentStruct *) PQFirst(&Lib->m_Entries, FALSE);
+        LibEntry = (EDA_LibComponentStruct*) PQFirst( &Lib->m_Entries, FALSE );
         while( LibEntry )
         {
-			if ( ! Keys.IsEmpty() )
+            if( !Keys.IsEmpty() )
             {
-				if( KeyWordOk(Keys, LibEntry->m_KeyWord) ) ii++;
+                if( KeyWordOk( Keys, LibEntry->m_KeyWord ) )
+                    ii++;
             }
             else
             {
-				if( WildCompareString( BufName, LibEntry->m_Name.m_Text, FALSE ) ) ii++;
+                if( WildCompareString( BufName, LibEntry->m_Name.m_Text, FALSE ) )
+                    ii++;
             }
-			LibEntry = (EDA_LibComponentStruct *) PQNext(Lib->m_Entries, LibEntry, NULL);
+            LibEntry = (EDA_LibComponentStruct*) PQNext( Lib->m_Entries,
+                                                         LibEntry,
+                                                         NULL );
         }
     }
 
-	if ( ii == 0 )
+    if( ii == 0 )
     {
-		DisplayError(frame, _("No Component found") );
+        DisplayError( frame, _( "No Component found" ) );
         return 0;
     }
 
-	ListNames = (const wxChar**)MyZMalloc( (ii+1) * sizeof(const wxChar*));
-	for (Lib = g_LibraryList, ii = 0; Lib != NULL; Lib = Lib->m_Pnext)
+    ListNames = (const wxChar**) MyZMalloc( (ii + 1) * sizeof(const wxChar*) );
+    for( Lib = g_LibraryList, ii = 0; Lib != NULL; Lib = Lib->m_Pnext )
     {
         /* Examen de la liste des elements */
-		LibEntry = (EDA_LibComponentStruct *) PQFirst(&Lib->m_Entries, FALSE);
+        LibEntry = (EDA_LibComponentStruct*) PQFirst( &Lib->m_Entries, FALSE );
         while( LibEntry )
         {
-			if ( ! Keys.IsEmpty())
+            if( !Keys.IsEmpty() )
             {
-				if( KeyWordOk(Keys, LibEntry->m_KeyWord) )
+                if( KeyWordOk( Keys, LibEntry->m_KeyWord ) )
                 {
                     ListNames[ii] = LibEntry->m_Name.m_Text.GetData(); ii++;
                 }
             }
-			else if( WildCompareString( BufName, LibEntry->m_Name.m_Text, FALSE ) ) 
+            else if( WildCompareString( BufName, LibEntry->m_Name.m_Text,
+                                        FALSE ) )
             {
                 ListNames[ii] = LibEntry->m_Name.m_Text; ii++;
             }
-			LibEntry = (EDA_LibComponentStruct *) PQNext(Lib->m_Entries, LibEntry, NULL);
+            LibEntry = (EDA_LibComponentStruct*) PQNext( Lib->m_Entries,
+                                                         LibEntry,
+                                                         NULL );
         }
     }
 
-	ListBox = new WinEDAListBox(frame, _("Selection"), ListNames,
-						wxEmptyString, DisplayCmpDoc, wxColour(200,200,255) );
+    ListBox = new WinEDAListBox( frame, _( "Selection" ), ListNames,
+                                 wxEmptyString, DisplayCmpDoc,
+                                 wxColour( 200, 200, 255 ) );
     ListBox->MoveMouseToOrigin();
 
     /* Affichage de la liste selectionnee */
     if( ii )
     {
         ii = ListBox->ShowModal(); ListBox->Destroy();
-		if ( ii < 0 ) ii = 0;
+        if( ii < 0 )
+            ii = 0;
         else
         {
             BufName = ListNames[ii];
@@ -110,22 +123,21 @@ const wxChar ** ListNames;
     }
 
 
-	free (ListNames);
-	return (ii) ;
+    free( ListNames );
+    return ii;
 }
 
 
 /**********************************/
-void DisplayCmpDoc(wxString & Name)
+void DisplayCmpDoc( wxString& Name )
 /**********************************/
 {
-LibCmpEntry * CmpEntry;
+    LibCmpEntry* CmpEntry;
 
-	CmpEntry = FindLibPart(Name.GetData(), wxEmptyString, FIND_ALIAS);
-	if ( CmpEntry == NULL ) return;
+    CmpEntry = FindLibPart( Name.GetData(), wxEmptyString, FIND_ALIAS );
+    if( CmpEntry == NULL )
+        return;
 
-	Name = wxT("Descr: ") + CmpEntry->m_Doc;
-	Name += wxT("\nKeyW: ") + CmpEntry->m_KeyWord;
+    Name  = wxT( "Descr: " ) + CmpEntry->m_Doc;
+    Name += wxT( "\nKeyW: " ) + CmpEntry->m_KeyWord;
 }
-
-

eeschema/delsheet.cpp

@@ -3,12 +3,12 @@
 /*******************************************************/
 
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "confirm.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 

eeschema/dialog_SVG_print.cpp

@@ -7,8 +7,12 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "gr_basic.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "gestfich.h"
 
 #include "dialog_SVG_print_base.h"
 

eeschema/dialog_build_BOM.cpp

@@ -16,18 +16,8 @@
 #pragma implementation "dialog_build_BOM.h"
 #endif
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 
 ////@begin includes
 ////@end includes

eeschema/dialog_create_component.cpp

@@ -15,21 +15,10 @@
 #pragma implementation "dialog_create_component.h"
 #endif
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "confirm.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"

eeschema/dialog_edit_component_in_schematic.cpp

@@ -5,12 +5,13 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 #include "dialog_edit_component_in_schematic.h"

eeschema/dialog_edit_label.cpp

@@ -10,6 +10,7 @@
 #include "wx/valgen.h"
 
 #include "common.h"
+#include "class_drawpanel.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"

eeschema/dialog_edit_libentry_fields_in_lib.cpp

@@ -7,6 +7,7 @@
 #include <algorithm>
 
 #include "common.h"
+#include "confirm.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"

eeschema/dialog_eeschema_config.cpp

@@ -15,22 +15,14 @@
 #pragma implementation "dialog_eeschema_config.h"
 #endif
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
 ////@begin includes
 ////@end includes
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "confirm.h"
+#include "gestfich.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"

eeschema/dialog_options.cpp

@@ -16,27 +16,16 @@
 #pragma implementation "dialog_options.h"
 #endif
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "id.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
-#include "id.h"
-
 #include "protos.h"
 
 ////@begin includes

eeschema/dialog_print_using_printer.cpp

@@ -5,9 +5,11 @@
 // Set this to 1 if you want to test PostScript printing under MSW.
 #define wxTEST_POSTSCRIPT_IN_MSW 1
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
 
 #include "program.h"
 #include "general.h"

eeschema/edit_component_in_lib.cpp

@@ -4,8 +4,10 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "confirm.h"
+#include "gestfich.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"

eeschema/edit_component_in_schematic.cpp

@@ -4,8 +4,10 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"

eeschema/edit_graphic_bodyitem_text.cpp

@@ -9,8 +9,9 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"

eeschema/edit_label.cpp

@@ -5,8 +5,10 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"

eeschema/eeconfig.cpp

@@ -3,8 +3,14 @@
 /*******************************************************/
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "gr_basic.h"
 #include "common.h"
+#include "id.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "gestfich.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
@@ -13,7 +19,6 @@
 #include "worksheet.h"
 #include "hotkeys.h"
 
-#include "id.h"
 
 /* Variables locales */
 

eeschema/eecreate.cpp

@@ -4,12 +4,12 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "confirm.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 /* Routines Locales */

eeschema/eelayer.cpp

@@ -9,27 +9,15 @@
 #pragma implementation "eelayer.h"
 #endif
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "id.h"
+#include "class_drawpanel.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
-#include "id.h"
-
 #include "protos.h"
 
 #include "eelayer.h" // Header file associated with this file

eeschema/eelibs_draw_components.cpp

@@ -4,8 +4,9 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "drawtxt.h"
 #include "program.h"
 #include "libcmp.h"
 #include "component_class.h"

eeschema/eelibs_read_libraryfiles.cpp

@@ -4,13 +4,15 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
 #include "trigo.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 /* Local Functions */

eeschema/eeredraw.cpp

@@ -5,12 +5,12 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 

eeschema/eeschema.cpp

@@ -10,19 +10,24 @@
 #define MAIN
 
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "gestfich.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
 #include "netlist.h"
 #include "worksheet.h"
-#include "trigo.h"
 #include "bitmaps.h"
 #include "eda_dde.h"
 
 #include "protos.h"
 
+#include <wx/snglinst.h>
+
+
 // Global variables
 wxString g_Main_Title( wxT( "EESchema" ) );
 

eeschema/erc.cpp

@@ -4,13 +4,16 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
 #include "netlist.h"
-
 #include "protos.h"
 
 #include "bitmaps.h"

eeschema/files-io.cpp

@@ -3,8 +3,10 @@
 /****************************/
 
 #include "fctsys.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "gestfich.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"