Commit b833a46b authored by stambaughw's avatar stambaughw

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

parent 89e5909f
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
#include "wx/clipbrd.h" #include "wx/clipbrd.h"
#include "fctsys.h" #include "fctsys.h"
#include "common.h"
#include "id.h" #include "id.h"
#include "gestfich.h"
#include "3d_viewer.h" #include "3d_viewer.h"
#include "trackball.h" #include "trackball.h"
......
...@@ -11,8 +11,6 @@ ...@@ -11,8 +11,6 @@
#include "fctsys.h" #include "fctsys.h"
#include "common.h"
#include "3d_struct.h" #include "3d_struct.h"
#include "3d_viewer.h" #include "3d_viewer.h"
......
...@@ -17,9 +17,10 @@ ...@@ -17,9 +17,10 @@
#error Please set wxUSE_GLCANVAS to 1 in setup.h. #error Please set wxUSE_GLCANVAS to 1 in setup.h.
#endif #endif
#include "common.h"
#include "pcbstruct.h" #include "pcbstruct.h"
#include "macros.h" #include "macros.h"
#include "drawtxt.h"
#include "confirm.h"
#include "3d_viewer.h" #include "3d_viewer.h"
#include "trackball.h" #include "trackball.h"
...@@ -460,7 +461,8 @@ static void Draw3dTextSegm( int x0, int y0, int xf, int yf ) ...@@ -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 endx = xf * g_Parm_3D_Visu.m_BoardScale;
double endy = yf * 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 ) ...@@ -480,11 +482,9 @@ void Pcb3D_GLCanvas::Draw3D_DrawText( TEXTE_PCB* text )
s_Text3DZPos = g_Parm_3D_Visu.m_LayerZcoord[layer]; s_Text3DZPos = g_Parm_3D_Visu.m_LayerZcoord[layer];
s_Text3DWidth = text->m_Width * g_Parm_3D_Visu.m_BoardScale; s_Text3DWidth = text->m_Width * g_Parm_3D_Visu.m_BoardScale;
glNormal3f( 0.0, 0.0, Get3DLayerSide( layer ) ); glNormal3f( 0.0, 0.0, Get3DLayerSide( layer ) );
DrawGraphicText( NULL, NULL, DrawGraphicText( NULL, NULL, text->m_Pos, (EDA_Colors) color,
text->m_Pos, (EDA_Colors) color, text->m_Text, text->m_Text, text->m_Orient, text->m_Size,
text->m_Orient, text->m_Size, text->m_HJustify, text->m_VJustify,
text->m_HJustify,
text->m_VJustify,
text->m_Width, text->m_Italic, text->m_Width, text->m_Italic,
Draw3dTextSegm ); Draw3dTextSegm );
} }
...@@ -668,7 +668,8 @@ void D_PAD::Draw3D( Pcb3D_GLCanvas* glcanvas ) ...@@ -668,7 +668,8 @@ void D_PAD::Draw3D( Pcb3D_GLCanvas* glcanvas )
if( holeX && holeY ) if( holeX && holeY )
{ {
SetGLColor( DARKGRAY ); 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 glNormal3f( 0.0, 0.0, 1.0 ); // Normal is Z axis
......
...@@ -11,8 +11,7 @@ ...@@ -11,8 +11,7 @@
#include "fctsys.h" #include "fctsys.h"
#include "appl_wxstruct.h"
#include <wx/colordlg.h>
#if !wxUSE_GLCANVAS #if !wxUSE_GLCANVAS
#error Please set wxUSE_GLCANVAS to 1 in setup.h. #error Please set wxUSE_GLCANVAS to 1 in setup.h.
...@@ -25,6 +24,8 @@ ...@@ -25,6 +24,8 @@
#include "3d_viewer.h" #include "3d_viewer.h"
#include "trackball.h" #include "trackball.h"
#include <wx/colordlg.h>
BEGIN_EVENT_TABLE( WinEDA3D_DrawFrame, wxFrame ) BEGIN_EVENT_TABLE( WinEDA3D_DrawFrame, wxFrame )
EVT_TOOL_RANGE( ID_ZOOM_IN, ID_ZOOM_PAGE, WinEDA3D_DrawFrame::Process_Zoom ) EVT_TOOL_RANGE( ID_ZOOM_IN, ID_ZOOM_PAGE, WinEDA3D_DrawFrame::Process_Zoom )
......
...@@ -10,10 +10,9 @@ ...@@ -10,10 +10,9 @@
#endif #endif
#include "fctsys.h" #include "fctsys.h"
#include "common.h" #include "common.h"
#include "macros.h" #include "macros.h"
#include "kicad_string.h"
#include "3d_struct.h" #include "3d_struct.h"
#include "3d_viewer.h" #include "3d_viewer.h"
......
...@@ -5,6 +5,14 @@ Started 2007-June-11 ...@@ -5,6 +5,14 @@ Started 2007-June-11
Please add newer entries at the top, list the date and your name with Please add newer entries at the top, list the date and your name with
email address. 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> 2009-feb-01 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
================================================================================ ================================================================================
++All: ++All:
......
...@@ -85,7 +85,7 @@ IF(Subversion_SVN_EXECUTABLE) ...@@ -85,7 +85,7 @@ IF(Subversion_SVN_EXECUTABLE)
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
IF(NOT ${Subversion_svn_info_result} EQUAL 0) 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) ELSE(NOT ${Subversion_svn_info_result} EQUAL 0)
STRING(REGEX REPLACE "^(.*\n)?svn, version ([.0-9]+).*" STRING(REGEX REPLACE "^(.*\n)?svn, version ([.0-9]+).*"
...@@ -121,7 +121,7 @@ IF(Subversion_SVN_EXECUTABLE) ...@@ -121,7 +121,7 @@ IF(Subversion_SVN_EXECUTABLE)
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
IF(NOT ${Subversion_svn_log_result} EQUAL 0) 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) ENDIF(NOT ${Subversion_svn_log_result} EQUAL 0)
ENDMACRO(Subversion_WC_LOG) ENDMACRO(Subversion_WC_LOG)
......
...@@ -9,8 +9,7 @@ ...@@ -9,8 +9,7 @@
extern wxString g_Main_Title; // Import program title extern wxString g_Main_Title; // Import program title
/**********************************/ /**********************************/
wxString wxString SetMsg( const wxString& msg )
SetMsg( const wxString& msg )
/**********************************/ /**********************************/
/* add \n at the beginning of msg under Windows, and do nothing under other version of wxWidgets /* 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 * Needed under wxWidgets 2.8 because wxGTK and wxMSW do not have the same behavior
...@@ -30,8 +29,7 @@ SetMsg( const wxString& msg ) ...@@ -30,8 +29,7 @@ SetMsg( const wxString& msg )
/**************************************************/ /**************************************************/
void void InitKiCadAbout( wxAboutDialogInfo& info )
InitKiCadAbout( wxAboutDialogInfo& info )
/**************************************************/ /**************************************************/
{ {
/* Set name and title */ /* Set name and title */
......
...@@ -8,8 +8,9 @@ ...@@ -8,8 +8,9 @@
#include "fctsys.h" #include "fctsys.h"
#include "common.h" #include "common.h"
#include "base_struct.h"
#include "sch_item_struct.h" #include "sch_item_struct.h"
#include "class_base_screen.h"
/* Implement wxSize array for grid list implementation. */ /* Implement wxSize array for grid list implementation. */
#include <wx/arrimpl.cpp> #include <wx/arrimpl.cpp>
......
...@@ -10,10 +10,13 @@ ...@@ -10,10 +10,13 @@
#include "gr_basic.h" #include "gr_basic.h"
#include "trigo.h" #include "trigo.h"
#include "common.h" #include "common.h"
#include "wxstruct.h"
#include "base_struct.h"
#include "grfonte.h" #include "grfonte.h"
#include "macros.h" #include "macros.h"
#include "wxstruct.h"
#include "class_drawpanel.h"
#include "class_base_screen.h"
#include "drawtxt.h"
enum textbox { enum textbox {
ID_TEXTBOX_LIST = 8010 ID_TEXTBOX_LIST = 8010
......
...@@ -10,12 +10,16 @@ ...@@ -10,12 +10,16 @@
#include <wx/aboutdlg.h> #include <wx/aboutdlg.h>
#include "wx/statline.h" #include "wx/statline.h"
#include "wx/generic/aboutdlgg.h" #include "wx/generic/aboutdlgg.h"
#include <wx/fontdlg.h>
#include "fctsys.h" #include "fctsys.h"
#include <wx/fontdlg.h> #include "appl_wxstruct.h"
#include "common.h" #include "common.h"
#include "online_help.h" #include "online_help.h"
#include "id.h" #include "id.h"
#include "confirm.h"
#include "eda_doc.h"
#include "wxstruct.h"
/*******************************************************/ /*******************************************************/
......
...@@ -9,8 +9,13 @@ ...@@ -9,8 +9,13 @@
#include "gr_basic.h" #include "gr_basic.h"
#include "wxstruct.h" #include "wxstruct.h"
#include "common.h" #include "common.h"
#include "sch_item_struct.h"
#include "macros.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"
/*******************/ /*******************/
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "fctsys.h" #include "fctsys.h"
#include "common.h" #include "common.h"
#include "base_struct.h"
#include "sch_item_struct.h" #include "sch_item_struct.h"
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include "common.h" #include "common.h"
#include "macros.h" #include "macros.h"
#include "build_version.h" #include "build_version.h"
#include "confirm.h"
#include <wx/process.h> #include <wx/process.h>
/*****************************/ /*****************************/
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "common.h" #include "common.h"
#include "plot_common.h" #include "plot_common.h"
#include "macros.h" #include "macros.h"
#include "kicad_string.h"
/***************************************************************************/ /***************************************************************************/
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
#include "trigo.h" #include "trigo.h"
#include "wxstruct.h" #include "wxstruct.h"
#include "base_struct.h" #include "base_struct.h"
#include "common.h"
#include "plot_common.h" #include "plot_common.h"
#include "macros.h" #include "macros.h"
#include "kicad_string.h"
/* parametre HPGL pour trace de cercle: */ /* parametre HPGL pour trace de cercle: */
#define CHORD_ANGLE 10 #define CHORD_ANGLE 10
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include "common.h" #include "common.h"
#include "plot_common.h" #include "plot_common.h"
#include "macros.h" #include "macros.h"
#include "kicad_string.h"
// Locales // Locales
static Ki_PageDescr* SheetPS; static Ki_PageDescr* SheetPS;
......
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
#include "plot_common.h" #include "plot_common.h"
#include "worksheet.h" #include "worksheet.h"
#include "macros.h" #include "macros.h"
#include "class_base_screen.h"
#include "drawtxt.h"
// Variables partagees avec Common plot Postscript et HPLG Routines // Variables partagees avec Common plot Postscript et HPLG Routines
......
...@@ -5,12 +5,17 @@ ...@@ -5,12 +5,17 @@
// Created: 18 aug 2006 // Created: 18 aug 2006
// Licence: License GNU // Licence: License GNU
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#include "wx/metafile.h" #include "wx/metafile.h"
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "id.h" #include "id.h"
#include "class_drawpanel.h"
#include "class_base_screen.h"
#include "confirm.h"
#include "wxstruct.h"
extern BASE_SCREEN* ActiveScreen; extern BASE_SCREEN* ActiveScreen;
......
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
/********************************/ /********************************/
#include "fctsys.h" #include "fctsys.h"
#include "wxstruct.h" #include "wxstruct.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "macros.h" #include "macros.h"
#include "kicad_string.h"
/***********************/ /***********************/
......
...@@ -7,11 +7,16 @@ ...@@ -7,11 +7,16 @@
#endif #endif
#include "fctsys.h" #include "fctsys.h"
#include "appl_wxstruct.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "bitmaps.h" #include "bitmaps.h"
#include "macros.h" #include "macros.h"
#include "id.h" #include "id.h"
#include "class_drawpanel.h"
#include "class_base_screen.h"
#include "wxstruct.h"
#include "confirm.h"
#include <wx/fontdlg.h> #include <wx/fontdlg.h>
......
/******************************************/ /******************************************/
/* drawpanel.cpp - WinEDA_DrawPanel class */ /* drawpanel.cpp - WinEDA_DrawPanel class */
/******************************************/ /******************************************/
#include "fctsys.h" #include "fctsys.h"
#include "appl_wxstruct.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "macros.h" #include "macros.h"
#include "id.h" #include "id.h"
#include "class_drawpanel.h"
#include "class_base_screen.h"
#include "wxstruct.h"
// Local defines // Local defines
#define CURSOR_SIZE 12 // Cursor size in pixels #define CURSOR_SIZE 12 // Cursor size in pixels
......
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
#include "trigo.h" #include "trigo.h"
#include "macros.h" #include "macros.h"
#include "class_drawpanel.h"
#include "class_base_screen.h"
#ifndef DEFAULT_SIZE_TEXT #ifndef DEFAULT_SIZE_TEXT
#define DEFAULT_SIZE_TEXT 50 #define DEFAULT_SIZE_TEXT 50
......
...@@ -2,24 +2,16 @@ ...@@ -2,24 +2,16 @@
/* eda_doc.cpp */ /* eda_doc.cpp */
/***************/ /***************/
// For compilers that support precompilation, includes "wx.h". #include "fctsys.h"
#include "wx/wxprec.h" #include "appl_wxstruct.h"
#include "common.h"
#ifdef __BORLANDC__ #include "confirm.h"
#pragma hdrstop #include "gestfich.h"
#endif
// 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/mimetype.h>
#include <wx/tokenzr.h> #include <wx/tokenzr.h>
#include <wx/filename.h>
#include "fctsys.h"
#include "wxstruct.h"
#include "common.h"
/*****************************************/ /*****************************************/
void WinEDA_App::ReadPdfBrowserInfos() void WinEDA_App::ReadPdfBrowserInfos()
......
...@@ -22,7 +22,9 @@ ...@@ -22,7 +22,9 @@
#include <wx/filename.h> #include <wx/filename.h>
#include <wx/stdpaths.h> #include <wx/stdpaths.h>
#include <wx/apptrait.h> #include <wx/apptrait.h>
#include <wx/snglinst.h>
#include "appl_wxstruct.h"
#include "common.h" #include "common.h"
#include "worksheet.h" #include "worksheet.h"
#include "id.h" #include "id.h"
...@@ -31,6 +33,7 @@ ...@@ -31,6 +33,7 @@
#include "macros.h" #include "macros.h"
#include "online_help.h" #include "online_help.h"
#include "bitmaps.h" #include "bitmaps.h"
#include "gestfich.h"
#ifdef __UNIX__ #ifdef __UNIX__
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include "fctsys.h" #include "fctsys.h"
#include "appl_wxstruct.h"
#include "wx/mimetype.h" #include "confirm.h"
#ifdef __WINDOWS__ #ifdef __WINDOWS__
#ifndef _MSC_VER #ifndef _MSC_VER
...@@ -16,6 +16,11 @@ ...@@ -16,6 +16,11 @@
#include "common.h" #include "common.h"
#include "macros.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. /* List of default paths used to locate help files and kicad library files.
* *
......
...@@ -4,9 +4,10 @@ ...@@ -4,9 +4,10 @@
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "macros.h" #include "macros.h"
#include "wxstruct.h"
/****************************************************************************/ /****************************************************************************/
/* Show a dialog frame to choose a name from an history list, or a new name */ /* Show a dialog frame to choose a name from an history list, or a new name */
......
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
#include "common.h" #include "common.h"
#include "trigo.h" #include "trigo.h"
#include "macros.h" #include "macros.h"
#include "base_struct.h"
#include "class_base_screen.h"
#ifndef FILLED #ifndef FILLED
#define FILLED 1 #define FILLED 1
......
...@@ -6,12 +6,16 @@ ...@@ -6,12 +6,16 @@
*/ */
#include "fctsys.h" #include "fctsys.h"
#include "appl_wxstruct.h"
#include "common.h" #include "common.h"
#include "wxstruct.h"
#include "hotkeys_basic.h" #include "hotkeys_basic.h"
#include "macros.h" #include "macros.h"
#include "bitmaps.h" #include "bitmaps.h"
#include "id.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 /* Class to handle hotkey commnands. hotkeys have a default value
......
...@@ -7,13 +7,14 @@ ...@@ -7,13 +7,14 @@
#endif #endif
#include "fctsys.h" #include "fctsys.h"
#include "wxstruct.h" #include "wxstruct.h"
#include "common.h" #include "common.h"
#include "colors.h"
/* table des evenements captes par un WinEDA_MsgPanel */ /* table des evenements captes par un WinEDA_MsgPanel */
BEGIN_EVENT_TABLE( WinEDA_MsgPanel, wxPanel ) BEGIN_EVENT_TABLE( WinEDA_MsgPanel, wxPanel )
EVT_PAINT( WinEDA_MsgPanel::OnPaint ) EVT_PAINT( WinEDA_MsgPanel::OnPaint )
END_EVENT_TABLE() END_EVENT_TABLE()
......
...@@ -4,8 +4,10 @@ ...@@ -4,8 +4,10 @@
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "appl_wxstruct.h"
#include "common.h" #include "common.h"
#include "kicad_string.h"
#include "gestfich.h"
#define CONFIG_VERSION 1 #define CONFIG_VERSION 1
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
#include "fctsys.h" #include "fctsys.h"
#include <time.h> #include <time.h>
#include "common.h"
#include "macros.h" #include "macros.h"
#include "kicad_string.h"
/*********************************************************************/ /*********************************************************************/
......
/******************************************************************/ /******************************************************************/
/* toolbars.cpp - fonctions des classes du type WinEDA_ttolbar */ /* toolbars.cpp - fonctions des classes du type WinEDA_ttolbar */
/******************************************************************/ /******************************************************************/
#ifdef __GNUG__ #ifdef __GNUG__
#pragma implementation #pragma implementation
#endif #endif
#include "fctsys.h" #include "fctsys.h"
#include "common.h" #include "wxstruct.h"
/*************************/
/* class WinEDA_HToolbar */
/*************************/
#include "id.h" WinEDA_Toolbar::WinEDA_Toolbar( id_toolbar type, wxWindow * parent,
wxWindowID id, bool horizontal ):
/*************************/ wxToolBar( parent, id, wxPoint( -1,-1 ), wxSize( -1,-1 ),
/* class WinEDA_HToolbar */ 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; m_Parent = parent;
Pnext = NULL; Pnext = NULL;
m_Ident = type; m_Ident = type;
m_Horizontal = horizontal; m_Horizontal = horizontal;
m_Size = 24; m_Size = 24;
SetToolBitmapSize(wxSize(16,16)); SetToolBitmapSize(wxSize(16,16));
SetMargins(0,0); SetMargins(0,0);
SetToolSeparation(1); SetToolSeparation(1);
SetToolPacking(1); SetToolPacking(1);
} }
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -4,12 +4,16 @@ ...@@ -4,12 +4,16 @@
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "macros.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" #include "worksheet.h"
/* Must be defined in main applications: */ /* Must be defined in main applications: */
extern wxString g_Main_Title; extern wxString g_Main_Title;
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include "fctsys.h" #include "fctsys.h"
#include "common.h" #include "common.h"
#include "wxstruct.h"
/**********************************************************************************/ /**********************************************************************************/
...@@ -23,7 +24,7 @@ WinEDA_EnterText::WinEDA_EnterText( wxWindow* parent, ...@@ -23,7 +24,7 @@ WinEDA_EnterText::WinEDA_EnterText( wxWindow* parent,
if( TextToEdit ) if( TextToEdit )
m_NewText = TextToEdit; m_NewText = TextToEdit;
m_Title = new wxStaticText( parent, -1, Title ); m_Title = new wxStaticText( parent, -1, Title );
m_Title->SetForegroundColour( wxColour( 200, 0, 0 ) ); m_Title->SetForegroundColour( wxColour( 200, 0, 0 ) );
BoxSizer->Add( m_Title, 0, wxGROW | wxLEFT | wxRIGHT | wxTOP | wxADJUST_MINSIZE, 5 ); BoxSizer->Add( m_Title, 0, wxGROW | wxLEFT | wxRIGHT | wxTOP | wxADJUST_MINSIZE, 5 );
......
...@@ -8,14 +8,13 @@ ...@@ -8,14 +8,13 @@
*/ */
#include "fctsys.h" #include "fctsys.h"
#include "common.h" #include "common.h"
#include "macros.h" #include "macros.h"
#include "bitmaps.h" #include "bitmaps.h"
#include "id.h" #include "id.h"
#include "class_drawpanel.h"
#include "class_base_screen.h"
#include "wxstruct.h"
/**************************************************/ /**************************************************/
void WinEDA_DrawFrame::Recadre_Trace( bool ToMouse ) void WinEDA_DrawFrame::Recadre_Trace( bool ToMouse )
......
...@@ -5,11 +5,13 @@ ...@@ -5,11 +5,13 @@
/* Routines de selection automatique des modules */ /* Routines de selection automatique des modules */
#include "fctsys.h" #include "fctsys.h"
#include "common.h" #include "common.h"
#include "cvpcb.h" #include "confirm.h"
#include "gestfich.h"
#include "cvpcb.h"
#include "protos.h" #include "protos.h"
#include "cvstruct.h"
#define QUOTE '\'' #define QUOTE '\''
......
...@@ -5,11 +5,12 @@ ...@@ -5,11 +5,12 @@
/* lit ou met a jour la configuration de CVPCB */ /* lit ou met a jour la configuration de CVPCB */
#include "fctsys.h" #include "fctsys.h"
#include "appl_wxstruct.h"
#include "common.h" #include "common.h"
#include "gestfich.h"
#include "cvpcb.h" #include "cvpcb.h"
#include "protos.h" #include "protos.h"
#include "cvstruct.h"
#include "cfg.h" #include "cfg.h"
/* Routines Locales */ /* Routines Locales */
......
...@@ -2,17 +2,21 @@ ...@@ -2,17 +2,21 @@
/* File: cvframe.cpp */ /* File: cvframe.cpp */
/*********************/ /*********************/
#include "fctsys.h" #include "fctsys.h"
#include "appl_wxstruct.h"
#include "common.h" #include "common.h"
#include "confirm.h"
#include "eda_doc.h"
#include "gestfich.h"
#include "id.h"
#include <wx/fontdlg.h> #include <wx/fontdlg.h>
#include "cvpcb.h" #include "cvpcb.h"
#include "pcbnew.h" #include "pcbnew.h"
#include "bitmaps.h" #include "bitmaps.h"
#include "protos.h" #include "protos.h"
#include "cvstruct.h"
#include "id.h"
#define FRAME_MIN_SIZE_X 450 #define FRAME_MIN_SIZE_X 450
#define FRAME_MIN_SIZE_Y 300 #define FRAME_MIN_SIZE_Y 300
......
...@@ -5,17 +5,19 @@ ...@@ -5,17 +5,19 @@
#define eda_global #define eda_global
#include "fctsys.h" #include "fctsys.h"
#include "appl_wxstruct.h"
#include "common.h" #include "common.h"
#include "confirm.h"
#include "gestfich.h"
#include "id.h"
#include "cvpcb.h" #include "cvpcb.h"
#include "trigo.h"
#include "zones.h" #include "zones.h"
#include "bitmaps.h" #include "bitmaps.h"
#include "protos.h" #include "protos.h"
#include "cvstruct.h"
#include "id.h" #include <wx/snglinst.h>
wxString g_Main_Title = wxT( "CVpcb" ); wxString g_Main_Title = wxT( "CVpcb" );
......
...@@ -7,12 +7,7 @@ ...@@ -7,12 +7,7 @@
#define eda_global extern #define eda_global extern
#endif #endif
#include "wxstruct.h"
#include "pcbnew.h" #include "pcbnew.h"
#include "cvstruct.h"
#include "gr_basic.h"
#include "colors.h"
// config for footprints doc file acces // config for footprints doc file acces
#define DOC_FOOTPRINTS_LIST_KEY wxT("footprints_doc_file") #define DOC_FOOTPRINTS_LIST_KEY wxT("footprints_doc_file")
......
...@@ -15,17 +15,6 @@ ...@@ -15,17 +15,6 @@
#pragma implementation "dialog_display_options.h" #pragma implementation "dialog_display_options.h"
#endif #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 ////@begin includes
////@end includes ////@end includes
#include "fctsys.h" #include "fctsys.h"
...@@ -34,6 +23,8 @@ ...@@ -34,6 +23,8 @@
#include "common.h" #include "common.h"
#include "cvpcb.h" #include "cvpcb.h"
#include "protos.h" #include "protos.h"
#include "class_drawpanel.h"
#include "cvstruct.h"
#include "dialog_display_options.h" #include "dialog_display_options.h"
......
...@@ -3,13 +3,15 @@ ...@@ -3,13 +3,15 @@
/*********************************************************************/ /*********************************************************************/
#include "fctsys.h" #include "fctsys.h"
#include "appl_wxstruct.h"
#include "common.h" #include "common.h"
#include "class_drawpanel.h"
#include "id.h"
#include "cvpcb.h" #include "cvpcb.h"
#include "id.h"
#include "bitmaps.h" #include "bitmaps.h"
#include "protos.h" #include "protos.h"
#include "cvstruct.h"
/*****************************************************************/ /*****************************************************************/
......
/***************/ /***************/
/* genstf() */ /* genstf() */
/***************/ /***************/
/* genere le fichier STF type 'ref' 'nom_empreinte' pour DRAFT */ /* genere le fichier STF type 'ref' 'nom_empreinte' pour DRAFT */
#include "fctsys.h" #include "fctsys.h"
#include "wxstruct.h" #include "wxstruct.h"
#include "common.h" #include "confirm.h"
#include "cvpcb.h" #include "gestfich.h"
#include "cvpcb.h"
#include "protos.h" #include "protos.h"
#include "cvstruct.h"
void WinEDA_CvpcbFrame::WriteStuffList(wxCommandEvent & event)
void WinEDA_CvpcbFrame::WriteStuffList( wxCommandEvent& event )
{ {
FILE * FileEquiv; FILE* FileEquiv;
STORECMP * Cmp; STORECMP* Cmp;
wxString Line, FullFileName, Mask; wxString Line, FullFileName, Mask;
if( nbcomp <= 0 ) return; if( nbcomp <= 0 )
return;
/* calcul du nom du fichier */
Mask = wxT("*") + ExtRetroBuffer; /* calcul du nom du fichier */
FullFileName = FFileName; Mask = wxT( "*" ) + ExtRetroBuffer;
ChangeFileNameExt(FullFileName, ExtRetroBuffer); FullFileName = FFileName;
ChangeFileNameExt( FullFileName, ExtRetroBuffer );
FullFileName = EDA_FileSelector( wxT("Create Stuff File"),
wxGetCwd(), /* Chemin par defaut */ FullFileName = EDA_FileSelector( wxT( "Create Stuff File" ),
FullFileName, /* nom fichier par defaut */ wxGetCwd(), /* Chemin par defaut */
ExtRetroBuffer, /* extension par defaut */ FullFileName, /* nom fichier par defaut */
Mask, /* Masque d'affichage */ ExtRetroBuffer, /* extension par defaut */
this, Mask, /* Masque d'affichage */
wxFD_SAVE, this,
TRUE wxFD_SAVE,
); TRUE );
if ( FullFileName.IsEmpty() ) return; 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;
return; DisplayError( this, Line, 30 );
} return;
}
/* Generation de la liste */
for (Cmp = g_BaseListeCmp ; Cmp != NULL ; Cmp = Cmp->Pnext ) /* Generation de la liste */
{ for( Cmp = g_BaseListeCmp; Cmp != NULL; Cmp = Cmp->Pnext )
/* gnration du composant si son empreinte est dfinie */ {
if ( Cmp->m_Module.IsEmpty() ) continue; /* gnration du composant si son empreinte est dfinie */
fprintf(FileEquiv, "comp = \"%s\" module = \"%s\"\n", if( Cmp->m_Module.IsEmpty() )
CONV_TO_UTF8(Cmp->m_Reference), continue;
CONV_TO_UTF8(Cmp->m_Module)); fprintf( FileEquiv, "comp = \"%s\" module = \"%s\"\n",
} CONV_TO_UTF8( Cmp->m_Reference ),
CONV_TO_UTF8( Cmp->m_Module ) );
fclose(FileEquiv); }
fclose( FileEquiv );
} }
This diff is collapsed.
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
/*************************************************************************/ /*************************************************************************/
#include "fctsys.h" #include "fctsys.h"
#include "wxstruct.h" #include "wxstruct.h"
#include "common.h" #include "common.h"
#include "cvpcb.h"
#include "id.h" #include "id.h"
#include "cvpcb.h"
#include "protos.h" #include "protos.h"
#include "cvstruct.h"
/******************************************************************************/ /******************************************************************************/
/* Basic class (from wxListView) for displaying component and footprint lists */ /* Basic class (from wxListView) for displaying component and footprint lists */
......
This diff is collapsed.
...@@ -3,11 +3,15 @@ ...@@ -3,11 +3,15 @@
/***************************************************/ /***************************************************/
#include "fctsys.h" #include "fctsys.h"
#include "wxstruct.h" #include "wxstruct.h"
#include "common.h" #include "common.h"
#include "confirm.h"
#include "kicad_string.h"
#include "gestfich.h"
#include "cvpcb.h" #include "cvpcb.h"
#include "protos.h" #include "protos.h"
#include "cvstruct.h"
/*****************************************************************/ /*****************************************************************/
...@@ -103,7 +107,8 @@ MODULE* WinEDA_DisplayFrame::Get_Module( const wxString& CmpName ) ...@@ -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 ) if( lib_module )
......
...@@ -5,10 +5,14 @@ ...@@ -5,10 +5,14 @@
/* cree et/ou affiche et modifie la configuration de CVPCB */ /* cree et/ou affiche et modifie la configuration de CVPCB */
#include "fctsys.h" #include "fctsys.h"
#include "appl_wxstruct.h"
#include "common.h" #include "common.h"
#include "confirm.h"
#include "gestfich.h"
#include "cvpcb.h" #include "cvpcb.h"
#include "protos.h" #include "protos.h"
#include "cvstruct.h"
/*****************************************/ /*****************************************/
......
...@@ -8,12 +8,15 @@ ...@@ -8,12 +8,15 @@
*/ */
#include "fctsys.h" #include "fctsys.h"
#include "wxstruct.h" #include "wxstruct.h"
#include "common.h" #include "common.h"
#include "cvpcb.h" #include "confirm.h"
#include "kicad_string.h"
#include "cvpcb.h"
#include "protos.h" #include "protos.h"
#include "cvstruct.h"
#define SEPARATEUR '|' /* caractere separateur dans netliste */ #define SEPARATEUR '|' /* caractere separateur dans netliste */
......
/**************/ /**************/
/* savecmp() */ /* savecmp() */
/**************/ /**************/
/* sauvegarde la liste des associations composants/empreintes */ /* sauvegarde la liste des associations composants/empreintes */
#include "fctsys.h" #include "fctsys.h"
#include "wxstruct.h" #include "wxstruct.h"
#include "common.h" #include "common.h"
#include "confirm.h"
#include "kicad_string.h"
#include "gestfich.h"
#include "cvpcb.h" #include "cvpcb.h"
#include "protos.h" #include "protos.h"
#include "cvstruct.h"
/* Chaines de caractere d'identification */ /* 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 /* Routine de sauvegarde du fichier des modules
Retourne 1 si OK * Retourne 1 si OK
0 si ecriture non faite * 0 si ecriture non faite
*/ */
{ {
STORECMP * Cmp; STORECMP* Cmp;
wxString FullFileName; wxString FullFileName;
char Line[1024]; char Line[1024];
wxString Title = g_Main_Title + wxT(" ") + GetBuildVersion(); wxString Title = g_Main_Title + wxT( " " ) + GetBuildVersion();
/* calcul du nom du fichier */ /* calcul du nom du fichier */
FullFileName = NetlistFullFileName; FullFileName = NetlistFullFileName;
ChangeFileNameExt(FullFileName, g_ExtCmpBuffer); ChangeFileNameExt( FullFileName, g_ExtCmpBuffer );
dest = wxFopen(FullFileName, wxT("wt") ); dest = wxFopen( FullFileName, wxT( "wt" ) );
if( dest == NULL ) return(0); /* Erreur ecriture */ if( dest == NULL )
return 0; /* Erreur ecriture */
fprintf(dest,"%s", EnteteCmpMod);
fprintf(dest," Created by %s", CONV_TO_UTF8(Title)); fprintf( dest, "%s", EnteteCmpMod );
fprintf(dest," date = %s\n", DateAndTime(Line)); 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, "\nBeginCmp\n" );
fprintf(dest,"Reference = %s;\n", CONV_TO_UTF8(Cmp->m_Reference)); fprintf( dest, "TimeStamp = %s;\n", CONV_TO_UTF8( Cmp->m_TimeStamp ) );
fprintf(dest,"ValeurCmp = %s;\n", CONV_TO_UTF8(Cmp->m_Valeur)); fprintf( dest, "Reference = %s;\n", CONV_TO_UTF8( Cmp->m_Reference ) );
fprintf(dest,"IdModule = %s;\n", CONV_TO_UTF8(Cmp->m_Module)); fprintf( dest, "ValeurCmp = %s;\n", CONV_TO_UTF8( Cmp->m_Valeur ) );
fprintf(dest,"EndCmp\n"); fprintf( dest, "IdModule = %s;\n", CONV_TO_UTF8( Cmp->m_Module ) );
} fprintf( dest, "EndCmp\n" );
fprintf(dest,"\nEndListe\n") ; }
fclose(dest) ;
fprintf( dest, "\nEndListe\n" );
return(1) ; fclose( dest );
return 1;
} }
/****************/ /****************/
int loadcmp() int loadcmp()
/***************/ /***************/
/* recupere la liste des associations composants/empreintes /* recupere la liste des associations composants/empreintes
*/ */
{ {
wxString timestamp, valeur, ilib, namecmp; wxString timestamp, valeur, ilib, namecmp;
bool read_cmp_data = FALSE, eof = FALSE; bool read_cmp_data = FALSE, eof = FALSE;
STORECMP * Cmp; STORECMP* Cmp;
char Line[1024], * ident, *data; char Line[1024], * ident, * data;
wxString FullFileName; wxString FullFileName;
/* calcul du nom du fichier */ /* calcul du nom du fichier */
FullFileName = FFileName; FullFileName = FFileName;
ChangeFileNameExt(FullFileName, g_ExtCmpBuffer); ChangeFileNameExt( FullFileName, g_ExtCmpBuffer );
source = wxFopen(FullFileName, wxT("rt") ); source = wxFopen( FullFileName, wxT( "rt" ) );
if (source == NULL ) if( source == NULL )
{ {
return(0) ; return 0;
} }
/* Identification du Type de fichier CmpMod */ /* Identification du Type de fichier CmpMod */
if ( fgets(Line,79,source) == 0 ) return(0); if( fgets( Line, 79, source ) == 0 )
if( strnicmp(Line, EnteteCmpMod, 11 ) != 0 ) /* old file version*/ return 0;
{ if( strnicmp( Line, EnteteCmpMod, 11 ) != 0 ) /* old file version*/
fclose(source) ; {
DisplayError( NULL, wxT("Old version of Componaent file, recreate it!")); fclose( source );
return(0) ; DisplayError( NULL,
} wxT( "Old version of Componaent file, recreate it!" ) );
return 0;
/* lecture de la liste */ }
while( ! eof && fgets(Line,79,source) != 0 )
{ /* lecture de la liste */
if( strnicmp(Line, "EndListe", 8 ) == 0 ) break; while( !eof && fgets( Line, 79, source ) != 0 )
{
/* Recherche du debut de description du composant */ if( strnicmp( Line, "EndListe", 8 ) == 0 )
if( strnicmp(Line, "BeginCmp", 8 ) != 0 ) continue; break;
timestamp.Empty();
valeur.Empty(); /* Recherche du debut de description du composant */
ilib.Empty(); if( strnicmp( Line, "BeginCmp", 8 ) != 0 )
namecmp.Empty(); continue;
read_cmp_data = TRUE; timestamp.Empty();
valeur.Empty();
while( ! eof && read_cmp_data ) ilib.Empty();
{ namecmp.Empty();
if( fgets(Line, 1024,source) == 0 ) read_cmp_data = TRUE;
{
eof = TRUE; break; while( !eof && read_cmp_data )
} {
if( fgets( Line, 1024, source ) == 0 )
if( strnicmp(Line, "EndCmp", 6 ) == 0 ) {
{ eof = TRUE; break;
read_cmp_data = TRUE; break; }
}
if( strnicmp( Line, "EndCmp", 6 ) == 0 )
ident = strtok ( Line,"=;\n\r"); {
data = strtok ( NULL,";\n\r"); read_cmp_data = TRUE; break;
if( strnicmp(ident, "TimeStamp", 9) == 0) }
{
timestamp = CONV_FROM_UTF8(data); ident = strtok( Line, "=;\n\r" );
timestamp.Trim(TRUE); data = strtok( NULL, ";\n\r" );
timestamp.Trim(FALSE); if( strnicmp( ident, "TimeStamp", 9 ) == 0 )
continue; {
} timestamp = CONV_FROM_UTF8( data );
timestamp.Trim( TRUE );
if( strnicmp(ident, "Reference", 9) == 0) timestamp.Trim( FALSE );
{ continue;
namecmp = CONV_FROM_UTF8(data); }
namecmp.Trim(TRUE);
namecmp.Trim(FALSE); if( strnicmp( ident, "Reference", 9 ) == 0 )
continue; {
} namecmp = CONV_FROM_UTF8( data );
namecmp.Trim( TRUE );
if( strnicmp(ident, "ValeurCmp", 9) == 0) namecmp.Trim( FALSE );
{ continue;
valeur = CONV_FROM_UTF8(data); }
valeur.Trim(TRUE);
valeur.Trim(FALSE); if( strnicmp( ident, "ValeurCmp", 9 ) == 0 )
continue; {
} valeur = CONV_FROM_UTF8( data );
valeur.Trim( TRUE );
if( strnicmp(ident, "IdModule", 8) == 0) valeur.Trim( FALSE );
{ continue;
ilib = CONV_FROM_UTF8(data); }
ilib.Trim(TRUE);
ilib.Trim(FALSE); if( strnicmp( ident, "IdModule", 8 ) == 0 )
continue; {
} ilib = CONV_FROM_UTF8( data );
} /* Fin lecture description de 1 composant */ ilib.Trim( TRUE );
ilib.Trim( FALSE );
/* Recherche du composant correspondant en netliste et continue;
mise a jour de ses parametres */ }
for ( Cmp = g_BaseListeCmp ; Cmp != NULL ; Cmp = Cmp->Pnext ) } /* Fin lecture description de 1 composant */
{
if (selection_type == 1 ) /* Recherche du composant correspondant en netliste et
{ * mise a jour de ses parametres */
if( timestamp != Cmp->m_TimeStamp ) for( Cmp = g_BaseListeCmp; Cmp != NULL; Cmp = Cmp->Pnext )
continue ; {
} if( selection_type == 1 )
else {
if( namecmp != Cmp->m_Reference ) continue; if( timestamp != Cmp->m_TimeStamp )
continue;
/* composant identifie , copie du nom du module correspondant */ }
Cmp->m_Module= ilib; else
} if( namecmp != Cmp->m_Reference )
} continue;
fclose(source) ;
return(1) ; /* composant identifie , copie du nom du module correspondant */
Cmp->m_Module = ilib;
}
}
fclose( source );
return 1;
} }
...@@ -3,14 +3,17 @@ ...@@ -3,14 +3,17 @@
/*********************************************************************/ /*********************************************************************/
#include "fctsys.h" #include "fctsys.h"
#include "common.h" #include "common.h"
#include "cvpcb.h" #include "class_drawpanel.h"
#include "3d_viewer.h"
#include "id.h" #include "id.h"
#include "bitmaps.h"
#include "3d_viewer.h"
#include "bitmaps.h"
#include "cvpcb.h"
#include "protos.h" #include "protos.h"
#include "cvstruct.h"
/*******************************************/ /*******************************************/
void WinEDA_CvpcbFrame::CreateScreenCmp() void WinEDA_CvpcbFrame::CreateScreenCmp()
......
...@@ -3,16 +3,15 @@ ...@@ -3,16 +3,15 @@
/***************************************************/ /***************************************************/
#include "fctsys.h" #include "fctsys.h"
#include "appl_wxstruct.h"
#include "common.h" #include "common.h"
#include "cvpcb.h" #include "id.h"
#include "trigo.h" #include "trigo.h"
#include "protos.h"
#include "bitmaps.h" #include "bitmaps.h"
#include "cvpcb.h"
#include "id.h" #include "protos.h"
#include "cvstruct.h"
/*********************************************/ /*********************************************/
......
This diff is collapsed.
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "wxstruct.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
......
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
#include "fctsys.h" #include "fctsys.h"
#include "common.h" #include "common.h"
#include "class_drawpanel.h"
#include "confirm.h"
#include "wxstruct.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "protos.h" #include "protos.h"
......
...@@ -15,17 +15,6 @@ ...@@ -15,17 +15,6 @@
#pragma implementation "annotate_dialog.h" #pragma implementation "annotate_dialog.h"
#endif #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 ////@begin includes
////@end includes ////@end includes
...@@ -33,6 +22,7 @@ ...@@ -33,6 +22,7 @@
#include "bitmaps.h" #include "bitmaps.h"
#include "common.h" #include "common.h"
#include "program.h" #include "program.h"
#include "annotate_dialog.h" #include "annotate_dialog.h"
extern void AnnotateComponents( WinEDA_SchematicFrame* parent, extern void AnnotateComponents( WinEDA_SchematicFrame* parent,
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
////@begin forward declarations ////@begin forward declarations
class wxBoxSizer; class wxBoxSizer;
class WinEDA_SchematicFrame;
////@end forward declarations ////@end forward declarations
/*! /*!
......
...@@ -4,9 +4,11 @@ ...@@ -4,9 +4,11 @@
****************************************************************/ ****************************************************************/
#include "fctsys.h" #include "fctsys.h"
#include "common.h" #include "common.h"
#include "program.h" #include "program.h"
#include "confirm.h"
#include "kicad_string.h"
#include "gestfich.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
...@@ -15,8 +17,7 @@ ...@@ -15,8 +17,7 @@
/*******************************************************************************************/ /*******************************************************************************************/
bool WinEDA_SchematicFrame::FillFootprintFieldForAllInstancesofComponent( bool WinEDA_SchematicFrame::FillFootprintFieldForAllInstancesofComponent(
const wxString& aReference, const wxString& aReference,
const wxString& const wxString& aFootPrint,
aFootPrint,
bool aSetVisible ) bool aSetVisible )
/********************************************************************************************/ /********************************************************************************************/
......
...@@ -4,12 +4,16 @@ ...@@ -4,12 +4,16 @@
/****************************************************/ /****************************************************/
#include "fctsys.h" #include "fctsys.h"
#include "appl_wxstruct.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "class_drawpanel.h"
#include "confirm.h"
#include "block_commande.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
#include "protos.h" #include "protos.h"
......
...@@ -5,12 +5,14 @@ ...@@ -5,12 +5,14 @@
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "class_drawpanel.h"
#include "confirm.h"
#include "block_commande.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
#include "protos.h" #include "protos.h"
/* Variables Locales */ /* Variables Locales */
......
...@@ -9,9 +9,10 @@ ...@@ -9,9 +9,10 @@
#include <vector> #include <vector>
#include "fctsys.h" #include "fctsys.h"
#include "common.h" #include "common.h"
#include "confirm.h"
#include "kicad_string.h"
#include "gestfich.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
......
...@@ -4,12 +4,13 @@ ...@@ -4,12 +4,13 @@
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "class_drawpanel.h"
#include "confirm.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
#include "protos.h" #include "protos.h"
......
...@@ -4,13 +4,14 @@ ...@@ -4,13 +4,14 @@
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "class_drawpanel.h"
#include "id.h"
#include "confirm.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
#include "id.h"
#include "protos.h" #include "protos.h"
/* Routines Locales */ /* Routines Locales */
......
...@@ -13,12 +13,14 @@ ...@@ -13,12 +13,14 @@
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "class_drawpanel.h"
#include "drawtxt.h"
#include "confirm.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
#include "protos.h" #include "protos.h"
......
...@@ -13,12 +13,13 @@ ...@@ -13,12 +13,13 @@
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "class_drawpanel.h"
#include "drawtxt.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
#include "protos.h" #include "protos.h"
......
...@@ -4,8 +4,7 @@ ...@@ -4,8 +4,7 @@
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "kicad_string.h"
#include "common.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
......
...@@ -3,8 +3,11 @@ ...@@ -3,8 +3,11 @@
/*****************/ /*****************/
#include "fctsys.h" #include "fctsys.h"
#include "appl_wxstruct.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "class_drawpanel.h"
#include "drawtxt.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "id.h"
#include "class_drawpanel.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
#include "protos.h" #include "protos.h"
#include "id.h"
/******************************************************************/ /******************************************************************/
......
...@@ -4,15 +4,15 @@ ...@@ -4,15 +4,15 @@
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "trigo.h" #include "trigo.h"
#include "id.h"
#include "class_drawpanel.h"
#include "drawtxt.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
#include "id.h"
#include "protos.h" #include "protos.h"
......
...@@ -4,8 +4,10 @@ ...@@ -4,8 +4,10 @@
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "class_drawpanel.h"
#include "drawtxt.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
......
...@@ -3,8 +3,9 @@ ...@@ -3,8 +3,9 @@
/*********************************/ /*********************************/
#include "fctsys.h" #include "fctsys.h"
#include "appl_wxstruct.h"
#include "common.h" #include "common.h"
#include "confirm.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "confirm.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
......
...@@ -3,18 +3,15 @@ ...@@ -3,18 +3,15 @@
/****************/ /****************/
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "program.h" #include "class_drawpanel.h"
#include "libcmp.h"
#include "general.h"
#include "eda_dde.h" #include "eda_dde.h"
#include "id.h" #include "id.h"
#include "program.h"
#include "libcmp.h"
#include "general.h"
#include "protos.h" #include "protos.h"
/**************************************************************************************/ /**************************************************************************************/
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
/*********************/ /*********************/
#include "fctsys.h" #include "fctsys.h"
#include "appl_wxstruct.h"
#include "common.h" #include "common.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
......
/****************************/ /****************************/
/* EESchema - database.cpp */ /* EESchema - database.cpp */
/****************************/ /****************************/
/* Routine de selection d'un composant en librairie /* Routine de selection d'un composant en librairie
*/ */
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "confirm.h"
#include "eda_doc.h"
#include "kicad_string.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
...@@ -22,110 +25,119 @@ ...@@ -22,110 +25,119 @@
/********************************************************************************/ /********************************************************************************/
bool DataBaseGetName(WinEDA_DrawFrame * frame, bool DataBaseGetName( WinEDA_DrawFrame* frame,
wxString & Keys, wxString & BufName) wxString& Keys, wxString& BufName )
/********************************************************************************/ /********************************************************************************/
/* /*
Routine de selection du nom d'un composant en librairie pour chargement, * Routine de selection du nom d'un composant en librairie pour chargement,
Keys pointe la liste des mots cles de filtrage * Keys pointe la liste des mots cles de filtrage
Si Keys = "", recherche des composants qui correspondent * Si Keys = "", recherche des composants qui correspondent
au masque BufName( avec * et ? ) * au masque BufName( avec * et ? )
*
Retourne * Retourne
TRUE si composant selectionne * TRUE si composant selectionne
FALSE si commande annulee * FALSE si commande annulee
place le nom du composant a charger, selectionne a partir d'une liste dans * place le nom du composant a charger, selectionne a partir d'une liste dans
BufName * BufName
*/ */
{ {
int ii; int ii;
EDA_LibComponentStruct * LibEntry; EDA_LibComponentStruct* LibEntry;
LibraryStruct * Lib; LibraryStruct* Lib;
WinEDAListBox * ListBox; WinEDAListBox* ListBox;
const wxChar ** ListNames; const wxChar** ListNames;
BufName.MakeUpper(); BufName.MakeUpper();
Keys.MakeUpper(); Keys.MakeUpper();
/* Examen de la liste des librairies pour comptage */ /* 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 ) while( LibEntry )
{ {
if ( ! Keys.IsEmpty() ) if( !Keys.IsEmpty() )
{ {
if( KeyWordOk(Keys, LibEntry->m_KeyWord) ) ii++; if( KeyWordOk( Keys, LibEntry->m_KeyWord ) )
} ii++;
else }
{ else
if( WildCompareString( BufName, LibEntry->m_Name.m_Text, FALSE ) ) ii++; {
} if( WildCompareString( BufName, LibEntry->m_Name.m_Text, FALSE ) )
LibEntry = (EDA_LibComponentStruct *) PQNext(Lib->m_Entries, LibEntry, NULL); ii++;
} }
} LibEntry = (EDA_LibComponentStruct*) PQNext( Lib->m_Entries,
LibEntry,
if ( ii == 0 ) NULL );
{ }
DisplayError(frame, _("No Component found") ); }
return 0;
} if( ii == 0 )
{
ListNames = (const wxChar**)MyZMalloc( (ii+1) * sizeof(const wxChar*)); DisplayError( frame, _( "No Component found" ) );
for (Lib = g_LibraryList, ii = 0; Lib != NULL; Lib = Lib->m_Pnext) return 0;
{ }
/* Examen de la liste des elements */
LibEntry = (EDA_LibComponentStruct *) PQFirst(&Lib->m_Entries, FALSE); ListNames = (const wxChar**) MyZMalloc( (ii + 1) * sizeof(const wxChar*) );
while( LibEntry ) for( Lib = g_LibraryList, ii = 0; Lib != NULL; Lib = Lib->m_Pnext )
{ {
if ( ! Keys.IsEmpty()) /* Examen de la liste des elements */
{ LibEntry = (EDA_LibComponentStruct*) PQFirst( &Lib->m_Entries, FALSE );
if( KeyWordOk(Keys, LibEntry->m_KeyWord) ) while( LibEntry )
{ {
ListNames[ii] = LibEntry->m_Name.m_Text.GetData(); ii++; if( !Keys.IsEmpty() )
} {
} if( KeyWordOk( Keys, LibEntry->m_KeyWord ) )
else if( WildCompareString( BufName, LibEntry->m_Name.m_Text, FALSE ) ) {
{ ListNames[ii] = LibEntry->m_Name.m_Text.GetData(); ii++;
ListNames[ii] = LibEntry->m_Name.m_Text; ii++; }
} }
LibEntry = (EDA_LibComponentStruct *) PQNext(Lib->m_Entries, LibEntry, NULL); else if( WildCompareString( BufName, LibEntry->m_Name.m_Text,
} FALSE ) )
} {
ListNames[ii] = LibEntry->m_Name.m_Text; ii++;
ListBox = new WinEDAListBox(frame, _("Selection"), ListNames, }
wxEmptyString, DisplayCmpDoc, wxColour(200,200,255) ); LibEntry = (EDA_LibComponentStruct*) PQNext( Lib->m_Entries,
ListBox->MoveMouseToOrigin(); LibEntry,
NULL );
/* Affichage de la liste selectionnee */ }
if( ii ) }
{
ii = ListBox->ShowModal(); ListBox->Destroy(); ListBox = new WinEDAListBox( frame, _( "Selection" ), ListNames,
if ( ii < 0 ) ii = 0; wxEmptyString, DisplayCmpDoc,
else wxColour( 200, 200, 255 ) );
{ ListBox->MoveMouseToOrigin();
BufName = ListNames[ii];
ii = 1; /* Affichage de la liste selectionnee */
} if( ii )
} {
ii = ListBox->ShowModal(); ListBox->Destroy();
if( ii < 0 )
free (ListNames); ii = 0;
return (ii) ; else
{
BufName = ListNames[ii];
ii = 1;
}
}
free( ListNames );
return ii;
} }
/**********************************/ /**********************************/
void DisplayCmpDoc(wxString & Name) void DisplayCmpDoc( wxString& Name )
/**********************************/ /**********************************/
{ {
LibCmpEntry * CmpEntry; LibCmpEntry* CmpEntry;
CmpEntry = FindLibPart(Name.GetData(), wxEmptyString, FIND_ALIAS); CmpEntry = FindLibPart( Name.GetData(), wxEmptyString, FIND_ALIAS );
if ( CmpEntry == NULL ) return; if( CmpEntry == NULL )
return;
Name = wxT("Descr: ") + CmpEntry->m_Doc; Name = wxT( "Descr: " ) + CmpEntry->m_Doc;
Name += wxT("\nKeyW: ") + CmpEntry->m_KeyWord; Name += wxT( "\nKeyW: " ) + CmpEntry->m_KeyWord;
} }
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
/*******************************************************/ /*******************************************************/
#include "fctsys.h" #include "fctsys.h"
#include "appl_wxstruct.h"
#include "common.h" #include "common.h"
#include "confirm.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
#include "protos.h" #include "protos.h"
......
...@@ -7,8 +7,12 @@ ...@@ -7,8 +7,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#include "fctsys.h" #include "fctsys.h"
#include "appl_wxstruct.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "class_drawpanel.h"
#include "confirm.h"
#include "gestfich.h"
#include "dialog_SVG_print_base.h" #include "dialog_SVG_print_base.h"
......
...@@ -16,18 +16,8 @@ ...@@ -16,18 +16,8 @@
#pragma implementation "dialog_build_BOM.h" #pragma implementation "dialog_build_BOM.h"
#endif #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 "fctsys.h"
#include "appl_wxstruct.h"
////@begin includes ////@begin includes
////@end includes ////@end includes
......
...@@ -15,21 +15,10 @@ ...@@ -15,21 +15,10 @@
#pragma implementation "dialog_create_component.h" #pragma implementation "dialog_create_component.h"
#endif #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 "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "confirm.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
......
...@@ -5,12 +5,13 @@ ...@@ -5,12 +5,13 @@
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "class_drawpanel.h"
#include "confirm.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
#include "protos.h" #include "protos.h"
#include "dialog_edit_component_in_schematic.h" #include "dialog_edit_component_in_schematic.h"
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "wx/valgen.h" #include "wx/valgen.h"
#include "common.h" #include "common.h"
#include "class_drawpanel.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <algorithm> #include <algorithm>
#include "common.h" #include "common.h"
#include "confirm.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
......
...@@ -15,22 +15,14 @@ ...@@ -15,22 +15,14 @@
#pragma implementation "dialog_eeschema_config.h" #pragma implementation "dialog_eeschema_config.h"
#endif #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 ////@begin includes
////@end includes ////@end includes
#include "fctsys.h" #include "fctsys.h"
#include "appl_wxstruct.h"
#include "common.h" #include "common.h"
#include "confirm.h"
#include "gestfich.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
......
...@@ -16,27 +16,16 @@ ...@@ -16,27 +16,16 @@
#pragma implementation "dialog_options.h" #pragma implementation "dialog_options.h"
#endif #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 "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "id.h"
#include "class_drawpanel.h"
#include "confirm.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
#include "id.h"
#include "protos.h" #include "protos.h"
////@begin includes ////@begin includes
......
...@@ -5,9 +5,11 @@ ...@@ -5,9 +5,11 @@
// Set this to 1 if you want to test PostScript printing under MSW. // Set this to 1 if you want to test PostScript printing under MSW.
#define wxTEST_POSTSCRIPT_IN_MSW 1 #define wxTEST_POSTSCRIPT_IN_MSW 1
#include "fctsys.h" #include "fctsys.h"
#include "appl_wxstruct.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "class_drawpanel.h"
#include "confirm.h"
#include "program.h" #include "program.h"
#include "general.h" #include "general.h"
......
...@@ -4,8 +4,10 @@ ...@@ -4,8 +4,10 @@
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "confirm.h"
#include "gestfich.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
......
...@@ -4,8 +4,10 @@ ...@@ -4,8 +4,10 @@
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "class_drawpanel.h"
#include "confirm.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
......
...@@ -9,8 +9,9 @@ ...@@ -9,8 +9,9 @@
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "class_drawpanel.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
......
...@@ -5,8 +5,10 @@ ...@@ -5,8 +5,10 @@
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "class_drawpanel.h"
#include "confirm.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
......
...@@ -3,8 +3,14 @@ ...@@ -3,8 +3,14 @@
/*******************************************************/ /*******************************************************/
#include "fctsys.h" #include "fctsys.h"
#include "appl_wxstruct.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "id.h"
#include "class_drawpanel.h"
#include "confirm.h"
#include "gestfich.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
...@@ -13,7 +19,6 @@ ...@@ -13,7 +19,6 @@
#include "worksheet.h" #include "worksheet.h"
#include "hotkeys.h" #include "hotkeys.h"
#include "id.h"
/* Variables locales */ /* Variables locales */
......
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "confirm.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
#include "protos.h" #include "protos.h"
/* Routines Locales */ /* Routines Locales */
......
...@@ -9,27 +9,15 @@ ...@@ -9,27 +9,15 @@
#pragma implementation "eelayer.h" #pragma implementation "eelayer.h"
#endif #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 "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "id.h"
#include "class_drawpanel.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
#include "id.h"
#include "protos.h" #include "protos.h"
#include "eelayer.h" // Header file associated with this file #include "eelayer.h" // Header file associated with this file
......
...@@ -4,8 +4,9 @@ ...@@ -4,8 +4,9 @@
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "class_drawpanel.h"
#include "drawtxt.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "component_class.h" #include "component_class.h"
......
...@@ -4,13 +4,15 @@ ...@@ -4,13 +4,15 @@
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "trigo.h" #include "trigo.h"
#include "confirm.h"
#include "kicad_string.h"
#include "gestfich.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
#include "protos.h" #include "protos.h"
/* Local Functions */ /* Local Functions */
......
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "class_drawpanel.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
#include "protos.h" #include "protos.h"
......
...@@ -10,19 +10,24 @@ ...@@ -10,19 +10,24 @@
#define MAIN #define MAIN
#include "fctsys.h" #include "fctsys.h"
#include "appl_wxstruct.h"
#include "common.h" #include "common.h"
#include "class_drawpanel.h"
#include "confirm.h"
#include "gestfich.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
#include "netlist.h" #include "netlist.h"
#include "worksheet.h" #include "worksheet.h"
#include "trigo.h"
#include "bitmaps.h" #include "bitmaps.h"
#include "eda_dde.h" #include "eda_dde.h"
#include "protos.h" #include "protos.h"
#include <wx/snglinst.h>
// Global variables // Global variables
wxString g_Main_Title( wxT( "EESchema" ) ); wxString g_Main_Title( wxT( "EESchema" ) );
......
...@@ -4,13 +4,16 @@ ...@@ -4,13 +4,16 @@
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "common.h" #include "common.h"
#include "class_drawpanel.h"
#include "confirm.h"
#include "kicad_string.h"
#include "gestfich.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
#include "netlist.h" #include "netlist.h"
#include "protos.h" #include "protos.h"
#include "bitmaps.h" #include "bitmaps.h"
......
...@@ -3,8 +3,10 @@ ...@@ -3,8 +3,10 @@
/****************************/ /****************************/
#include "fctsys.h" #include "fctsys.h"
#include "common.h" #include "common.h"
#include "class_drawpanel.h"
#include "confirm.h"
#include "gestfich.h"
#include "program.h" #include "program.h"
#include "libcmp.h" #include "libcmp.h"
#include "general.h" #include "general.h"
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment