Commit 18d83b76 authored by dickelbeck's avatar dickelbeck

See my change_log.txt 2007-Sep-13 UPDATE

parent 0c77cf80
...@@ -113,7 +113,7 @@ GLfloat ax,ay,az,bx,by,bz,nx,ny,nz,r; ...@@ -113,7 +113,7 @@ GLfloat ax,ay,az,bx,by,bz,nx,ny,nz,r;
/**********************************************/ /**********************************************/
GLuint Pcb3D_GLCanvas::DisplayCubeforTest(void) GLuint Pcb3D_GLCanvas::DisplayCubeforTest()
/**********************************************/ /**********************************************/
{ {
GLuint gllist = glGenLists( 1 ); GLuint gllist = glGenLists( 1 );
...@@ -158,7 +158,7 @@ GLuint gllist = glGenLists( 1 ); ...@@ -158,7 +158,7 @@ GLuint gllist = glGenLists( 1 );
/**********************/ /**********************/
/* Constructor */ /* Constructor */
Info_3D_Visu::Info_3D_Visu(void) Info_3D_Visu::Info_3D_Visu()
{ {
int ii; int ii;
m_Beginx = m_Beginy = 0.0; /* position of mouse */ m_Beginx = m_Beginy = 0.0; /* position of mouse */
...@@ -170,7 +170,7 @@ int ii; ...@@ -170,7 +170,7 @@ int ii;
} }
Info_3D_Visu::~Info_3D_Visu(void) Info_3D_Visu::~Info_3D_Visu()
{ {
} }
...@@ -216,13 +216,13 @@ wxStaticText * msgtitle; ...@@ -216,13 +216,13 @@ wxStaticText * msgtitle;
GridSizer->Add(m_ZValueCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5); GridSizer->Add(m_ZValueCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
} }
WinEDA_VertexCtrl::~WinEDA_VertexCtrl(void) WinEDA_VertexCtrl::~WinEDA_VertexCtrl()
{ {
} }
/*******************************************/ /*******************************************/
S3D_Vertex WinEDA_VertexCtrl::GetValue(void) S3D_Vertex WinEDA_VertexCtrl::GetValue()
/*******************************************/ /*******************************************/
/* Retourne (en unites internes) les coordonnes entrees (en unites utilisateur) /* Retourne (en unites internes) les coordonnes entrees (en unites utilisateur)
*/ */
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
/****************************/ /****************************/
S3D_Vertex::S3D_Vertex(void) S3D_Vertex::S3D_Vertex()
/****************************/ /****************************/
{ {
x = y = z = 0.0; x = y = z = 0.0;
...@@ -38,7 +38,7 @@ S3D_Material::S3D_Material( Struct3D_Master * father, const wxString & name ): ...@@ -38,7 +38,7 @@ S3D_Material::S3D_Material( Struct3D_Master * father, const wxString & name ):
} }
/***********************************/ /***********************************/
void S3D_Material::SetMaterial(void) void S3D_Material::SetMaterial()
/***********************************/ /***********************************/
{ {
glColorMaterial(GL_FRONT_AND_BACK,GL_AMBIENT_AND_DIFFUSE); glColorMaterial(GL_FRONT_AND_BACK,GL_AMBIENT_AND_DIFFUSE);
...@@ -77,7 +77,7 @@ Struct3D_Master::Struct3D_Master(EDA_BaseStruct * StructFather): ...@@ -77,7 +77,7 @@ Struct3D_Master::Struct3D_Master(EDA_BaseStruct * StructFather):
/***************************************/ /***************************************/
Struct3D_Master:: ~Struct3D_Master(void) Struct3D_Master:: ~Struct3D_Master()
/***************************************/ /***************************************/
{ {
Struct3D_Shape * next; Struct3D_Shape * next;
...@@ -110,7 +110,7 @@ Struct3D_Shape::Struct3D_Shape(EDA_BaseStruct * StructFather): ...@@ -110,7 +110,7 @@ Struct3D_Shape::Struct3D_Shape(EDA_BaseStruct * StructFather):
/***************************************/ /***************************************/
Struct3D_Shape:: ~Struct3D_Shape(void) Struct3D_Shape:: ~Struct3D_Shape()
/***************************************/ /***************************************/
{ {
delete m_3D_Coord; delete m_3D_Coord;
......
...@@ -72,7 +72,7 @@ void Pcb3D_GLCanvas::Redraw( bool finish ) ...@@ -72,7 +72,7 @@ void Pcb3D_GLCanvas::Redraw( bool finish )
} }
/**********************************************/ /**********************************************/
GLuint Pcb3D_GLCanvas::CreateDrawGL_List(void) GLuint Pcb3D_GLCanvas::CreateDrawGL_List()
/**********************************************/ /**********************************************/
/* Creation de la liste des elements a afficher /* Creation de la liste des elements a afficher
*/ */
......
...@@ -95,7 +95,7 @@ void WinEDA3D_DrawFrame::OnCloseWindow(wxCloseEvent & Event) ...@@ -95,7 +95,7 @@ void WinEDA3D_DrawFrame::OnCloseWindow(wxCloseEvent & Event)
/******************************************/ /******************************************/
void WinEDA3D_DrawFrame::GetSettings(void) void WinEDA3D_DrawFrame::GetSettings()
/******************************************/ /******************************************/
{ {
wxString text; wxString text;
...@@ -122,7 +122,7 @@ wxConfig * Config = m_ParentAppl->m_EDA_Config; // Current config used by appl ...@@ -122,7 +122,7 @@ wxConfig * Config = m_ParentAppl->m_EDA_Config; // Current config used by appl
} }
/*******************************************/ /*******************************************/
void WinEDA3D_DrawFrame::SaveSettings(void) void WinEDA3D_DrawFrame::SaveSettings()
/*******************************************/ /*******************************************/
{ {
wxString text; wxString text;
...@@ -200,7 +200,7 @@ void WinEDA3D_DrawFrame::OnRightClick(const wxPoint& MousePos, wxMenu * PopMenu) ...@@ -200,7 +200,7 @@ void WinEDA3D_DrawFrame::OnRightClick(const wxPoint& MousePos, wxMenu * PopMenu)
} }
/************************************/ /************************************/
int WinEDA3D_DrawFrame::BestZoom(void) int WinEDA3D_DrawFrame::BestZoom()
/************************************/ /************************************/
// Retourne le meilleur zoom // Retourne le meilleur zoom
{ {
...@@ -288,7 +288,7 @@ void WinEDA3D_DrawFrame::Process_Special_Functions(wxCommandEvent& event) ...@@ -288,7 +288,7 @@ void WinEDA3D_DrawFrame::Process_Special_Functions(wxCommandEvent& event)
/*****************************************/ /*****************************************/
void WinEDA3D_DrawFrame::NewDisplay(void) void WinEDA3D_DrawFrame::NewDisplay()
/*****************************************/ /*****************************************/
{ {
m_Canvas->ClearLists(); m_Canvas->ClearLists();
...@@ -299,7 +299,7 @@ void WinEDA3D_DrawFrame::NewDisplay(void) ...@@ -299,7 +299,7 @@ void WinEDA3D_DrawFrame::NewDisplay(void)
/******************************************/ /******************************************/
void WinEDA3D_DrawFrame::Set3DBgColor(void) void WinEDA3D_DrawFrame::Set3DBgColor()
/******************************************/ /******************************************/
/* called to set the background color of the 3D scene /* called to set the background color of the 3D scene
*/ */
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
/***********************************/ /***********************************/
int Struct3D_Master:: ReadData(void) int Struct3D_Master:: ReadData()
/************************************/ /************************************/
{ {
char line[1024], *text; char line[1024], *text;
......
...@@ -21,7 +21,7 @@ class S3D_Color /* This is a 3D color (R, G, G) 3 floats range 0 to 1.0*/ ...@@ -21,7 +21,7 @@ class S3D_Color /* This is a 3D color (R, G, G) 3 floats range 0 to 1.0*/
public: public:
double m_Red, m_Green, m_Blue; double m_Red, m_Green, m_Blue;
public: public:
S3D_Color(void) S3D_Color()
{ {
m_Red = m_Green = m_Blue = 0; m_Red = m_Green = m_Blue = 0;
} }
...@@ -32,7 +32,7 @@ class S3D_Vertex /* This is a 3D coordinate (3 float numbers: x,y,z coordinates) ...@@ -32,7 +32,7 @@ class S3D_Vertex /* This is a 3D coordinate (3 float numbers: x,y,z coordinates)
public: public:
double x, y, z; double x, y, z;
public: public:
S3D_Vertex(void); S3D_Vertex();
}; };
class S3D_Material: public EDA_BaseStruct /* openGL "material" data*/ class S3D_Material: public EDA_BaseStruct /* openGL "material" data*/
...@@ -48,7 +48,7 @@ public: ...@@ -48,7 +48,7 @@ public:
public: public:
S3D_Material(Struct3D_Master * father, const wxString & name); S3D_Material(Struct3D_Master * father, const wxString & name);
void SetMaterial(void); void SetMaterial();
}; };
/*******************************************/ /*******************************************/
...@@ -67,10 +67,10 @@ public: ...@@ -67,10 +67,10 @@ public:
public: public:
Struct3D_Master(EDA_BaseStruct * StructFather); Struct3D_Master(EDA_BaseStruct * StructFather);
~Struct3D_Master(void); ~Struct3D_Master();
void Copy(Struct3D_Master * pattern); void Copy(Struct3D_Master * pattern);
int ReadData(void); int ReadData();
int ReadMaterial(FILE * file, int *LineNum); int ReadMaterial(FILE * file, int *LineNum);
int ReadChildren(FILE * file, int *LineNum); int ReadChildren(FILE * file, int *LineNum);
int ReadShape(FILE * file, int *LineNum); int ReadShape(FILE * file, int *LineNum);
...@@ -94,7 +94,7 @@ public: ...@@ -94,7 +94,7 @@ public:
public: public:
Struct3D_Shape(EDA_BaseStruct * StructFather); Struct3D_Shape(EDA_BaseStruct * StructFather);
~Struct3D_Shape(void); ~Struct3D_Shape();
int ReadData(FILE * file, int *LineNum); int ReadData(FILE * file, int *LineNum);
}; };
...@@ -123,9 +123,9 @@ public: ...@@ -123,9 +123,9 @@ public:
wxBoxSizer * BoxSizer, wxBoxSizer * BoxSizer,
int units, int internal_unit); int units, int internal_unit);
~WinEDA_VertexCtrl(void); ~WinEDA_VertexCtrl();
S3D_Vertex GetValue(void); S3D_Vertex GetValue();
void SetValue(S3D_Vertex vertex); void SetValue(S3D_Vertex vertex);
void Enable(bool enbl); void Enable(bool enbl);
void SetToolTip(const wxString & text); void SetToolTip(const wxString & text);
......
...@@ -61,8 +61,8 @@ public: ...@@ -61,8 +61,8 @@ public:
when scaled tey are between -1.0 and +1.0 */ when scaled tey are between -1.0 and +1.0 */
float m_LayerZcoord[32]; float m_LayerZcoord[32];
public: public:
Info_3D_Visu(void); Info_3D_Visu();
~Info_3D_Visu(void); ~Info_3D_Visu();
}; };
...@@ -78,9 +78,9 @@ private: ...@@ -78,9 +78,9 @@ private:
public: public:
Pcb3D_GLCanvas(WinEDA3D_DrawFrame *parent, const wxWindowID id = -1, Pcb3D_GLCanvas(WinEDA3D_DrawFrame *parent, const wxWindowID id = -1,
int* gl_attrib = NULL); int* gl_attrib = NULL);
~Pcb3D_GLCanvas(void); ~Pcb3D_GLCanvas();
void ClearLists(void); void ClearLists();
void OnPaint(wxPaintEvent& event); void OnPaint(wxPaintEvent& event);
void OnSize(wxSizeEvent& event); void OnSize(wxSizeEvent& event);
...@@ -91,16 +91,16 @@ public: ...@@ -91,16 +91,16 @@ public:
void OnPopUpMenu(wxCommandEvent & event); void OnPopUpMenu(wxCommandEvent & event);
void TakeScreenshot(wxCommandEvent & event); void TakeScreenshot(wxCommandEvent & event);
void SetView3D(int keycode); void SetView3D(int keycode);
void DisplayStatus(void); void DisplayStatus();
void Redraw(bool finish = false); void Redraw(bool finish = false);
GLuint DisplayCubeforTest(void); GLuint DisplayCubeforTest();
void OnEnterWindow( wxMouseEvent& event ); void OnEnterWindow( wxMouseEvent& event );
void Render(); void Render();
GLuint CreateDrawGL_List(void); GLuint CreateDrawGL_List();
void InitGL(void); void InitGL();
void SetLights(void); void SetLights();
void Draw3D_Track(TRACK * track); void Draw3D_Track(TRACK * track);
void Draw3D_Via(SEGVIA * via); void Draw3D_Via(SEGVIA * via);
void Draw3D_DrawSegment(DRAWSEGMENT * segment); void Draw3D_DrawSegment(DRAWSEGMENT * segment);
...@@ -132,23 +132,23 @@ public: ...@@ -132,23 +132,23 @@ public:
void Exit3DFrame(wxCommandEvent& event); void Exit3DFrame(wxCommandEvent& event);
void OnCloseWindow(wxCloseEvent & Event); void OnCloseWindow(wxCloseEvent & Event);
void ReCreateMenuBar(void); void ReCreateMenuBar();
void ReCreateHToolbar(void); void ReCreateHToolbar();
void ReCreateVToolbar(void); void ReCreateVToolbar();
void SetToolbars(void); void SetToolbars();
void GetSettings(void); void GetSettings();
void SaveSettings(void); void SaveSettings();
void OnLeftClick(wxDC * DC, const wxPoint& MousePos); void OnLeftClick(wxDC * DC, const wxPoint& MousePos);
void OnRightClick(const wxPoint& MousePos, wxMenu * PopMenu); void OnRightClick(const wxPoint& MousePos, wxMenu * PopMenu);
void OnKeyEvent(wxKeyEvent& event); void OnKeyEvent(wxKeyEvent& event);
int BestZoom(void); // Retourne le meilleur zoom int BestZoom(); // Retourne le meilleur zoom
void RedrawActiveWindow(wxDC * DC, bool EraseBg); void RedrawActiveWindow(wxDC * DC, bool EraseBg);
void Process_Special_Functions(wxCommandEvent& event); void Process_Special_Functions(wxCommandEvent& event);
void Process_Zoom(wxCommandEvent& event); void Process_Zoom(wxCommandEvent& event);
void NewDisplay(void); void NewDisplay();
void Set3DBgColor(void); void Set3DBgColor();
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
......
...@@ -4,6 +4,17 @@ Started 2007-June-11 ...@@ -4,6 +4,17 @@ 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.
2007-Sep-13 UPDATE Dick Hollenbeck <dick@softplc.com>
================================================================================
+ kicad
* Inverted the logic associated with filters. Filters now enable a file
in the project manager. The default is to ignore all files.
* The filter for *.sch files is smarter, in that it looks to display only
top level *.sch files, rather than all *.sch files.
+ Others
More beautification
2007-sept-13 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr> 2007-sept-13 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
================================================================================ ================================================================================
+ all + all
......
...@@ -48,7 +48,7 @@ wxSize minsize; ...@@ -48,7 +48,7 @@ wxSize minsize;
} }
/******************************************/ /******************************************/
WinEDA_BasicFrame::~WinEDA_BasicFrame(void) WinEDA_BasicFrame::~WinEDA_BasicFrame()
/******************************************/ /******************************************/
{ {
if ( m_Parent->m_HtmlCtrl ) delete m_Parent->m_HtmlCtrl; if ( m_Parent->m_HtmlCtrl ) delete m_Parent->m_HtmlCtrl;
...@@ -56,7 +56,7 @@ WinEDA_BasicFrame::~WinEDA_BasicFrame(void) ...@@ -56,7 +56,7 @@ WinEDA_BasicFrame::~WinEDA_BasicFrame(void)
} }
/********************************************/ /********************************************/
void WinEDA_BasicFrame::ReCreateMenuBar(void) void WinEDA_BasicFrame::ReCreateMenuBar()
/********************************************/ /********************************************/
// Virtual function // Virtual function
{ {
...@@ -64,7 +64,7 @@ void WinEDA_BasicFrame::ReCreateMenuBar(void) ...@@ -64,7 +64,7 @@ void WinEDA_BasicFrame::ReCreateMenuBar(void)
/*********************************************/ /*********************************************/
void WinEDA_BasicFrame::GetSettings(void) void WinEDA_BasicFrame::GetSettings()
/*********************************************/ /*********************************************/
{ {
wxString text; wxString text;
...@@ -94,7 +94,7 @@ int Ypos_min; ...@@ -94,7 +94,7 @@ int Ypos_min;
/*****************************************/ /*****************************************/
void WinEDA_BasicFrame::SaveSettings(void) void WinEDA_BasicFrame::SaveSettings()
/*****************************************/ /*****************************************/
{ {
wxString text; wxString text;
......
...@@ -27,7 +27,7 @@ int PlotOrientOptions, etat_plume; ...@@ -27,7 +27,7 @@ int PlotOrientOptions, etat_plume;
static Ki_PageDescr * SheetPS; static Ki_PageDescr * SheetPS;
/*************************/ /*************************/
void ForcePenReinit(void) void ForcePenReinit()
/*************************/ /*************************/
/* set the flag g_CurrentPenWidth to -1 in order to force a pen width redefinition /* set the flag g_CurrentPenWidth to -1 in order to force a pen width redefinition
for the next draw command for the next draw command
......
...@@ -133,13 +133,13 @@ int ii; ...@@ -133,13 +133,13 @@ int ii;
} }
WinEDAListBox:: ~WinEDAListBox(void) WinEDAListBox:: ~WinEDAListBox()
{ {
} }
/******************************************/ /******************************************/
void WinEDAListBox::MoveMouseToOrigin(void) void WinEDAListBox::MoveMouseToOrigin()
/******************************************/ /******************************************/
{ {
int x, y, w, h; int x, y, w, h;
...@@ -153,7 +153,7 @@ int orgy = m_List->GetRect().GetTop(); ...@@ -153,7 +153,7 @@ int orgy = m_List->GetRect().GetTop();
} }
/*********************************************/ /*********************************************/
wxString WinEDAListBox::GetTextSelection(void) wxString WinEDAListBox::GetTextSelection()
/*********************************************/ /*********************************************/
{ {
wxString text = m_List->GetStringSelection(); wxString text = m_List->GetStringSelection();
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "common.h" #include "common.h"
/*****************************************/ /*****************************************/
void WinEDA_App::ReadPdfBrowserInfos(void) void WinEDA_App::ReadPdfBrowserInfos()
/*****************************************/ /*****************************************/
/* Read from Common config the Pdf browser choice /* Read from Common config the Pdf browser choice
*/ */
...@@ -36,7 +36,7 @@ void WinEDA_App::ReadPdfBrowserInfos(void) ...@@ -36,7 +36,7 @@ void WinEDA_App::ReadPdfBrowserInfos(void)
} }
/*****************************************/ /*****************************************/
void WinEDA_App::WritePdfBrowserInfos(void) void WinEDA_App::WritePdfBrowserInfos()
/*****************************************/ /*****************************************/
/* Write into Common config the Pdf browser choice /* Write into Common config the Pdf browser choice
*/ */
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
/* Constructeur de WinEDA_App */ /* Constructeur de WinEDA_App */
/*****************************/ /*****************************/
WinEDA_App::WinEDA_App(void) WinEDA_App::WinEDA_App()
{ {
m_Checker = NULL; m_Checker = NULL;
m_MainFrame = NULL; m_MainFrame = NULL;
...@@ -84,7 +84,7 @@ WinEDA_App::WinEDA_App(void) ...@@ -84,7 +84,7 @@ WinEDA_App::WinEDA_App(void)
/* Destructeur de WinEDA_App */ /* Destructeur de WinEDA_App */
/*****************************/ /*****************************/
WinEDA_App::~WinEDA_App(void) WinEDA_App::~WinEDA_App()
{ {
SaveSettings(); SaveSettings();
...@@ -166,7 +166,7 @@ bool succes = SetLanguage(TRUE); ...@@ -166,7 +166,7 @@ bool succes = SetLanguage(TRUE);
/*****************************************/ /*****************************************/
void WinEDA_App::InitOnLineHelp(void) void WinEDA_App::InitOnLineHelp()
/*****************************************/ /*****************************************/
/* Init On Line Help /* Init On Line Help
*/ */
...@@ -187,7 +187,7 @@ wxString fullfilename = FindKicadHelpPath(); ...@@ -187,7 +187,7 @@ wxString fullfilename = FindKicadHelpPath();
/*******************************/ /*******************************/
bool WinEDA_App::SetBinDir(void) bool WinEDA_App::SetBinDir()
/*******************************/ /*******************************/
/* /*
Analyse la ligne de commande pour retrouver le chemin de l'executable Analyse la ligne de commande pour retrouver le chemin de l'executable
...@@ -236,7 +236,7 @@ int ii; ...@@ -236,7 +236,7 @@ int ii;
/*********************************/ /*********************************/
void WinEDA_App::GetSettings(void) void WinEDA_App::GetSettings()
/*********************************/ /*********************************/
/* Lit les infos utiles sauvees lors de la derniere utilisation du logiciel /* Lit les infos utiles sauvees lors de la derniere utilisation du logiciel
*/ */
...@@ -305,7 +305,7 @@ unsigned ii; ...@@ -305,7 +305,7 @@ unsigned ii;
/**********************************/ /**********************************/
void WinEDA_App::SaveSettings(void) void WinEDA_App::SaveSettings()
/**********************************/ /**********************************/
{ {
unsigned int ii; unsigned int ii;
...@@ -583,7 +583,7 @@ wxMenuItem * item; ...@@ -583,7 +583,7 @@ wxMenuItem * item;
} }
int WinEDA_App::OnRun(void) int WinEDA_App::OnRun()
/* Run init scripts */ /* Run init scripts */
{ {
#ifdef KICAD_PYTHON #ifdef KICAD_PYTHON
......
...@@ -43,7 +43,7 @@ double value; ...@@ -43,7 +43,7 @@ double value;
} }
/**********************/ /**********************/
wxString GenDate(void) wxString GenDate()
/**********************/ /**********************/
/* Retourne la chaine de caractere donnant la date */ /* Retourne la chaine de caractere donnant la date */
{ {
......
...@@ -46,7 +46,7 @@ public: ...@@ -46,7 +46,7 @@ public:
WinEDA_SelectCmp(WinEDA_DrawFrame *parent, const wxPoint& framepos, WinEDA_SelectCmp(WinEDA_DrawFrame *parent, const wxPoint& framepos,
wxArrayString & HistoryList, const wxString & Title, wxArrayString & HistoryList, const wxString & Title,
bool show_extra_tool ); bool show_extra_tool );
~WinEDA_SelectCmp(void) {}; ~WinEDA_SelectCmp() {};
private: private:
void Accept(wxCommandEvent& event); void Accept(wxCommandEvent& event);
......
...@@ -34,7 +34,7 @@ WinEDA_MsgPanel::WinEDA_MsgPanel(WinEDA_DrawFrame *parent, int id, ...@@ -34,7 +34,7 @@ WinEDA_MsgPanel::WinEDA_MsgPanel(WinEDA_DrawFrame *parent, int id,
WinEDA_MsgPanel::~WinEDA_MsgPanel(void) WinEDA_MsgPanel::~WinEDA_MsgPanel()
{ {
} }
...@@ -110,7 +110,7 @@ wxClientDC dc(this); ...@@ -110,7 +110,7 @@ wxClientDC dc(this);
} }
/****************************************/ /****************************************/
void WinEDA_MsgPanel::EraseMsgBox(void) void WinEDA_MsgPanel::EraseMsgBox()
/****************************************/ /****************************************/
/* Effacement de la fenetre d'affichage des messages de bas d'ecran /* Effacement de la fenetre d'affichage des messages de bas d'ecran
*/ */
......
...@@ -55,7 +55,7 @@ static void RegisterCb( str objKey, object callback ) ...@@ -55,7 +55,7 @@ static void RegisterCb( str objKey, object callback )
static void UnRegisterCb( str objKey, object callback ) static void UnRegisterCb( str objKey, object callback )
{ PyHandler::GetInstance()->UnRegisterCallback( PyHandler::MakeStr(objKey), callback ); } { PyHandler::GetInstance()->UnRegisterCallback( PyHandler::MakeStr(objKey), callback ); }
static void init_base_utils(void) static void init_base_utils()
{ {
def ( "ChooseFile", &ChooseFile ); def ( "ChooseFile", &ChooseFile );
def ( "RegisterCallback", &RegisterCb ); def ( "RegisterCallback", &RegisterCb );
......
...@@ -30,7 +30,7 @@ public: ...@@ -30,7 +30,7 @@ public:
// Constructor and destructor // Constructor and destructor
WinEDA_SelColorFrame(wxWindow *parent, WinEDA_SelColorFrame(wxWindow *parent,
const wxPoint& framepos, int OldColor); const wxPoint& framepos, int OldColor);
~WinEDA_SelColorFrame(void) {}; ~WinEDA_SelColorFrame() {};
private: private:
void OnCancel(wxCommandEvent& event); void OnCancel(wxCommandEvent& event);
......
...@@ -96,7 +96,7 @@ struct tm * Date; ...@@ -96,7 +96,7 @@ struct tm * Date;
} }
/*******************************/ /*******************************/
wxString DateAndTime(void) wxString DateAndTime()
/*******************************/ /*******************************/
/* Retourne la chaine de caractere donnant date+heure */ /* Retourne la chaine de caractere donnant date+heure */
{ {
......
...@@ -279,7 +279,7 @@ wxIcon WinEDA_PrintSVGFrame::GetIconResource( const wxString& name ) ...@@ -279,7 +279,7 @@ wxIcon WinEDA_PrintSVGFrame::GetIconResource( const wxString& name )
/******************************************************/ /******************************************************/
wxString WinEDA_PrintSVGFrame::ReturnFullFileName(void) wxString WinEDA_PrintSVGFrame::ReturnFullFileName()
/******************************************************/ /******************************************************/
{ {
wxString name, ext; wxString name, ext;
......
...@@ -122,7 +122,7 @@ public: ...@@ -122,7 +122,7 @@ public:
void PrintSVGDoc(wxCommandEvent& event); void PrintSVGDoc(wxCommandEvent& event);
bool DrawPage(const wxString & FullFileName); bool DrawPage(const wxString & FullFileName);
void SetPenWidth(wxSpinEvent& event); void SetPenWidth(wxSpinEvent& event);
wxString ReturnFullFileName(void); wxString ReturnFullFileName();
////@begin WinEDA_PrintSVGFrame member variables ////@begin WinEDA_PrintSVGFrame member variables
wxSpinCtrl* m_ButtPenWidth; wxSpinCtrl* m_ButtPenWidth;
......
...@@ -31,7 +31,7 @@ WinEDA_EnterText::WinEDA_EnterText(wxWindow *parent, const wxString &Title, ...@@ -31,7 +31,7 @@ WinEDA_EnterText::WinEDA_EnterText(wxWindow *parent, const wxString &Title,
/****************************************/ /****************************************/
wxString WinEDA_EnterText::GetValue(void) wxString WinEDA_EnterText::GetValue()
/****************************************/ /****************************************/
{ {
m_Modify = m_FrameText->IsModified(); m_Modify = m_FrameText->IsModified();
...@@ -101,7 +101,7 @@ WinEDA_GraphicTextCtrl::WinEDA_GraphicTextCtrl(wxWindow *parent, ...@@ -101,7 +101,7 @@ WinEDA_GraphicTextCtrl::WinEDA_GraphicTextCtrl(wxWindow *parent,
} }
WinEDA_GraphicTextCtrl::~WinEDA_GraphicTextCtrl(void) WinEDA_GraphicTextCtrl::~WinEDA_GraphicTextCtrl()
{ {
delete m_FrameText; delete m_FrameText;
delete m_Title; delete m_Title;
...@@ -126,13 +126,13 @@ void WinEDA_GraphicTextCtrl::SetValue(int value) ...@@ -126,13 +126,13 @@ void WinEDA_GraphicTextCtrl::SetValue(int value)
} }
wxString WinEDA_GraphicTextCtrl::GetText(void) wxString WinEDA_GraphicTextCtrl::GetText()
{ {
wxString text = m_FrameText->GetValue(); wxString text = m_FrameText->GetValue();
return text; return text;
} }
int WinEDA_GraphicTextCtrl::GetTextSize(void) int WinEDA_GraphicTextCtrl::GetTextSize()
{ {
int textsize; int textsize;
double dtmp; double dtmp;
...@@ -188,7 +188,7 @@ wxString text; ...@@ -188,7 +188,7 @@ wxString text;
} }
WinEDA_PositionCtrl::~WinEDA_PositionCtrl(void) WinEDA_PositionCtrl::~WinEDA_PositionCtrl()
{ {
delete m_TextX; delete m_TextX;
delete m_TextY; delete m_TextY;
...@@ -197,7 +197,7 @@ WinEDA_PositionCtrl::~WinEDA_PositionCtrl(void) ...@@ -197,7 +197,7 @@ WinEDA_PositionCtrl::~WinEDA_PositionCtrl(void)
} }
/******************************************/ /******************************************/
wxPoint WinEDA_PositionCtrl::GetValue(void) wxPoint WinEDA_PositionCtrl::GetValue()
/******************************************/ /******************************************/
/* Retourne (en unites internes) les coordonnes entrees (en unites utilisateur) /* Retourne (en unites internes) les coordonnes entrees (en unites utilisateur)
*/ */
...@@ -254,7 +254,7 @@ WinEDA_SizeCtrl::WinEDA_SizeCtrl(wxWindow *parent, const wxString & title, ...@@ -254,7 +254,7 @@ WinEDA_SizeCtrl::WinEDA_SizeCtrl(wxWindow *parent, const wxString & title,
} }
/*************************************/ /*************************************/
wxSize WinEDA_SizeCtrl::GetValue(void) wxSize WinEDA_SizeCtrl::GetValue()
/*************************************/ /*************************************/
{ {
wxPoint pos = WinEDA_PositionCtrl::GetValue(); wxPoint pos = WinEDA_PositionCtrl::GetValue();
...@@ -293,14 +293,14 @@ wxString stringvalue = ReturnStringFromValue(m_Units, m_Value,m_Internal_Unit); ...@@ -293,14 +293,14 @@ wxString stringvalue = ReturnStringFromValue(m_Units, m_Value,m_Internal_Unit);
BoxSizer->Add(m_ValueCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5); BoxSizer->Add(m_ValueCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5);
} }
WinEDA_ValueCtrl::~WinEDA_ValueCtrl(void) WinEDA_ValueCtrl::~WinEDA_ValueCtrl()
{ {
delete m_ValueCtrl; delete m_ValueCtrl;
delete m_Text; delete m_Text;
} }
/***********************************/ /***********************************/
int WinEDA_ValueCtrl::GetValue(void) int WinEDA_ValueCtrl::GetValue()
/***********************************/ /***********************************/
{ {
int coord; int coord;
...@@ -347,13 +347,13 @@ wxString label = title; ...@@ -347,13 +347,13 @@ wxString label = title;
BoxSizer->Add(m_ValueCtrl, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5); BoxSizer->Add(m_ValueCtrl, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5);
} }
WinEDA_DFloatValueCtrl::~WinEDA_DFloatValueCtrl(void) WinEDA_DFloatValueCtrl::~WinEDA_DFloatValueCtrl()
{ {
delete m_ValueCtrl; delete m_ValueCtrl;
delete m_Text; delete m_Text;
} }
double WinEDA_DFloatValueCtrl::GetValue(void) double WinEDA_DFloatValueCtrl::GetValue()
{ {
double coord = 0; double coord = 0;
......
...@@ -22,7 +22,7 @@ public: ...@@ -22,7 +22,7 @@ public:
wxString m_LibName; wxString m_LibName;
wxString m_Library; wxString m_Library;
AUTOMODULE(void) { m_Type = 0; Pnext = NULL; } AUTOMODULE() { m_Type = 0; Pnext = NULL; }
} ; } ;
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "cvpcb.h" #include "cvpcb.h"
STORECMP::STORECMP(void) STORECMP::STORECMP()
{ {
Pnext = Pback = NULL; Pnext = Pback = NULL;
m_Type = STRUCT_COMPONENT; m_Type = STRUCT_COMPONENT;
...@@ -29,7 +29,7 @@ STORECMP::STORECMP(void) ...@@ -29,7 +29,7 @@ STORECMP::STORECMP(void)
m_Multi = 0; m_Multi = 0;
} }
STORECMP::~STORECMP(void) STORECMP::~STORECMP()
{ {
STOREPIN * Pin, * NextPin; STOREPIN * Pin, * NextPin;
...@@ -41,7 +41,7 @@ STOREPIN * Pin, * NextPin; ...@@ -41,7 +41,7 @@ STOREPIN * Pin, * NextPin;
STOREMOD::STOREMOD(void) STOREMOD::STOREMOD()
{ {
Pnext = Pback = NULL; Pnext = Pback = NULL;
m_Type = STRUCT_MODULE; m_Type = STRUCT_MODULE;
...@@ -49,7 +49,7 @@ STOREMOD::STOREMOD(void) ...@@ -49,7 +49,7 @@ STOREMOD::STOREMOD(void)
} }
STOREPIN::STOREPIN(void) STOREPIN::STOREPIN()
{ {
m_Type = STRUCT_PIN; /* Type de la structure */ m_Type = STRUCT_PIN; /* Type de la structure */
Pnext = NULL; /* Chainage avant */ Pnext = NULL; /* Chainage avant */
......
...@@ -82,7 +82,7 @@ int dims[3] = { -1, -1, 250}; ...@@ -82,7 +82,7 @@ int dims[3] = { -1, -1, 250};
/******************************************/ /******************************************/
WinEDA_CvpcbFrame::~WinEDA_CvpcbFrame(void) WinEDA_CvpcbFrame::~WinEDA_CvpcbFrame()
/******************************************/ /******************************************/
{ {
if( m_Parent->m_EDA_Config ) if( m_Parent->m_EDA_Config )
......
...@@ -28,7 +28,7 @@ IMPLEMENT_APP(WinEDA_App) ...@@ -28,7 +28,7 @@ IMPLEMENT_APP(WinEDA_App)
/* Called to initialize the program */ /* Called to initialize the program */
/************************************/ /************************************/
bool WinEDA_App::OnInit(void) bool WinEDA_App::OnInit()
{ {
wxString msg; wxString msg;
wxString currCWD = wxGetCwd(); wxString currCWD = wxGetCwd();
......
...@@ -40,7 +40,7 @@ public: ...@@ -40,7 +40,7 @@ public:
wxString m_PinName; wxString m_PinName;
wxString m_Repere; /* utilise selon formats de netliste */ wxString m_Repere; /* utilise selon formats de netliste */
STOREPIN(void); STOREPIN();
} ; } ;
class STORECMP class STORECMP
...@@ -60,8 +60,8 @@ public: ...@@ -60,8 +60,8 @@ public:
wxArrayString m_FootprintFilter; /* List of allowed footprints (wildcart allowed wxArrayString m_FootprintFilter; /* List of allowed footprints (wildcart allowed
if void: no filtering */ if void: no filtering */
STORECMP(void); STORECMP();
~STORECMP(void); ~STORECMP();
} ; } ;
class STOREMOD class STOREMOD
...@@ -76,7 +76,7 @@ public: ...@@ -76,7 +76,7 @@ public:
wxString m_Doc; /* Doc associee */ wxString m_Doc; /* Doc associee */
wxString m_KeyWord; /* Mots cles associes */ wxString m_KeyWord; /* Mots cles associes */
STOREMOD(void); STOREMOD();
}; };
......
...@@ -40,7 +40,7 @@ private: ...@@ -40,7 +40,7 @@ private:
// Constructor and destructor // Constructor and destructor
public: public:
WinEDA_CvpcbFrame(WinEDA_App * parent, const wxString & title); WinEDA_CvpcbFrame(WinEDA_App * parent, const wxString & title);
~WinEDA_CvpcbFrame(void); ~WinEDA_CvpcbFrame();
void OnLeftClick(wxListEvent & event); void OnLeftClick(wxListEvent & event);
void OnLeftDClick(wxListEvent & event); void OnLeftDClick(wxListEvent & event);
...@@ -51,8 +51,8 @@ public: ...@@ -51,8 +51,8 @@ public:
void OnCloseWindow(wxCloseEvent & Event); void OnCloseWindow(wxCloseEvent & Event);
void OnSize(wxSizeEvent& SizeEvent); void OnSize(wxSizeEvent& SizeEvent);
void OnChar(wxKeyEvent& event); void OnChar(wxKeyEvent& event);
void ReCreateHToolbar(void); void ReCreateHToolbar();
virtual void ReCreateMenuBar(void); virtual void ReCreateMenuBar();
void SetLanguage(wxCommandEvent& event); void SetLanguage(wxCommandEvent& event);
void AddFontSelectionMenu(wxMenu * main_menu); void AddFontSelectionMenu(wxMenu * main_menu);
void ProcessFontPreferences(wxCommandEvent& event); void ProcessFontPreferences(wxCommandEvent& event);
...@@ -69,19 +69,19 @@ public: ...@@ -69,19 +69,19 @@ public:
void DisplayDocFile(wxCommandEvent & event); void DisplayDocFile(wxCommandEvent & event);
void OnSelectFilteringFootprint(wxCommandEvent & event); void OnSelectFilteringFootprint(wxCommandEvent & event);
void SetNewPkg(const wxString & package); void SetNewPkg(const wxString & package);
void BuildCmpListBox(void); void BuildCmpListBox();
void BuildFootprintListBox(void); void BuildFootprintListBox();
void CreateScreenCmp(void); void CreateScreenCmp();
void CreateConfigWindow(void); void CreateConfigWindow();
int SaveNetList(const wxString & FullFileName); int SaveNetList(const wxString & FullFileName);
int SaveComponentList(const wxString & FullFileName); int SaveComponentList(const wxString & FullFileName);
bool ReadInputNetList(const wxString & FullFileName); bool ReadInputNetList(const wxString & FullFileName);
void ReadNetListe(void); void ReadNetListe();
int rdpcad(void); int rdpcad();
int ReadSchematicNetlist(void); int ReadSchematicNetlist();
int ReadFootprintFilterList( FILE * f); int ReadFootprintFilterList( FILE * f);
int ReadViewlogicWirList(void); int ReadViewlogicWirList();
int ReadViewlogicNetList(void); int ReadViewlogicNetList();
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
...@@ -100,9 +100,9 @@ public: ...@@ -100,9 +100,9 @@ public:
ListBoxBase(WinEDA_CvpcbFrame * parent, wxWindowID id, ListBoxBase(WinEDA_CvpcbFrame * parent, wxWindowID id,
const wxPoint& loc, const wxSize& size); const wxPoint& loc, const wxSize& size);
~ListBoxBase(void); ~ListBoxBase();
int GetSelection(void); int GetSelection();
void OnSize(wxSizeEvent& event); void OnSize(wxSizeEvent& event);
}; };
...@@ -123,17 +123,17 @@ public: ...@@ -123,17 +123,17 @@ public:
FootprintListBox(WinEDA_CvpcbFrame * parent, FootprintListBox(WinEDA_CvpcbFrame * parent,
wxWindowID id, const wxPoint& loc, const wxSize& size, wxWindowID id, const wxPoint& loc, const wxSize& size,
int nbitems, wxString choice[]); int nbitems, wxString choice[]);
~FootprintListBox(void); ~FootprintListBox();
int GetCount(void); int GetCount();
void SetSelection(unsigned index, bool State = TRUE); void SetSelection(unsigned index, bool State = TRUE);
void SetString(unsigned linecount, const wxString & text); void SetString(unsigned linecount, const wxString & text);
void AppendLine(const wxString & text); void AppendLine(const wxString & text);
void SetFootprintFullList(void); void SetFootprintFullList();
void SetFootprintFilteredList(STORECMP * Component); void SetFootprintFilteredList(STORECMP * Component);
void SetActiveFootprintList(bool FullList, bool Redraw = FALSE); void SetActiveFootprintList(bool FullList, bool Redraw = FALSE);
wxString GetSelectedFootprint(void); wxString GetSelectedFootprint();
wxString OnGetItemText(long item, long column) const; wxString OnGetItemText(long item, long column) const;
void OnLeftClick(wxListEvent & event); void OnLeftClick(wxListEvent & event);
void OnLeftDClick(wxListEvent & event); void OnLeftDClick(wxListEvent & event);
...@@ -156,10 +156,10 @@ public: ...@@ -156,10 +156,10 @@ public:
const wxPoint& loc, const wxSize& size, const wxPoint& loc, const wxSize& size,
int nbitems, wxString choice[]); int nbitems, wxString choice[]);
~ListBoxCmp(void); ~ListBoxCmp();
void Clear(void); void Clear();
int GetCount(void); int GetCount();
wxString OnGetItemText(long item, long column) const; wxString OnGetItemText(long item, long column) const;
void SetSelection(unsigned index, bool State = TRUE); void SetSelection(unsigned index, bool State = TRUE);
void SetString(unsigned linecount, const wxString & text); void SetString(unsigned linecount, const wxString & text);
...@@ -182,18 +182,18 @@ public: ...@@ -182,18 +182,18 @@ public:
const wxString & title, const wxString & title,
const wxPoint& pos, const wxSize& size); const wxPoint& pos, const wxSize& size);
~WinEDA_DisplayFrame(void); ~WinEDA_DisplayFrame();
void OnCloseWindow(wxCloseEvent & Event); void OnCloseWindow(wxCloseEvent & Event);
void Process_Special_Functions(wxCommandEvent& event); void Process_Special_Functions(wxCommandEvent& event);
void RedrawActiveWindow(wxDC * DC, bool EraseBg); void RedrawActiveWindow(wxDC * DC, bool EraseBg);
void ReCreateHToolbar(void); void ReCreateHToolbar();
void ReCreateVToolbar(void); void ReCreateVToolbar();
void RecreateMenuBar(void); void RecreateMenuBar();
void OnLeftClick(wxDC * DC, const wxPoint& MousePos); void OnLeftClick(wxDC * DC, const wxPoint& MousePos);
void OnLeftDClick(wxDC * DC, const wxPoint& MousePos); void OnLeftDClick(wxDC * DC, const wxPoint& MousePos);
void OnRightClick(const wxPoint& MousePos, wxMenu * PopMenu); void OnRightClick(const wxPoint& MousePos, wxMenu * PopMenu);
void SetToolbars(void); void SetToolbars();
void InstallOptionsDisplay(wxCommandEvent& event); void InstallOptionsDisplay(wxCommandEvent& event);
MODULE * Get_Module(const wxString & CmpName); MODULE * Get_Module(const wxString & CmpName);
......
...@@ -128,7 +128,7 @@ public: ...@@ -128,7 +128,7 @@ public:
/// Should we show tooltips? /// Should we show tooltips?
static bool ShowToolTips(); static bool ShowToolTips();
void Update(void); void Update();
void AcceptCfg(wxCommandEvent& event); void AcceptCfg(wxCommandEvent& event);
void SaveCfg(wxCommandEvent& event); void SaveCfg(wxCommandEvent& event);
void ReadOldCfg(wxCommandEvent& event); void ReadOldCfg(wxCommandEvent& event);
...@@ -137,7 +137,7 @@ public: ...@@ -137,7 +137,7 @@ public:
void EquDelFct(wxCommandEvent& event); void EquDelFct(wxCommandEvent& event);
void EquAddFct(wxCommandEvent& event); void EquAddFct(wxCommandEvent& event);
void ReturnNetFormat(wxCommandEvent& event); void ReturnNetFormat(wxCommandEvent& event);
void SetDialogDatas(void); void SetDialogDatas();
////@begin KiConfigCvpcbFrame member variables ////@begin KiConfigCvpcbFrame member variables
......
...@@ -64,7 +64,7 @@ WinEDA_DisplayFrame::WinEDA_DisplayFrame( wxWindow * father, WinEDA_App *parent, ...@@ -64,7 +64,7 @@ WinEDA_DisplayFrame::WinEDA_DisplayFrame( wxWindow * father, WinEDA_App *parent,
/* Fonctions de base de WinEDA_DisplayFrame */ /* Fonctions de base de WinEDA_DisplayFrame */
/*****************************************/ /*****************************************/
// Destructeur // Destructeur
WinEDA_DisplayFrame::~WinEDA_DisplayFrame(void) WinEDA_DisplayFrame::~WinEDA_DisplayFrame()
{ {
if ( m_Pcb->m_Modules ) DeleteStructure( m_Pcb->m_Modules ); if ( m_Pcb->m_Modules ) DeleteStructure( m_Pcb->m_Modules );
m_Pcb->m_Modules = NULL; m_Pcb->m_Modules = NULL;
...@@ -93,14 +93,14 @@ wxSize size; ...@@ -93,14 +93,14 @@ wxSize size;
/************************************************/ /************************************************/
void WinEDA_DisplayFrame::ReCreateVToolbar(void) void WinEDA_DisplayFrame::ReCreateVToolbar()
/************************************************/ /************************************************/
{ {
} }
/************************************************/ /************************************************/
void WinEDA_DisplayFrame::ReCreateHToolbar(void) void WinEDA_DisplayFrame::ReCreateHToolbar()
/************************************************/ /************************************************/
{ {
if ( m_HToolBar != NULL ) return; if ( m_HToolBar != NULL ) return;
...@@ -137,7 +137,7 @@ void WinEDA_DisplayFrame::ReCreateHToolbar(void) ...@@ -137,7 +137,7 @@ void WinEDA_DisplayFrame::ReCreateHToolbar(void)
/*******************************************/ /*******************************************/
void WinEDA_DisplayFrame::SetToolbars(void) void WinEDA_DisplayFrame::SetToolbars()
/*******************************************/ /*******************************************/
{ {
} }
......
...@@ -25,7 +25,7 @@ static void ChangePinNet( wxString & PinNet ); ...@@ -25,7 +25,7 @@ static void ChangePinNet( wxString & PinNet );
int NetNumCode; /* Nombre utilise pour cree des NetNames lors de int NetNumCode; /* Nombre utilise pour cree des NetNames lors de
reaffectation de NetNames */ reaffectation de NetNames */
int genorcad(void) int genorcad()
{ {
char Line[1024]; char Line[1024];
STOREPIN * Pin; STOREPIN * Pin;
......
...@@ -67,7 +67,7 @@ wxString Line; ...@@ -67,7 +67,7 @@ wxString Line;
} }
/********************************************/ /********************************************/
void WinEDA_CvpcbFrame::ReadNetListe(void) void WinEDA_CvpcbFrame::ReadNetListe()
/*******************************************/ /*******************************************/
/* Lecture de la netliste selon format, ainsi que du fichier des composants /* Lecture de la netliste selon format, ainsi que du fichier des composants
*/ */
......
...@@ -29,7 +29,7 @@ ListBoxBase::ListBoxBase(WinEDA_CvpcbFrame * parent, ...@@ -29,7 +29,7 @@ ListBoxBase::ListBoxBase(WinEDA_CvpcbFrame * parent,
ListBoxBase::~ListBoxBase(void) ListBoxBase::~ListBoxBase()
{ {
} }
...@@ -50,7 +50,7 @@ int width = 0; ...@@ -50,7 +50,7 @@ int width = 0;
/*********************************/ /*********************************/
int ListBoxBase::GetSelection(void) int ListBoxBase::GetSelection()
/*********************************/ /*********************************/
// Return an index for the selected item // Return an index for the selected item
{ {
...@@ -72,13 +72,13 @@ FootprintListBox::FootprintListBox(WinEDA_CvpcbFrame * parent, ...@@ -72,13 +72,13 @@ FootprintListBox::FootprintListBox(WinEDA_CvpcbFrame * parent,
FootprintListBox::~FootprintListBox(void) FootprintListBox::~FootprintListBox()
{ {
} }
/**********************************/ /**********************************/
int FootprintListBox::GetCount(void) int FootprintListBox::GetCount()
/**********************************/ /**********************************/
// Return number of items // Return number of items
{ {
...@@ -97,7 +97,7 @@ void FootprintListBox::SetString(unsigned linecount, const wxString & text) ...@@ -97,7 +97,7 @@ void FootprintListBox::SetString(unsigned linecount, const wxString & text)
} }
/***************************************************/ /***************************************************/
wxString FootprintListBox::GetSelectedFootprint(void) wxString FootprintListBox::GetSelectedFootprint()
/***************************************************/ /***************************************************/
// Return an index for the selected item // Return an index for the selected item
{ {
...@@ -165,7 +165,7 @@ ListBoxCmp::ListBoxCmp(WinEDA_CvpcbFrame * parent, wxWindowID id, ...@@ -165,7 +165,7 @@ ListBoxCmp::ListBoxCmp(WinEDA_CvpcbFrame * parent, wxWindowID id,
ListBoxCmp::~ListBoxCmp(void) ListBoxCmp::~ListBoxCmp()
{ {
} }
...@@ -181,7 +181,7 @@ BEGIN_EVENT_TABLE(ListBoxCmp, LIST_BOX_TYPE) ...@@ -181,7 +181,7 @@ BEGIN_EVENT_TABLE(ListBoxCmp, LIST_BOX_TYPE)
END_EVENT_TABLE() END_EVENT_TABLE()
/****************************/ /****************************/
void ListBoxCmp::Clear(void) void ListBoxCmp::Clear()
/****************************/ /****************************/
// Reset ALL datas // Reset ALL datas
{ {
...@@ -190,7 +190,7 @@ void ListBoxCmp::Clear(void) ...@@ -190,7 +190,7 @@ void ListBoxCmp::Clear(void)
} }
/******************************/ /******************************/
int ListBoxCmp::GetCount(void) int ListBoxCmp::GetCount()
/******************************/ /******************************/
// Return number of items // Return number of items
{ {
...@@ -243,7 +243,7 @@ void ListBoxCmp::SetSelection(unsigned index, bool State) ...@@ -243,7 +243,7 @@ void ListBoxCmp::SetSelection(unsigned index, bool State)
} }
/********************************************/ /********************************************/
void WinEDA_CvpcbFrame::BuildCmpListBox(void) void WinEDA_CvpcbFrame::BuildCmpListBox()
/********************************************/ /********************************************/
/* Construit la fenetre d'affichage de la liste des composant. /* Construit la fenetre d'affichage de la liste des composant.
dimx et dimy sont les dimensions de la surface totale d'affichage dimx et dimy sont les dimensions de la surface totale d'affichage
...@@ -283,7 +283,7 @@ wxSize size(10,10); ...@@ -283,7 +283,7 @@ wxSize size(10,10);
/*************************************************************/ /*************************************************************/
void WinEDA_CvpcbFrame::BuildFootprintListBox(void) void WinEDA_CvpcbFrame::BuildFootprintListBox()
/*************************************************************/ /*************************************************************/
/* Construit la fenetre d'affichage de la liste des Modules. /* Construit la fenetre d'affichage de la liste des Modules.
dimx et dimy sont les dimensions de la surface totale d'affichage dimx et dimy sont les dimensions de la surface totale d'affichage
...@@ -313,7 +313,7 @@ wxSize size(10,10); ...@@ -313,7 +313,7 @@ wxSize size(10,10);
/************************************************/ /************************************************/
void FootprintListBox::SetFootprintFullList(void) void FootprintListBox::SetFootprintFullList()
/************************************************/ /************************************************/
{ {
STOREMOD * FootprintItem; STOREMOD * FootprintItem;
......
...@@ -25,7 +25,7 @@ static STOREMOD * TriListeModules(STOREMOD * BaseListe, int nbitems); ...@@ -25,7 +25,7 @@ static STOREMOD * TriListeModules(STOREMOD * BaseListe, int nbitems);
/**/ /**/
/*********************/ /*********************/
int listlib(void) int listlib()
/*********************/ /*********************/
/* Routine lisant la liste des librairies, et generant la liste chainee /* Routine lisant la liste des librairies, et generant la liste chainee
des modules disponibles des modules disponibles
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
/********************************/ /********************************/
void FreeMemoryModules(void) void FreeMemoryModules()
/********************************/ /********************************/
/* Routine de liberation memoire de la liste des modules /* Routine de liberation memoire de la liste des modules
...@@ -34,7 +34,7 @@ STOREMOD * Module, * NextMod; ...@@ -34,7 +34,7 @@ STOREMOD * Module, * NextMod;
} }
/***********************************/ /***********************************/
void FreeMemoryComponants(void) void FreeMemoryComponants()
/***********************************/ /***********************************/
/* Routine de liberation memoire de la liste des composants /* Routine de liberation memoire de la liste des composants
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
/***************************************************/ /***************************************************/
void WinEDA_CvpcbFrame::CreateConfigWindow(void) void WinEDA_CvpcbFrame::CreateConfigWindow()
/***************************************************/ /***************************************************/
/* Creation de la fenetre de configuration de CVPCB */ /* Creation de la fenetre de configuration de CVPCB */
{ {
...@@ -45,7 +45,7 @@ KiConfigCvpcbFrame * ConfigFrame = new KiConfigCvpcbFrame(this); ...@@ -45,7 +45,7 @@ KiConfigCvpcbFrame * ConfigFrame = new KiConfigCvpcbFrame(this);
/*********************************************/ /*********************************************/
void KiConfigCvpcbFrame::SetDialogDatas(void) void KiConfigCvpcbFrame::SetDialogDatas()
/*********************************************/ /*********************************************/
{ {
m_ListLibr->InsertItems(g_LibName_List,0); m_ListLibr->InsertItems(g_LibName_List,0);
...@@ -124,7 +124,7 @@ void KiConfigCvpcbFrame::AcceptCfg(wxCommandEvent& event) ...@@ -124,7 +124,7 @@ void KiConfigCvpcbFrame::AcceptCfg(wxCommandEvent& event)
} }
/**********************************/ /**********************************/
void KiConfigCvpcbFrame::Update(void) void KiConfigCvpcbFrame::Update()
/**********************************/ /**********************************/
{ {
wxString msg; wxString msg;
......
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
class DESCR_EDGE; class DESCR_EDGE;
int reaffect( char *ib, char *net) ; int reaffect( char *ib, char *net) ;
int GenNetlistPcbnew(void) ; int GenNetlistPcbnew() ;
int loadcmp(void) ; int loadcmp() ;
int listlib(void) ; int listlib() ;
STOREMOD * GetModuleDescrByName(const wxString & FootprintName); STOREMOD * GetModuleDescrByName(const wxString & FootprintName);
/***********/ /***********/
...@@ -41,12 +41,12 @@ void DeleteStructure( void * GenericStructure ); ...@@ -41,12 +41,12 @@ void DeleteStructure( void * GenericStructure );
/**************/ /**************/
/* MEMOIRE.CC */ /* MEMOIRE.CC */
/**************/ /**************/
void FreeMemoryComponants(void); void FreeMemoryComponants();
/* Routine de liberation memoire de la liste des composants /* Routine de liberation memoire de la liste des composants
- remet a NULL BaseListeMod - remet a NULL BaseListeMod
- remet a 0 NbComp */ - remet a 0 NbComp */
void FreeMemoryModules(void); void FreeMemoryModules();
/* Routine de liberation memoire de la liste des modules /* Routine de liberation memoire de la liste des modules
- remet a NULL g_BaseListePkg - remet a NULL g_BaseListePkg
- rement a 0 NbLib; */ - rement a 0 NbLib; */
...@@ -91,12 +91,12 @@ int CmpCompare( void * cmp1, void * cmp2); /* routine pour qsort() ...@@ -91,12 +91,12 @@ int CmpCompare( void * cmp1, void * cmp2); /* routine pour qsort()
/***************/ /***************/
/* viewlogi.cc */ /* viewlogi.cc */
/***************/ /***************/
int ReadViewlogicWirList(void); int ReadViewlogicWirList();
/***************/ /***************/
/* viewlnet.cc */ /* viewlnet.cc */
/***************/ /***************/
int ReadViewlogicNetList(void); int ReadViewlogicNetList();
/***************/ /***************/
/* TRACEMOD.CC */ /* TRACEMOD.CC */
...@@ -117,8 +117,8 @@ void Display_1_Texte(WinEDA_DrawPanel * panel, wxDC * DC, ...@@ -117,8 +117,8 @@ void Display_1_Texte(WinEDA_DrawPanel * panel, wxDC * DC,
/**********/ /**********/
/* COLORS */ /* COLORS */
/**********/ /**********/
void BuildPensBrushes(void); void BuildPensBrushes();
void FreePensBrushes(void); void FreePensBrushes();
int GetNewColor(wxWindow * Frame, int OldColor = -1); /* Routine de selection d'une couleur */ int GetNewColor(wxWindow * Frame, int OldColor = -1); /* Routine de selection d'une couleur */
/***********/ /***********/
......
...@@ -18,10 +18,10 @@ assure la reaffectation des alimentations selon le format : ...@@ -18,10 +18,10 @@ assure la reaffectation des alimentations selon le format :
#define SEPARATEUR '|' #define SEPARATEUR '|'
/* routines locales : */ /* routines locales : */
int pin(void) ; int pin() ;
/***************************************/ /***************************************/
int WinEDA_CvpcbFrame::rdpcad(void) int WinEDA_CvpcbFrame::rdpcad()
/***************************************/ /***************************************/
{ {
int i , j , k ,l ; int i , j , k ,l ;
...@@ -146,7 +146,7 @@ for ( ;; ) ...@@ -146,7 +146,7 @@ for ( ;; )
/* pin() : analyse liste des pines */ /* pin() : analyse liste des pines */
/***********************************/ /***********************************/
int pin(void) int pin()
{ {
int i , j , k ; int i , j , k ;
char numpin[9] , net[9] ; char numpin[9] , net[9] ;
......
...@@ -23,7 +23,7 @@ static int pin_orcad(STORECMP * CurrentCmp); ...@@ -23,7 +23,7 @@ static int pin_orcad(STORECMP * CurrentCmp);
/************************************************/ /************************************************/
int WinEDA_CvpcbFrame::ReadSchematicNetlist(void) int WinEDA_CvpcbFrame::ReadSchematicNetlist()
/************************************************/ /************************************************/
{ {
int i , j , k ,l ; int i , j , k ,l ;
......
...@@ -54,7 +54,7 @@ wxString Title = g_Main_Title + wxT(" ") + GetBuildVersion(); ...@@ -54,7 +54,7 @@ wxString Title = g_Main_Title + wxT(" ") + GetBuildVersion();
} }
/****************/ /****************/
int loadcmp(void) int loadcmp()
/***************/ /***************/
/* recupere la liste des associations composants/empreintes /* recupere la liste des associations composants/empreintes
*/ */
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include "protos.h" #include "protos.h"
/*******************************************/ /*******************************************/
void WinEDA_CvpcbFrame::CreateScreenCmp(void) void WinEDA_CvpcbFrame::CreateScreenCmp()
/*******************************************/ /*******************************************/
/* Creation de la fenetre d'affichage du composant /* Creation de la fenetre d'affichage du composant
*/ */
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
/*********************************************/ /*********************************************/
void WinEDA_CvpcbFrame::ReCreateHToolbar(void) void WinEDA_CvpcbFrame::ReCreateHToolbar()
/*********************************************/ /*********************************************/
{ {
if ( m_HToolBar != NULL ) return; if ( m_HToolBar != NULL ) return;
...@@ -93,7 +93,7 @@ void WinEDA_CvpcbFrame::ReCreateHToolbar(void) ...@@ -93,7 +93,7 @@ void WinEDA_CvpcbFrame::ReCreateHToolbar(void)
/*******************************************/ /*******************************************/
void WinEDA_CvpcbFrame::ReCreateMenuBar(void) void WinEDA_CvpcbFrame::ReCreateMenuBar()
/*******************************************/ /*******************************************/
/* Creation des menus de la fenetre principale /* Creation des menus de la fenetre principale
*/ */
......
...@@ -36,10 +36,10 @@ static int GenListeComposants(FILE * PkgFile); ...@@ -36,10 +36,10 @@ static int GenListeComposants(FILE * PkgFile);
/* Variables Locales */ /* Variables Locales */
/******************************/ /******************************/
/* int ReadViewlogicNet(void) */ /* int ReadViewlogicNet() */
/******************************/ /******************************/
int WinEDA_CvpcbFrame::ReadViewlogicNetList(void) int WinEDA_CvpcbFrame::ReadViewlogicNetList()
{ {
int ii, LineNum; int ii, LineNum;
char Line[1024], *Text; char Line[1024], *Text;
......
...@@ -33,7 +33,7 @@ STORECMP * BasePseudoCmp; /* Stockage des descriptions generales */ ...@@ -33,7 +33,7 @@ STORECMP * BasePseudoCmp; /* Stockage des descriptions generales */
/************************************************/ /************************************************/
int WinEDA_CvpcbFrame::ReadViewlogicWirList(void) int WinEDA_CvpcbFrame::ReadViewlogicWirList()
/************************************************/ /************************************************/
{ {
int ii, Type = 0, error, Header; int ii, Type = 0, error, Header;
......
...@@ -27,7 +27,7 @@ int NetNumCode; /* Nombre utilise pour cree des NetNames lors de ...@@ -27,7 +27,7 @@ int NetNumCode; /* Nombre utilise pour cree des NetNames lors de
/*************************/ /*************************/
int GenNetlistPcbnew(void) int GenNetlistPcbnew()
/*************************/ /*************************/
{ {
#define NETLIST_HEAD_STRING "EESchema Netlist Version 1.1" #define NETLIST_HEAD_STRING "EESchema Netlist Version 1.1"
......
...@@ -32,7 +32,7 @@ DrawPartStruct::DrawPartStruct( KICAD_T struct_type, const wxPoint & pos): ...@@ -32,7 +32,7 @@ DrawPartStruct::DrawPartStruct( KICAD_T struct_type, const wxPoint & pos):
} }
/************************************/ /************************************/
DrawPartStruct::~DrawPartStruct(void) DrawPartStruct::~DrawPartStruct()
/************************************/ /************************************/
{ {
} }
...@@ -221,7 +221,7 @@ void EDA_SchComponentStruct::Place(WinEDA_DrawFrame * frame, wxDC * DC) ...@@ -221,7 +221,7 @@ void EDA_SchComponentStruct::Place(WinEDA_DrawFrame * frame, wxDC * DC)
/***************************************************/ /***************************************************/
void EDA_SchComponentStruct::ClearAnnotation(void) void EDA_SchComponentStruct::ClearAnnotation()
/***************************************************/ /***************************************************/
/* Suppress annotation ( i.i IC23 changed to IC? and part reset to 1) /* Suppress annotation ( i.i IC23 changed to IC? and part reset to 1)
*/ */
...@@ -241,7 +241,7 @@ EDA_LibComponentStruct *Entry; ...@@ -241,7 +241,7 @@ EDA_LibComponentStruct *Entry;
} }
/**************************************************************/ /**************************************************************/
EDA_SchComponentStruct * EDA_SchComponentStruct::GenCopy(void) EDA_SchComponentStruct * EDA_SchComponentStruct::GenCopy()
/**************************************************************/ /**************************************************************/
{ {
EDA_SchComponentStruct * new_item = new EDA_SchComponentStruct( m_Pos ); EDA_SchComponentStruct * new_item = new EDA_SchComponentStruct( m_Pos );
...@@ -411,7 +411,7 @@ bool Transform = FALSE; ...@@ -411,7 +411,7 @@ bool Transform = FALSE;
/****************************************************/ /****************************************************/
int EDA_SchComponentStruct::GetRotationMiroir(void) int EDA_SchComponentStruct::GetRotationMiroir()
/****************************************************/ /****************************************************/
{ {
int type_rotate = CMP_ORIENT_0; int type_rotate = CMP_ORIENT_0;
...@@ -500,7 +500,7 @@ PartTextStruct::PartTextStruct(const wxPoint & pos, const wxString & text): ...@@ -500,7 +500,7 @@ PartTextStruct::PartTextStruct(const wxPoint & pos, const wxString & text):
} }
/************************************/ /************************************/
PartTextStruct::~PartTextStruct(void) PartTextStruct::~PartTextStruct()
/************************************/ /************************************/
{ {
} }
...@@ -524,7 +524,7 @@ void PartTextStruct::PartTextCopy(PartTextStruct * target) ...@@ -524,7 +524,7 @@ void PartTextStruct::PartTextCopy(PartTextStruct * target)
/*********************************/ /*********************************/
bool PartTextStruct::IsVoid(void) bool PartTextStruct::IsVoid()
/*********************************/ /*********************************/
/* return True if The field is void, i.e.: /* return True if The field is void, i.e.:
contains wxEmptyString or "~" contains wxEmptyString or "~"
...@@ -536,7 +536,7 @@ bool PartTextStruct::IsVoid(void) ...@@ -536,7 +536,7 @@ bool PartTextStruct::IsVoid(void)
/********************************************/ /********************************************/
EDA_Rect PartTextStruct::GetBoundaryBox(void) EDA_Rect PartTextStruct::GetBoundaryBox()
/********************************************/ /********************************************/
/* return /* return
EDA_Rect contains the real (user coordinates) boundary box for a text field, EDA_Rect contains the real (user coordinates) boundary box for a text field,
......
/*****************************************************/ /*****************************************************/
/* Definitions for the Component classes for EESchema */ /* Definitions for the Component classes for EESchema */
/*****************************************************/ /*****************************************************/
#ifndef COMPONENT_CLASS_H #ifndef COMPONENT_CLASS_H
#define COMPONENT_CLASS_H #define COMPONENT_CLASS_H
...@@ -14,110 +14,115 @@ ...@@ -14,110 +14,115 @@
/* Definition de la representation du composant */ /* Definition de la representation du composant */
#define NUMBER_OF_FIELDS 12 /* Nombre de champs de texte affectes au composant */ #define NUMBER_OF_FIELDS 12 /* Nombre de champs de texte affectes au composant */
typedef enum typedef enum {
{ REFERENCE = 0, /* Champ Reference of part, i.e. "IC21" */
REFERENCE = 0, /* Champ Reference of part, i.e. "IC21" */ VALUE, /* Champ Value of part, i.e. "3.3K" */
VALUE, /* Champ Value of part, i.e. "3.3K" */ FOOTPRINT, /* Champ Name Module PCB, i.e. "16DIP300" */
FOOTPRINT, /* Champ Name Module PCB, i.e. "16DIP300" */ SHEET_FILENAME, /* Champ Name Schema component, i.e. "cnt16.sch" */
SHEET_FILENAME, /* Champ Name Schema component, i.e. "cnt16.sch" */ FIELD1,
FIELD1, FIELD2,
FIELD2, FIELD3,
FIELD3, FIELD4,
FIELD4, FIELD5,
FIELD5, FIELD6,
FIELD6, FIELD7,
FIELD7, FIELD8
FIELD8
} NumFieldType; } NumFieldType;
/* Class to manage component fields. /* Class to manage component fields.
component fields are texts attached to the component (not the graphic texts) * component fields are texts attached to the component (not the graphic texts)
There are 2 major fields : Reference and Value * There are 2 major fields : Reference and Value
*/ */
class PartTextStruct: public EDA_BaseStruct, public EDA_TextStruct class PartTextStruct : public EDA_BaseStruct, public EDA_TextStruct
{ {
public: public:
int m_Layer; int m_Layer;
int m_FieldId; int m_FieldId;
wxString m_Name; /* Field name (ref, value,pcb, sheet, filed 1.. wxString m_Name; /* Field name (ref, value,pcb, sheet, filed 1..
and for fields 1 to 8 the name is editable */ * and for fields 1 to 8 the name is editable */
public: public:
PartTextStruct(const wxPoint & pos = wxPoint(0,0), const wxString & text = wxEmptyString); PartTextStruct( const wxPoint& pos = wxPoint( 0, 0 ), const wxString& text = wxEmptyString );
~PartTextStruct(void); ~PartTextStruct();
virtual wxString GetClass() const virtual wxString GetClass() const
{ {
return wxT("PartTextStruct"); return wxT( "PartTextStruct" );
} }
void PartTextCopy(PartTextStruct * target);
void Place(WinEDA_DrawFrame * frame, wxDC * DC);
EDA_Rect GetBoundaryBox(void);
bool IsVoid(); void PartTextCopy( PartTextStruct* target );
void SwapData(PartTextStruct * copyitem); void Place( WinEDA_DrawFrame* frame, wxDC* DC );
EDA_Rect GetBoundaryBox();
bool IsVoid();
void SwapData( PartTextStruct* copyitem );
}; };
/* the class DrawPartStruct describes a basic virtual component /* the class DrawPartStruct describes a basic virtual component
Not used directly: * Not used directly:
used classes are EDA_SchComponentStruct (the "classic" schematic component * used classes are EDA_SchComponentStruct (the "classic" schematic component
and the Pseudo component DrawSheetStruct * and the Pseudo component DrawSheetStruct
*/ */
class DrawPartStruct: public EDA_BaseStruct class DrawPartStruct : public EDA_BaseStruct
{ {
public: public:
int m_Layer; int m_Layer;
wxString m_ChipName; /* Key to look for in the library, i.e. "74LS00". */ wxString m_ChipName; /* Key to look for in the library, i.e. "74LS00". */
PartTextStruct m_Field[NUMBER_OF_FIELDS]; PartTextStruct m_Field[NUMBER_OF_FIELDS];
wxPoint m_Pos; /* Exact position of part. */ wxPoint m_Pos; /* Exact position of part. */
public: public:
DrawPartStruct( KICAD_T struct_type, const wxPoint & pos); DrawPartStruct( KICAD_T struct_type, const wxPoint &pos );
~DrawPartStruct(void); ~DrawPartStruct();
virtual wxString GetClass() const virtual wxString GetClass() const
{ {
return wxT("DrawPartStruct"); return wxT( "DrawPartStruct" );
} }
}; };
/* the class EDA_SchComponentStruct describes a real component */ /* the class EDA_SchComponentStruct describes a real component */
class EDA_SchComponentStruct: public DrawPartStruct class EDA_SchComponentStruct : public DrawPartStruct
{ {
public: public:
int m_RefIdNumber; /* reference count: for U1, R2 .. it is the 1 or 2 value */ int m_RefIdNumber; /* reference count: for U1, R2 .. it is the 1 or 2 value */
int m_Multi; /* In multi unit chip - which unit to draw. */ int m_Multi; /* In multi unit chip - which unit to draw. */
int m_FlagControlMulti; int m_FlagControlMulti;
int m_Convert; /* Gestion des mutiples representations (ex: conversion De Morgan) */ int m_Convert; /* Gestion des mutiples representations (ex: conversion De Morgan) */
int m_Transform[2][2]; /* The rotation/mirror transformation matrix. */ int m_Transform[2][2]; /* The rotation/mirror transformation matrix. */
bool * m_PinIsDangling; // liste des indicateurs de pin non connectee bool* m_PinIsDangling; // liste des indicateurs de pin non connectee
public: public:
EDA_SchComponentStruct(const wxPoint & pos = wxPoint(0,0)); EDA_SchComponentStruct( const wxPoint& pos = wxPoint( 0, 0 ) );
~EDA_SchComponentStruct(void){} ~EDA_SchComponentStruct( void ) { }
virtual wxString GetClass() const virtual wxString GetClass() const
{ {
return wxT("EDA_SchComponentStruct"); return wxT( "EDA_SchComponentStruct" );
} }
EDA_SchComponentStruct * GenCopy(void);
void SetRotationMiroir( int type ); EDA_SchComponentStruct* GenCopy( void );
int GetRotationMiroir(void); void SetRotationMiroir( int type );
wxPoint GetScreenCoord(const wxPoint & coord); int GetRotationMiroir();
void Display_Infos(WinEDA_DrawFrame * frame); wxPoint GetScreenCoord( const wxPoint& coord );
void ClearAnnotation(void); void Display_Infos( WinEDA_DrawFrame* frame );
EDA_Rect GetBoundaryBox(); void ClearAnnotation();
wxString ReturnFieldName(int FieldNumber); EDA_Rect GetBoundaryBox();
wxString ReturnFieldName( int FieldNumber );
virtual void Draw(WinEDA_DrawPanel * panel, wxDC * DC, const wxPoint & offset, int draw_mode, int Color = -1);
void SwapData(EDA_SchComponentStruct * copyitem); virtual void Draw( WinEDA_DrawPanel* panel,
virtual void Place(WinEDA_DrawFrame * frame, wxDC * DC); wxDC* DC,
const wxPoint& offset,
int draw_mode,
int Color = -1 );
void SwapData( EDA_SchComponentStruct* copyitem );
virtual void Place( WinEDA_DrawFrame* frame, wxDC* DC );
}; };
#endif /* COMPONENT_CLASS_H */ #endif /* COMPONENT_CLASS_H */
...@@ -413,7 +413,7 @@ void WinEDA_Build_BOM_Frame::OnExitClick( wxCommandEvent& event ) ...@@ -413,7 +413,7 @@ void WinEDA_Build_BOM_Frame::OnExitClick( wxCommandEvent& event )
} }
/**********************************************************/ /**********************************************************/
void WinEDA_Build_BOM_Frame::GenList(void) void WinEDA_Build_BOM_Frame::GenList()
/**********************************************************/ /**********************************************************/
{ {
#define EXT_LIST wxT(".lst") #define EXT_LIST wxT(".lst")
...@@ -1142,7 +1142,7 @@ void WinEDA_Build_BOM_Frame::OnCloseWindow( wxCloseEvent& event ) ...@@ -1142,7 +1142,7 @@ void WinEDA_Build_BOM_Frame::OnCloseWindow( wxCloseEvent& event )
} }
/**************************************************/ /**************************************************/
void WinEDA_Build_BOM_Frame::SavePreferences(void) void WinEDA_Build_BOM_Frame::SavePreferences()
/**************************************************/ /**************************************************/
{ {
s_Add_F1_state = m_AddField1->GetValue(); s_Add_F1_state = m_AddField1->GetValue();
......
...@@ -114,7 +114,7 @@ public: ...@@ -114,7 +114,7 @@ public:
////@end WinEDA_Build_BOM_Frame event handler declarations ////@end WinEDA_Build_BOM_Frame event handler declarations
void GenList(void); void GenList();
////@begin WinEDA_Build_BOM_Frame member function declarations ////@begin WinEDA_Build_BOM_Frame member function declarations
...@@ -129,7 +129,7 @@ public: ...@@ -129,7 +129,7 @@ public:
int PrintListeCmpByRef( FILE * f, EDA_BaseStruct ** List, int NbItems, bool CompactForm = FALSE ); int PrintListeCmpByRef( FILE * f, EDA_BaseStruct ** List, int NbItems, bool CompactForm = FALSE );
int PrintListeCmpByVal( FILE *f, EDA_BaseStruct **List, int NbItems); int PrintListeCmpByVal( FILE *f, EDA_BaseStruct **List, int NbItems);
void PrintFieldData(FILE * f, EDA_SchComponentStruct * DrawLibItem, bool CompactForm = FALSE); void PrintFieldData(FILE * f, EDA_SchComponentStruct * DrawLibItem, bool CompactForm = FALSE);
void SavePreferences(void); void SavePreferences();
/// Should we show tooltips? /// Should we show tooltips?
......
...@@ -91,7 +91,7 @@ public: ...@@ -91,7 +91,7 @@ public:
void CreateControls(); void CreateControls();
// others functions: // others functions:
wxString ReturnCmpName(void) wxString ReturnCmpName()
{ {
return m_CmpName->GetValue(); return m_CmpName->GetValue();
} }
......
...@@ -119,10 +119,10 @@ public: ...@@ -119,10 +119,10 @@ public:
/// Should we show tooltips? /// Should we show tooltips?
static bool ShowToolTips(); static bool ShowToolTips();
void InitBuffers(void); void InitBuffers();
void BuildPanelBasic(void); void BuildPanelBasic();
void BuildPanelDoc(void); void BuildPanelDoc();
void BuildPanelAlias(void); void BuildPanelAlias();
void BuildPanelEditField(); void BuildPanelEditField();
void PartPropertiesAccept(wxCommandEvent& event); void PartPropertiesAccept(wxCommandEvent& event);
void OnQuit(wxCommandEvent& event); void OnQuit(wxCommandEvent& event);
...@@ -130,16 +130,16 @@ public: ...@@ -130,16 +130,16 @@ public:
void DeleteAliasOfPart(wxCommandEvent& event); void DeleteAliasOfPart(wxCommandEvent& event);
void AddAliasOfPart(wxCommandEvent& event); void AddAliasOfPart(wxCommandEvent& event);
bool ChangeNbUnitsPerPackage(int newUnit); bool ChangeNbUnitsPerPackage(int newUnit);
bool SetUnsetConvert(void); bool SetUnsetConvert();
void CopyDocToAlias(wxCommandEvent& event); void CopyDocToAlias(wxCommandEvent& event);
void BrowseAndSelectDocFile(wxCommandEvent& event); void BrowseAndSelectDocFile(wxCommandEvent& event);
void SelectNewField(wxCommandEvent& event); void SelectNewField(wxCommandEvent& event);
void CopyFieldDataToBuffer(LibDrawField * Field); void CopyFieldDataToBuffer(LibDrawField * Field);
void CopyBufferToFieldData(LibDrawField * Field); void CopyBufferToFieldData(LibDrawField * Field);
void CopyDataToPanelField(void); void CopyDataToPanelField();
void CopyPanelFieldToData(void); void CopyPanelFieldToData();
void BuildPanelFootprintFilter(void); void BuildPanelFootprintFilter();
void DeleteAllFootprintFilter(wxCommandEvent& event); void DeleteAllFootprintFilter(wxCommandEvent& event);
void DeleteOneFootprintFilter(wxCommandEvent& event); void DeleteOneFootprintFilter(wxCommandEvent& event);
void AddFootprintFilter(wxCommandEvent& event); void AddFootprintFilter(wxCommandEvent& event);
......
...@@ -111,13 +111,13 @@ public: ...@@ -111,13 +111,13 @@ public:
/// Should we show tooltips? /// Should we show tooltips?
static bool ShowToolTips(); static bool ShowToolTips();
void InitBuffers(void); void InitBuffers();
void BuildPanelBasic(void); void BuildPanelBasic();
void BuildPanelFields(void); void BuildPanelFields();
void ComponentPropertiesAccept(wxCommandEvent& event); void ComponentPropertiesAccept(wxCommandEvent& event);
void SetInitCmp( wxCommandEvent& event ); void SetInitCmp( wxCommandEvent& event );
void CopyDataToPanelField(void); void CopyDataToPanelField();
void CopyPanelFieldToData(void); void CopyPanelFieldToData();
void SelectNewField(wxCommandEvent& event); void SelectNewField(wxCommandEvent& event);
////@begin WinEDA_ComponentPropertiesFrame member variables ////@begin WinEDA_ComponentPropertiesFrame member variables
......
...@@ -303,7 +303,7 @@ void KiConfigEeschemaFrame::OnCloseWindow(wxCloseEvent & event) ...@@ -303,7 +303,7 @@ void KiConfigEeschemaFrame::OnCloseWindow(wxCloseEvent & event)
/*********************************************/ /*********************************************/
void KiConfigEeschemaFrame::ChangeSetup(void) void KiConfigEeschemaFrame::ChangeSetup()
/*********************************************/ /*********************************************/
{ {
g_UserLibDirBuffer = m_LibDirCtrl->GetValue(); g_UserLibDirBuffer = m_LibDirCtrl->GetValue();
...@@ -377,7 +377,7 @@ wxString FullLibName,ShortLibName, Mask; ...@@ -377,7 +377,7 @@ wxString FullLibName,ShortLibName, Mask;
/****************************************************/ /****************************************************/
void KiConfigEeschemaFrame::SetFormatsNetListes(void) void KiConfigEeschemaFrame::SetFormatsNetListes()
/****************************************************/ /****************************************************/
/* Adjust the m_NetFormatBox current selection, according to the current netlist format*/ /* Adjust the m_NetFormatBox current selection, according to the current netlist format*/
......
...@@ -119,10 +119,10 @@ public: ...@@ -119,10 +119,10 @@ public:
/// Should we show tooltips? /// Should we show tooltips?
static bool ShowToolTips(); static bool ShowToolTips();
void SetFormatsNetListes(void); void SetFormatsNetListes();
void LibDelFct(wxCommandEvent& event); void LibDelFct(wxCommandEvent& event);
void AddOrInsertLibrary(wxCommandEvent& event); void AddOrInsertLibrary(wxCommandEvent& event);
void ChangeSetup(void); void ChangeSetup();
////@begin KiConfigEeschemaFrame member variables ////@begin KiConfigEeschemaFrame member variables
wxRadioBox* m_NetFormatBox; wxRadioBox* m_NetFormatBox;
......
...@@ -124,7 +124,7 @@ public: ...@@ -124,7 +124,7 @@ public:
void SelNewCmp(wxCommandEvent& event); void SelNewCmp(wxCommandEvent& event);
void ResetDefaultERCDiag(wxCommandEvent& event); void ResetDefaultERCDiag(wxCommandEvent& event);
void ChangeErrorLevel(wxCommandEvent& event); void ChangeErrorLevel(wxCommandEvent& event);
void ReBuildMatrixPanel(void); void ReBuildMatrixPanel();
////@begin WinEDA_ErcFrame member variables ////@begin WinEDA_ErcFrame member variables
wxNotebook* m_NoteBook; wxNotebook* m_NoteBook;
......
...@@ -126,7 +126,7 @@ int ii = Field->m_FieldId; ...@@ -126,7 +126,7 @@ int ii = Field->m_FieldId;
} }
/*****************************************************/ /*****************************************************/
void WinEDA_PartPropertiesFrame::InitBuffers(void) void WinEDA_PartPropertiesFrame::InitBuffers()
/*****************************************************/ /*****************************************************/
/* Init the buffers to a default value, /* Init the buffers to a default value,
or to values from CurrentLibEntry if CurrentLibEntry != NULL or to values from CurrentLibEntry if CurrentLibEntry != NULL
...@@ -182,7 +182,7 @@ int ii; ...@@ -182,7 +182,7 @@ int ii;
/*****************************************************/ /*****************************************************/
void WinEDA_PartPropertiesFrame::BuildPanelAlias(void) void WinEDA_PartPropertiesFrame::BuildPanelAlias()
/*****************************************************/ /*****************************************************/
/* create the panel for component alias list editing /* create the panel for component alias list editing
*/ */
...@@ -241,7 +241,7 @@ wxButton * Button; ...@@ -241,7 +241,7 @@ wxButton * Button;
/*****************************************************************/ /*****************************************************************/
void WinEDA_PartPropertiesFrame::BuildPanelFootprintFilter(void) void WinEDA_PartPropertiesFrame::BuildPanelFootprintFilter()
/*****************************************************************/ /*****************************************************************/
/* create the panel for footprint filtering in cvpcb list /* create the panel for footprint filtering in cvpcb list
*/ */
...@@ -303,7 +303,7 @@ wxBoxSizer * PanelFpFilterBoxSizer = new wxBoxSizer(wxHORIZONTAL); ...@@ -303,7 +303,7 @@ wxBoxSizer * PanelFpFilterBoxSizer = new wxBoxSizer(wxHORIZONTAL);
/*****************************************************/ /*****************************************************/
void WinEDA_PartPropertiesFrame::BuildPanelDoc(void) void WinEDA_PartPropertiesFrame::BuildPanelDoc()
/*****************************************************/ /*****************************************************/
/* create the panel for component doc editing /* create the panel for component doc editing
*/ */
...@@ -343,7 +343,7 @@ wxString msg_text; ...@@ -343,7 +343,7 @@ wxString msg_text;
/*****************************************************/ /*****************************************************/
void WinEDA_PartPropertiesFrame::BuildPanelBasic(void) void WinEDA_PartPropertiesFrame::BuildPanelBasic()
/*****************************************************/ /*****************************************************/
/* create the basic panel for component properties editing /* create the basic panel for component properties editing
*/ */
...@@ -402,7 +402,7 @@ void WinEDA_PartPropertiesFrame::BuildPanelBasic(void) ...@@ -402,7 +402,7 @@ void WinEDA_PartPropertiesFrame::BuildPanelBasic(void)
} }
/*********************************************************/ /*********************************************************/
void WinEDA_PartPropertiesFrame::BuildPanelEditField(void) void WinEDA_PartPropertiesFrame::BuildPanelEditField()
/**********************************************************/ /**********************************************************/
/* Create and build the panel managing the fields (REF, VALUE ...) /* Create and build the panel managing the fields (REF, VALUE ...)
of the component of the component
...@@ -483,7 +483,7 @@ wxString fieldnamelist[NUMBER_OF_FIELDS]; ...@@ -483,7 +483,7 @@ wxString fieldnamelist[NUMBER_OF_FIELDS];
} }
/****************************************************************/ /****************************************************************/
void WinEDA_PartPropertiesFrame::CopyDataToPanelField(void) void WinEDA_PartPropertiesFrame::CopyDataToPanelField()
/****************************************************************/ /****************************************************************/
/* Set the values displayed on the panel field according to /* Set the values displayed on the panel field according to
the current field number the current field number
...@@ -520,7 +520,7 @@ int FieldId = m_CurrentFieldId; ...@@ -520,7 +520,7 @@ int FieldId = m_CurrentFieldId;
} }
/****************************************************************/ /****************************************************************/
void WinEDA_PartPropertiesFrame::CopyPanelFieldToData(void) void WinEDA_PartPropertiesFrame::CopyPanelFieldToData()
/****************************************************************/ /****************************************************************/
/* Copy the values displayed on the panel field to the buffers according to /* Copy the values displayed on the panel field to the buffers according to
the current field number the current field number
...@@ -944,7 +944,7 @@ LibEDA_BaseStruct* DrawItem, * NextDrawItem; ...@@ -944,7 +944,7 @@ LibEDA_BaseStruct* DrawItem, * NextDrawItem;
/*****************************************************/ /*****************************************************/
bool WinEDA_PartPropertiesFrame::SetUnsetConvert(void) bool WinEDA_PartPropertiesFrame::SetUnsetConvert()
/*****************************************************/ /*****************************************************/
/* cre ou efface (selon option AsConvert) les lments /* cre ou efface (selon option AsConvert) les lments
de la reprsentation convertie d'un composant de la reprsentation convertie d'un composant
......
This diff is collapsed.
...@@ -52,7 +52,7 @@ public: ...@@ -52,7 +52,7 @@ public:
// Constructor and destructor // Constructor and destructor
WinEDA_ConfigFrame(WinEDA_SchematicFrame *parent, const wxPoint& pos); WinEDA_ConfigFrame(WinEDA_SchematicFrame *parent, const wxPoint& pos);
~WinEDA_ConfigFrame(void) {}; ~WinEDA_ConfigFrame() {};
void OnCloseWindow(wxCloseEvent & event); void OnCloseWindow(wxCloseEvent & event);
...@@ -62,7 +62,7 @@ public: ...@@ -62,7 +62,7 @@ public:
void LibDelFct(wxCommandEvent& event); void LibDelFct(wxCommandEvent& event);
void AddOrInsertLibrary(wxCommandEvent& event); void AddOrInsertLibrary(wxCommandEvent& event);
void ReturnNetFormat(wxCommandEvent& event); void ReturnNetFormat(wxCommandEvent& event);
void ChangeSetup(void); void ChangeSetup();
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
...@@ -195,7 +195,7 @@ void WinEDA_ConfigFrame::OnCloseWindow(wxCloseEvent & event) ...@@ -195,7 +195,7 @@ void WinEDA_ConfigFrame::OnCloseWindow(wxCloseEvent & event)
/*******************************************/ /*******************************************/
void WinEDA_ConfigFrame::ChangeSetup(void) void WinEDA_ConfigFrame::ChangeSetup()
/*******************************************/ /*******************************************/
{ {
g_UserLibDirBuffer = LibDirCtrl->GetData(); g_UserLibDirBuffer = LibDirCtrl->GetData();
......
...@@ -159,7 +159,7 @@ void InstallErcFrame(WinEDA_SchematicFrame *parent, wxPoint & pos) ...@@ -159,7 +159,7 @@ void InstallErcFrame(WinEDA_SchematicFrame *parent, wxPoint & pos)
/*********************************************/ /*********************************************/
void WinEDA_ErcFrame::ReBuildMatrixPanel(void) void WinEDA_ErcFrame::ReBuildMatrixPanel()
/*********************************************/ /*********************************************/
/* Build or rebuild the panel showing the ERC matrix /* Build or rebuild the panel showing the ERC matrix
*/ */
......
...@@ -107,18 +107,18 @@ private: ...@@ -107,18 +107,18 @@ private:
public: public:
// Constructor and destructor // Constructor and destructor
WinEDA_PartPropertiesFrame(WinEDA_LibeditFrame *parent, wxPoint& pos); WinEDA_PartPropertiesFrame(WinEDA_LibeditFrame *parent, wxPoint& pos);
~WinEDA_PartPropertiesFrame(void) ~WinEDA_PartPropertiesFrame()
{ {
if( AliasListCopy ) AliasListCopy->FreeList(); if( AliasListCopy ) AliasListCopy->FreeList();
}; };
private: private:
void PartPropertiesAccept(wxCommandEvent& event); void PartPropertiesAccept(wxCommandEvent& event);
void DeleteAllAliasOfPart(void); void DeleteAllAliasOfPart();
void DeleteAliasOfPart(void); void DeleteAliasOfPart();
void AddAliasOfPart(void); void AddAliasOfPart();
bool ChangeNbUnitsPerPackage(int newUnit); bool ChangeNbUnitsPerPackage(int newUnit);
bool SetUnsetConvert(void); bool SetUnsetConvert();
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
...@@ -566,10 +566,10 @@ bool recreateTB = FALSE; ...@@ -566,10 +566,10 @@ bool recreateTB = FALSE;
/***************************************************************/ /***************************************************************/
/* void WinEDA_PartPropertiesFrame::DeleteAllAliasOfPart(void) */ /* void WinEDA_PartPropertiesFrame::DeleteAllAliasOfPart() */
/***************************************************************/ /***************************************************************/
void WinEDA_PartPropertiesFrame::DeleteAllAliasOfPart(void) void WinEDA_PartPropertiesFrame::DeleteAllAliasOfPart()
{ {
if(CurrentLibEntry && AliasListCopy ) if(CurrentLibEntry && AliasListCopy )
...@@ -585,10 +585,10 @@ void WinEDA_PartPropertiesFrame::DeleteAllAliasOfPart(void) ...@@ -585,10 +585,10 @@ void WinEDA_PartPropertiesFrame::DeleteAllAliasOfPart(void)
} }
/*********************************************************/ /*********************************************************/
/* void WinEDA_PartPropertiesFrame::AddAliasOfPart(void) */ /* void WinEDA_PartPropertiesFrame::AddAliasOfPart() */
/*********************************************************/ /*********************************************************/
void WinEDA_PartPropertiesFrame::AddAliasOfPart(void) void WinEDA_PartPropertiesFrame::AddAliasOfPart()
{ {
char Line[LINE_LEN]; char Line[LINE_LEN];
int llen; int llen;
...@@ -623,10 +623,10 @@ ListOfAliasStruct * NewAlias; ...@@ -623,10 +623,10 @@ ListOfAliasStruct * NewAlias;
} }
/********************************/ /********************************/
/* void DeleteAliasOfPart(void) */ /* void DeleteAliasOfPart() */
/********************************/ /********************************/
void WinEDA_PartPropertiesFrame::DeleteAliasOfPart(void) void WinEDA_PartPropertiesFrame::DeleteAliasOfPart()
{ {
ListOfAliasStruct * Alias; ListOfAliasStruct * Alias;
wxString aliasname; wxString aliasname;
...@@ -745,7 +745,7 @@ LibDrawField *Field = (LibDrawField *)CurrentDrawItem; ...@@ -745,7 +745,7 @@ LibDrawField *Field = (LibDrawField *)CurrentDrawItem;
} }
/********************************/ /********************************/
/* static void PlaceField(void) */ /* static void PlaceField() */
/********************************/ /********************************/
void WinEDA_LibeditFrame::PlaceField(wxDC * DC, LibDrawField *Field) void WinEDA_LibeditFrame::PlaceField(wxDC * DC, LibDrawField *Field)
...@@ -1046,12 +1046,12 @@ LibEDA_BaseStruct* DrawItem, * NextDrawItem; ...@@ -1046,12 +1046,12 @@ LibEDA_BaseStruct* DrawItem, * NextDrawItem;
/**********************************************************/ /**********************************************************/
/* void WinEDA_PartPropertiesFrame::SetUnsetConvert(void) */ /* void WinEDA_PartPropertiesFrame::SetUnsetConvert() */
/**********************************************************/ /**********************************************************/
/* cre ou efface (selon option AsConvert) les lments /* cre ou efface (selon option AsConvert) les lments
de la reprsentation convertie d'un composant de la reprsentation convertie d'un composant
*/ */
bool WinEDA_PartPropertiesFrame::SetUnsetConvert(void) bool WinEDA_PartPropertiesFrame::SetUnsetConvert()
{ {
int FlagDel = 0; int FlagDel = 0;
LibEDA_BaseStruct* DrawItem = NULL, * NextDrawItem; LibEDA_BaseStruct* DrawItem = NULL, * NextDrawItem;
......
...@@ -114,7 +114,7 @@ wxString LibArchiveFileName; ...@@ -114,7 +114,7 @@ wxString LibArchiveFileName;
} }
/************************/ /************************/
int CountCmpNumber(void) int CountCmpNumber()
/************************/ /************************/
/* Routine retournant le nombre de composants dans le schema, /* Routine retournant le nombre de composants dans le schema,
powers non comprises */ powers non comprises */
......
...@@ -71,10 +71,10 @@ public: ...@@ -71,10 +71,10 @@ public:
// Constructor and destructor // Constructor and destructor
WinEDA_GenCmpListFrame(WinEDA_DrawFrame *parent, wxPoint& pos); WinEDA_GenCmpListFrame(WinEDA_DrawFrame *parent, wxPoint& pos);
~WinEDA_GenCmpListFrame(void) {}; ~WinEDA_GenCmpListFrame() {};
void GenList(wxCommandEvent& event); void GenList(wxCommandEvent& event);
void GenListUpdateOpt(void); void GenListUpdateOpt();
void ToolsExit(wxCommandEvent& event); void ToolsExit(wxCommandEvent& event);
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
...@@ -151,7 +151,7 @@ wxPoint pos; ...@@ -151,7 +151,7 @@ wxPoint pos;
} }
// Fonctions de positionnement des variables d'option // Fonctions de positionnement des variables d'option
void WinEDA_GenCmpListFrame::GenListUpdateOpt(void) void WinEDA_GenCmpListFrame::GenListUpdateOpt()
{ {
ItemsToList = 0; ItemsToList = 0;
if ( m_ListCmpbyRefItems->GetValue() ) ItemsToList |= LISTCMP_BY_REF; if ( m_ListCmpbyRefItems->GetValue() ) ItemsToList |= LISTCMP_BY_REF;
......
...@@ -51,7 +51,7 @@ private: ...@@ -51,7 +51,7 @@ private:
wxImageList *imageList; wxImageList *imageList;
public: public:
WinEDA_Tree(void) { } WinEDA_Tree() { }
WinEDA_Tree(WinEDA_HierFrame *parent); WinEDA_Tree(WinEDA_HierFrame *parent);
DECLARE_DYNAMIC_CLASS(WinEDA_Tree) DECLARE_DYNAMIC_CLASS(WinEDA_Tree)
...@@ -93,7 +93,7 @@ public: ...@@ -93,7 +93,7 @@ public:
WinEDA_HierFrame(WinEDA_SchematicFrame *parent, wxDC * DC, const wxPoint& pos); WinEDA_HierFrame(WinEDA_SchematicFrame *parent, wxDC * DC, const wxPoint& pos);
void BuildSheetList(EDA_BaseStruct * DrawStruct, void BuildSheetList(EDA_BaseStruct * DrawStruct,
wxTreeItemId * previousmenu); wxTreeItemId * previousmenu);
~WinEDA_HierFrame(void); ~WinEDA_HierFrame();
void OnSelect(wxTreeEvent& event); void OnSelect(wxTreeEvent& event);
...@@ -165,7 +165,7 @@ wxRect itemrect; ...@@ -165,7 +165,7 @@ wxRect itemrect;
} }
} }
WinEDA_HierFrame::~WinEDA_HierFrame(void) WinEDA_HierFrame::~WinEDA_HierFrame()
{ {
} }
...@@ -267,7 +267,7 @@ DrawSheetStruct * Sheet; ...@@ -267,7 +267,7 @@ DrawSheetStruct * Sheet;
/******************************************************/ /******************************************************/
void WinEDA_SchematicFrame::InstallPreviousScreen(void) void WinEDA_SchematicFrame::InstallPreviousScreen()
/******************************************************/ /******************************************************/
/* Set the current screen to display the parent sheet of the current displayed sheet /* Set the current screen to display the parent sheet of the current displayed sheet
*/ */
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
/*************************************************/ /*************************************************/
void WinEDA_LibeditFrame::ImportOnePart(void) void WinEDA_LibeditFrame::ImportOnePart()
/*************************************************/ /*************************************************/
/* Routine de lecture de 1 description. /* Routine de lecture de 1 description.
Le format est celui des librairies, mais on ne charge que 1 composant Le format est celui des librairies, mais on ne charge que 1 composant
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
/**********************************************/ /**********************************************/
void WinEDA_LibeditFrame::DisplayLibInfos(void) void WinEDA_LibeditFrame::DisplayLibInfos()
/**********************************************/ /**********************************************/
/* Affiche dans la zone messages la librairie , et le composant edite */ /* Affiche dans la zone messages la librairie , et le composant edite */
{ {
...@@ -60,7 +60,7 @@ wxChar UnitLetter[] = wxT("?ABCDEFGHIJKLMNOPQRSTUVWXYZ"); ...@@ -60,7 +60,7 @@ wxChar UnitLetter[] = wxT("?ABCDEFGHIJKLMNOPQRSTUVWXYZ");
/**************************************************/ /**************************************************/
void WinEDA_LibeditFrame::SelectActiveLibrary(void) void WinEDA_LibeditFrame::SelectActiveLibrary()
/**************************************************/ /**************************************************/
/* Routine to Select Current library /* Routine to Select Current library
*/ */
...@@ -78,7 +78,7 @@ LibraryStruct *Lib; ...@@ -78,7 +78,7 @@ LibraryStruct *Lib;
/*************************************************/ /*************************************************/
/* Routine to Load one selected library content. */ /* Routine to Load one selected library content. */
/*************************************************/ /*************************************************/
bool WinEDA_LibeditFrame::LoadOneLibraryPart(void) bool WinEDA_LibeditFrame::LoadOneLibraryPart()
{ {
int i; int i;
wxString msg; wxString msg;
...@@ -216,7 +216,7 @@ void WinEDA_LibeditFrame::RedrawActiveWindow(wxDC * DC, bool EraseBg) ...@@ -216,7 +216,7 @@ void WinEDA_LibeditFrame::RedrawActiveWindow(wxDC * DC, bool EraseBg)
/*************************************************/ /*************************************************/
void WinEDA_LibeditFrame::SaveActiveLibrary(void) void WinEDA_LibeditFrame::SaveActiveLibrary()
/*************************************************/ /*************************************************/
/* Sauvegarde en fichier la librairie pointee par CurrentLib /* Sauvegarde en fichier la librairie pointee par CurrentLib
une sauvegarde en .bak de l'ancien fichier est egalement cree une sauvegarde en .bak de l'ancien fichier est egalement cree
...@@ -274,7 +274,7 @@ LibCmpEntry * CmpEntry; ...@@ -274,7 +274,7 @@ LibCmpEntry * CmpEntry;
} }
/*********************************************/ /*********************************************/
void WinEDA_LibeditFrame::DeleteOnePart(void) void WinEDA_LibeditFrame::DeleteOnePart()
/*********************************************/ /*********************************************/
/* Routine de suppression d'un composant dans la librairie courante /* Routine de suppression d'un composant dans la librairie courante
(effacement en memoire uniquement, le fichier n'est pas modifie) (effacement en memoire uniquement, le fichier n'est pas modifie)
...@@ -359,7 +359,7 @@ wxString msg; ...@@ -359,7 +359,7 @@ wxString msg;
/****************************************************/ /****************************************************/
void WinEDA_LibeditFrame::CreateNewLibraryPart(void) void WinEDA_LibeditFrame::CreateNewLibraryPart()
/****************************************************/ /****************************************************/
/* Routine to create a new library component /* Routine to create a new library component
If an old component is currently in edit, it is deleted. If an old component is currently in edit, it is deleted.
...@@ -540,7 +540,7 @@ EDA_LibCmpAliasStruct * AliasEntry; ...@@ -540,7 +540,7 @@ EDA_LibCmpAliasStruct * AliasEntry;
/***************************************************/ /***************************************************/
void WinEDA_LibeditFrame::SaveOnePartInMemory(void) void WinEDA_LibeditFrame::SaveOnePartInMemory()
/***************************************************/ /***************************************************/
/* Routine de sauvegarde de la "partlib" courante dans la librairie courante /* Routine de sauvegarde de la "partlib" courante dans la librairie courante
Sauvegarde en memoire uniquement, et PAS sur fichier Sauvegarde en memoire uniquement, et PAS sur fichier
......
...@@ -39,7 +39,7 @@ EDA_LibComponentStruct * CopyItem; ...@@ -39,7 +39,7 @@ EDA_LibComponentStruct * CopyItem;
} }
/******************************************************/ /******************************************************/
void WinEDA_LibeditFrame::GetComponentFromRedoList(void) void WinEDA_LibeditFrame::GetComponentFromRedoList()
/******************************************************/ /******************************************************/
/* Redo the last edition: /* Redo the last edition:
- Place the current edited library component in undo list - Place the current edited library component in undo list
...@@ -59,7 +59,7 @@ void WinEDA_LibeditFrame::GetComponentFromRedoList(void) ...@@ -59,7 +59,7 @@ void WinEDA_LibeditFrame::GetComponentFromRedoList(void)
} }
/******************************************************/ /******************************************************/
void WinEDA_LibeditFrame::GetComponentFromUndoList(void) void WinEDA_LibeditFrame::GetComponentFromUndoList()
/******************************************************/ /******************************************************/
/* Undo the last edition: /* Undo the last edition:
- Place the current edited library component in Redo list - Place the current edited library component in Redo list
......
...@@ -99,14 +99,14 @@ private: ...@@ -99,14 +99,14 @@ private:
public: public:
// Constructor and destructor // Constructor and destructor
WinEDA_PartPropertiesFrame(WinEDA_LibeditFrame *parent, wxPoint& pos); WinEDA_PartPropertiesFrame(WinEDA_LibeditFrame *parent, wxPoint& pos);
~WinEDA_PartPropertiesFrame(void) ~WinEDA_PartPropertiesFrame()
{ {
}; };
private: private:
void BuildPanelBasic(void); void BuildPanelBasic();
void BuildPanelDoc(void); void BuildPanelDoc();
void BuildPanelAlias(void); void BuildPanelAlias();
void BuildPanelEditField(int fieldId); void BuildPanelEditField(int fieldId);
void PartPropertiesAccept(wxCommandEvent& event); void PartPropertiesAccept(wxCommandEvent& event);
void OnQuit(wxCommandEvent& event); void OnQuit(wxCommandEvent& event);
...@@ -114,7 +114,7 @@ private: ...@@ -114,7 +114,7 @@ private:
void DeleteAliasOfPart(wxCommandEvent& event); void DeleteAliasOfPart(wxCommandEvent& event);
void AddAliasOfPart(wxCommandEvent& event); void AddAliasOfPart(wxCommandEvent& event);
bool ChangeNbUnitsPerPackage(int newUnit); bool ChangeNbUnitsPerPackage(int newUnit);
bool SetUnsetConvert(void); bool SetUnsetConvert();
void CopyDocToAlias(wxCommandEvent& event); void CopyDocToAlias(wxCommandEvent& event);
void BrowseAndSelectDocFile(wxCommandEvent& event); void BrowseAndSelectDocFile(wxCommandEvent& event);
...@@ -254,7 +254,7 @@ int ii; ...@@ -254,7 +254,7 @@ int ii;
} }
/*****************************************************/ /*****************************************************/
void WinEDA_PartPropertiesFrame::BuildPanelAlias(void) void WinEDA_PartPropertiesFrame::BuildPanelAlias()
/*****************************************************/ /*****************************************************/
/* create the panel for component alias list editing /* create the panel for component alias list editing
*/ */
...@@ -305,7 +305,7 @@ wxButton * Button; ...@@ -305,7 +305,7 @@ wxButton * Button;
/*****************************************************/ /*****************************************************/
void WinEDA_PartPropertiesFrame::BuildPanelDoc(void) void WinEDA_PartPropertiesFrame::BuildPanelDoc()
/*****************************************************/ /*****************************************************/
/* create the panel for component doc editing /* create the panel for component doc editing
*/ */
...@@ -388,7 +388,7 @@ wxString msg_text; ...@@ -388,7 +388,7 @@ wxString msg_text;
/*****************************************************/ /*****************************************************/
void WinEDA_PartPropertiesFrame::BuildPanelBasic(void) void WinEDA_PartPropertiesFrame::BuildPanelBasic()
/*****************************************************/ /*****************************************************/
/* create the basic panel for component properties editing /* create the basic panel for component properties editing
*/ */
...@@ -1033,7 +1033,7 @@ LibEDA_BaseStruct* DrawItem, * NextDrawItem; ...@@ -1033,7 +1033,7 @@ LibEDA_BaseStruct* DrawItem, * NextDrawItem;
/*****************************************************/ /*****************************************************/
bool WinEDA_PartPropertiesFrame::SetUnsetConvert(void) bool WinEDA_PartPropertiesFrame::SetUnsetConvert()
/*****************************************************/ /*****************************************************/
/* cre ou efface (selon option AsConvert) les lments /* cre ou efface (selon option AsConvert) les lments
de la reprsentation convertie d'un composant de la reprsentation convertie d'un composant
......
...@@ -82,7 +82,7 @@ WinEDA_LibeditFrame::WinEDA_LibeditFrame(wxWindow * father, WinEDA_App *parent, ...@@ -82,7 +82,7 @@ WinEDA_LibeditFrame::WinEDA_LibeditFrame(wxWindow * father, WinEDA_App *parent,
} }
/**********************************************/ /**********************************************/
WinEDA_LibeditFrame::~WinEDA_LibeditFrame(void) WinEDA_LibeditFrame::~WinEDA_LibeditFrame()
/**********************************************/ /**********************************************/
{ {
m_Parent->LibeditFrame = NULL; m_Parent->LibeditFrame = NULL;
...@@ -124,7 +124,7 @@ LibraryStruct *Lib; ...@@ -124,7 +124,7 @@ LibraryStruct *Lib;
/******************************************/ /******************************************/
void WinEDA_LibeditFrame::SetToolbars(void) void WinEDA_LibeditFrame::SetToolbars()
/******************************************/ /******************************************/
/* Enable or disable tools of the differents toolbars, /* Enable or disable tools of the differents toolbars,
according to the current conditions or options according to the current conditions or options
...@@ -233,7 +233,7 @@ void WinEDA_LibeditFrame::SetToolbars(void) ...@@ -233,7 +233,7 @@ void WinEDA_LibeditFrame::SetToolbars(void)
} }
/**************************************/ /**************************************/
int WinEDA_LibeditFrame::BestZoom(void) int WinEDA_LibeditFrame::BestZoom()
/**************************************/ /**************************************/
{ {
int dx, dy, ii,jj ; int dx, dy, ii,jj ;
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
/************************************************/ /************************************************/
void WinEDA_SchematicFrame::ReCreateMenuBar(void) void WinEDA_SchematicFrame::ReCreateMenuBar()
/************************************************/ /************************************************/
/* create or update the menubar for the schematic frame /* create or update the menubar for the schematic frame
*/ */
......
...@@ -75,7 +75,7 @@ int i; ...@@ -75,7 +75,7 @@ int i;
} }
/*****************************************************/ /*****************************************************/
void * WinEDA_SchematicFrame::BuildNetListBase(void) void * WinEDA_SchematicFrame::BuildNetListBase()
/*****************************************************/ /*****************************************************/
/* Routine qui construit le tableau des elements connectes du projet /* Routine qui construit le tableau des elements connectes du projet
met a jour: met a jour:
......
...@@ -55,7 +55,7 @@ public: ...@@ -55,7 +55,7 @@ public:
EDA_NoteBookPage(wxNotebook* parent, const wxString & title, EDA_NoteBookPage(wxNotebook* parent, const wxString & title,
int id_NetType, int idCheckBox, int idCreateFile); int id_NetType, int idCheckBox, int idCreateFile);
~EDA_NoteBookPage(void) {}; ~EDA_NoteBookPage() {};
}; };
...@@ -141,14 +141,14 @@ public: ...@@ -141,14 +141,14 @@ public:
public: public:
// Constructor and destructor // Constructor and destructor
WinEDA_NetlistFrame(WinEDA_SchematicFrame *parent, wxPoint& pos); WinEDA_NetlistFrame(WinEDA_SchematicFrame *parent, wxPoint& pos);
~WinEDA_NetlistFrame(void) {}; ~WinEDA_NetlistFrame() {};
private: private:
void InstallCustomPages(void); void InstallCustomPages();
void InstallPageSpice(void); void InstallPageSpice();
void GenNetlist(wxCommandEvent& event); void GenNetlist(wxCommandEvent& event);
void RunSimulator(wxCommandEvent& event); void RunSimulator(wxCommandEvent& event);
void NetlistUpdateOpt(void); void NetlistUpdateOpt();
void NetlistExit(wxCommandEvent& event); void NetlistExit(wxCommandEvent& event);
void SelectNetlistType(wxCommandEvent& event); void SelectNetlistType(wxCommandEvent& event);
void SetupPlugin(wxCommandEvent& event); void SetupPlugin(wxCommandEvent& event);
...@@ -238,7 +238,7 @@ int ii; ...@@ -238,7 +238,7 @@ int ii;
/*************************************************/ /*************************************************/
void WinEDA_NetlistFrame::InstallPageSpice(void) void WinEDA_NetlistFrame::InstallPageSpice()
/*************************************************/ /*************************************************/
/* Create the spice page /* Create the spice page
*/ */
...@@ -278,7 +278,7 @@ wxString netlist_opt[2] = { _("Use Net Names"), _("Use Net Numbers") }; ...@@ -278,7 +278,7 @@ wxString netlist_opt[2] = { _("Use Net Names"), _("Use Net Numbers") };
} }
/*************************************************/ /*************************************************/
void WinEDA_NetlistFrame::InstallCustomPages(void) void WinEDA_NetlistFrame::InstallCustomPages()
/*************************************************/ /*************************************************/
/* create the pages for custom netlist format selection: /* create the pages for custom netlist format selection:
*/ */
...@@ -376,7 +376,7 @@ EDA_NoteBookPage * CurrPage; ...@@ -376,7 +376,7 @@ EDA_NoteBookPage * CurrPage;
} }
/***********************************************/ /***********************************************/
void WinEDA_NetlistFrame::NetlistUpdateOpt(void) void WinEDA_NetlistFrame::NetlistUpdateOpt()
/***********************************************/ /***********************************************/
{ {
int ii; int ii;
......
...@@ -64,7 +64,7 @@ public: ...@@ -64,7 +64,7 @@ public:
// Constructor and destructor // Constructor and destructor
WinEDA_SetOptionsFrame(WinEDA_DrawFrame *parent, const wxPoint& framepos); WinEDA_SetOptionsFrame(WinEDA_DrawFrame *parent, const wxPoint& framepos);
~WinEDA_SetOptionsFrame(void) {}; ~WinEDA_SetOptionsFrame() {};
private: private:
void Accept(wxCommandEvent& event); void Accept(wxCommandEvent& event);
......
...@@ -107,7 +107,7 @@ wxString msg; ...@@ -107,7 +107,7 @@ wxString msg;
/*********************************************/ /*********************************************/
void WinEDA_LibeditFrame::InitEditOnePin(void) void WinEDA_LibeditFrame::InitEditOnePin()
/*********************************************/ /*********************************************/
/* Routine d'installation du menu d'edition d'une pin /* Routine d'installation du menu d'edition d'une pin
*/ */
......
...@@ -372,7 +372,7 @@ wxIcon WinEDA_PlotHPGLFrame::GetIconResource( const wxString& name ) ...@@ -372,7 +372,7 @@ wxIcon WinEDA_PlotHPGLFrame::GetIconResource( const wxString& name )
/***************************************************/ /***************************************************/
void WinEDA_PlotHPGLFrame::SetPageOffsetValue(void) void WinEDA_PlotHPGLFrame::SetPageOffsetValue()
/***************************************************/ /***************************************************/
{ {
wxString msg; wxString msg;
......
...@@ -134,7 +134,7 @@ public: ...@@ -134,7 +134,7 @@ public:
void Plot_1_Page_HPGL(const wxString & FullFileName,BASE_SCREEN * screen); void Plot_1_Page_HPGL(const wxString & FullFileName,BASE_SCREEN * screen);
void Plot_Schematic_HPGL(int Select_PlotAll, int HPGL_SheetSize); void Plot_Schematic_HPGL(int Select_PlotAll, int HPGL_SheetSize);
void ReturnSheetDims( BASE_SCREEN * screen, wxSize & SheetSize, wxPoint & SheetOffset); void ReturnSheetDims( BASE_SCREEN * screen, wxSize & SheetSize, wxPoint & SheetOffset);
void SetPageOffsetValue(void); void SetPageOffsetValue();
////@begin WinEDA_PlotHPGLFrame member variables ////@begin WinEDA_PlotHPGLFrame member variables
wxRadioBox* m_SizeOption; wxRadioBox* m_SizeOption;
......
...@@ -303,7 +303,7 @@ void WinEDA_PlotPSFrame::OnCloseClick( wxCommandEvent& event ) ...@@ -303,7 +303,7 @@ void WinEDA_PlotPSFrame::OnCloseClick( wxCommandEvent& event )
/*****************************************/ /*****************************************/
void WinEDA_PlotPSFrame::InitOptVars(void) void WinEDA_PlotPSFrame::InitOptVars()
/*****************************************/ /*****************************************/
{ {
Plot_Sheet_Ref = m_Plot_Sheet_Ref->GetValue(); Plot_Sheet_Ref = m_Plot_Sheet_Ref->GetValue();
......
...@@ -104,7 +104,7 @@ public: ...@@ -104,7 +104,7 @@ public:
wxIcon GetIconResource( const wxString& name ); wxIcon GetIconResource( const wxString& name );
////@end WinEDA_PlotPSFrame member function declarations ////@end WinEDA_PlotPSFrame member function declarations
void InitOptVars(void); void InitOptVars();
void CreatePSFile(int AllPages, int pagesize); void CreatePSFile(int AllPages, int pagesize);
void PlotOneSheetPS(const wxString & FileName, void PlotOneSheetPS(const wxString & FileName,
BASE_SCREEN * screen, Ki_PageDescr * sheet, int BBox[4], wxPoint plot_offset); BASE_SCREEN * screen, Ki_PageDescr * sheet, int BBox[4], wxPoint plot_offset);
......
...@@ -47,7 +47,7 @@ void InstallCmpeditFrame(WinEDA_SchematicFrame * parent, wxPoint & pos, ...@@ -47,7 +47,7 @@ void InstallCmpeditFrame(WinEDA_SchematicFrame * parent, wxPoint & pos,
/* Functions common to all EELibs?.c modules: */ /* Functions common to all EELibs?.c modules: */
int LibraryEntryCompare(EDA_LibComponentStruct *LE1, EDA_LibComponentStruct *LE2); int LibraryEntryCompare(EDA_LibComponentStruct *LE1, EDA_LibComponentStruct *LE2);
int NumOfLibraries(void); int NumOfLibraries();
EDA_LibComponentStruct *FindLibPart(const wxChar *Name, const wxString & LibName, int Alias); EDA_LibComponentStruct *FindLibPart(const wxChar *Name, const wxString & LibName, int Alias);
void DrawingLibInGhost(WinEDA_DrawPanel * panel, wxDC * DC, EDA_LibComponentStruct *LibEntry, void DrawingLibInGhost(WinEDA_DrawPanel * panel, wxDC * DC, EDA_LibComponentStruct *LibEntry,
...@@ -83,7 +83,7 @@ LibraryStruct * LoadLibraryName(WinEDA_DrawFrame * frame, ...@@ -83,7 +83,7 @@ LibraryStruct * LoadLibraryName(WinEDA_DrawFrame * frame,
const wxString & FullLibName, const wxString & LibName); const wxString & FullLibName, const wxString & LibName);
void LoadLibraries(WinEDA_DrawFrame * frame); void LoadLibraries(WinEDA_DrawFrame * frame);
void FreeCmpLibrary(wxWindow * frame, const wxString & LibName); void FreeCmpLibrary(wxWindow * frame, const wxString & LibName);
const wxChar **GetLibNames(void); const wxChar **GetLibNames();
void SnapLibItemPoint(int OrigX, int OrigY, int *ClosestX, int *ClosestY, void SnapLibItemPoint(int OrigX, int OrigY, int *ClosestX, int *ClosestY,
EDA_SchComponentStruct *DrawLibItem); EDA_SchComponentStruct *DrawLibItem);
...@@ -208,14 +208,14 @@ void RedrawOneStruct(WinEDA_DrawPanel * panel, wxDC * DC, EDA_BaseStruct *Struct ...@@ -208,14 +208,14 @@ void RedrawOneStruct(WinEDA_DrawPanel * panel, wxDC * DC, EDA_BaseStruct *Struct
/**************/ /**************/
/* EELAYER.CPP */ /* EELAYER.CPP */
/**************/ /**************/
void SeedLayers(void); void SeedLayers();
int ReturnLayerColor(int Layer); int ReturnLayerColor(int Layer);
void DisplayColorSetupFrame(WinEDA_DrawFrame * parent, const wxPoint & pos); void DisplayColorSetupFrame(WinEDA_DrawFrame * parent, const wxPoint & pos);
/*************/ /*************/
/* EELOAD.CPP */ /* EELOAD.CPP */
/*************/ /*************/
int CountCmpNumber(void); int CountCmpNumber();
/***************/ /***************/
......
...@@ -156,7 +156,7 @@ WinEDA_SchematicFrame:: WinEDA_SchematicFrame(wxWindow * father, WinEDA_App *par ...@@ -156,7 +156,7 @@ WinEDA_SchematicFrame:: WinEDA_SchematicFrame(wxWindow * father, WinEDA_App *par
/* Destructeur */ /* Destructeur */
/***************/ /***************/
WinEDA_SchematicFrame::~WinEDA_SchematicFrame(void) WinEDA_SchematicFrame::~WinEDA_SchematicFrame()
{ {
m_Parent->SchematicFrame = NULL; m_Parent->SchematicFrame = NULL;
m_CurrentScreen = ScreenSch; m_CurrentScreen = ScreenSch;
...@@ -228,7 +228,7 @@ SCH_SCREEN * screen; ...@@ -228,7 +228,7 @@ SCH_SCREEN * screen;
/********************************************/ /********************************************/
void WinEDA_SchematicFrame::SetToolbars(void) void WinEDA_SchematicFrame::SetToolbars()
/********************************************/ /********************************************/
/* Active ou desactive les tools du toolbar horizontal, en fonction des commandes /* Active ou desactive les tools du toolbar horizontal, en fonction des commandes
en cours en cours
...@@ -283,7 +283,7 @@ en cours ...@@ -283,7 +283,7 @@ en cours
} }
/******************************************/ /******************************************/
int WinEDA_SchematicFrame::BestZoom(void) int WinEDA_SchematicFrame::BestZoom()
/******************************************/ /******************************************/
{ {
int dx, dy, ii,jj ; int dx, dy, ii,jj ;
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "Lib_next.xpm" #include "Lib_next.xpm"
/****************************************************/ /****************************************************/
void WinEDA_ViewlibFrame::ReCreateHToolbar(void) void WinEDA_ViewlibFrame::ReCreateHToolbar()
/****************************************************/ /****************************************************/
{ {
int ii; int ii;
...@@ -145,7 +145,7 @@ bool asdeMorgan = FALSE, state; ...@@ -145,7 +145,7 @@ bool asdeMorgan = FALSE, state;
/****************************************************/ /****************************************************/
void WinEDA_ViewlibFrame::ReCreateVToolbar(void) void WinEDA_ViewlibFrame::ReCreateVToolbar()
/****************************************************/ /****************************************************/
{ {
} }
......
...@@ -106,7 +106,7 @@ WinEDA_ViewlibFrame::WinEDA_ViewlibFrame(wxWindow * father, WinEDA_App *parent, ...@@ -106,7 +106,7 @@ WinEDA_ViewlibFrame::WinEDA_ViewlibFrame(wxWindow * father, WinEDA_App *parent,
/* Destructeur */ /* Destructeur */
/***************/ /***************/
WinEDA_ViewlibFrame::~WinEDA_ViewlibFrame(void) WinEDA_ViewlibFrame::~WinEDA_ViewlibFrame()
{ {
delete m_CurrentScreen; delete m_CurrentScreen;
m_Parent->ViewlibFrame = NULL; m_Parent->ViewlibFrame = NULL;
...@@ -172,7 +172,7 @@ wxSize Vtoolbar_size; ...@@ -172,7 +172,7 @@ wxSize Vtoolbar_size;
/*******************************************/ /*******************************************/
int WinEDA_ViewlibFrame::BestZoom(void) int WinEDA_ViewlibFrame::BestZoom()
/*******************************************/ /*******************************************/
{ {
int bestzoom, ii, jj; int bestzoom, ii, jj;
...@@ -212,7 +212,7 @@ EDA_LibComponentStruct * CurrentLibEntry = NULL; ...@@ -212,7 +212,7 @@ EDA_LibComponentStruct * CurrentLibEntry = NULL;
} }
/***************************************************/ /***************************************************/
void WinEDA_ViewlibFrame::ReCreateListLib(void) void WinEDA_ViewlibFrame::ReCreateListLib()
/***************************************************/ /***************************************************/
{ {
const wxChar ** ListNames, ** names; const wxChar ** ListNames, ** names;
...@@ -251,7 +251,7 @@ bool found = FALSE; ...@@ -251,7 +251,7 @@ bool found = FALSE;
} }
/***********************************************/ /***********************************************/
void WinEDA_ViewlibFrame::ReCreateListCmp(void) void WinEDA_ViewlibFrame::ReCreateListCmp()
/***********************************************/ /***********************************************/
{ {
int ii; int ii;
......
...@@ -106,7 +106,7 @@ void WinEDA_ViewlibFrame::OnRightClick(const wxPoint& MousePos, wxMenu * PopMenu ...@@ -106,7 +106,7 @@ void WinEDA_ViewlibFrame::OnRightClick(const wxPoint& MousePos, wxMenu * PopMenu
/**********************************************/ /**********************************************/
void WinEDA_ViewlibFrame::DisplayLibInfos(void) void WinEDA_ViewlibFrame::DisplayLibInfos()
/**********************************************/ /**********************************************/
/* Affiche en Ligne d'info la librairie en cours de visualisation */ /* Affiche en Ligne d'info la librairie en cours de visualisation */
{ {
...@@ -124,7 +124,7 @@ LibraryStruct * Lib; ...@@ -124,7 +124,7 @@ LibraryStruct * Lib;
/*****************************************/ /*****************************************/
/* Routine to Select Current library */ /* Routine to Select Current library */
/*****************************************/ /*****************************************/
void WinEDA_ViewlibFrame::SelectCurrentLibrary(void) void WinEDA_ViewlibFrame::SelectCurrentLibrary()
{ {
LibraryStruct * Lib; LibraryStruct * Lib;
......
...@@ -53,7 +53,7 @@ class MyCanvas: public wxScrolledWindow ...@@ -53,7 +53,7 @@ class MyCanvas: public wxScrolledWindow
{ {
public: public:
MyCanvas(wxFrame *frame, const wxPoint& pos, const wxSize& size, long style = wxRETAINED); MyCanvas(wxFrame *frame, const wxPoint& pos, const wxSize& size, long style = wxRETAINED);
~MyCanvas(void) ; ~MyCanvas() ;
virtual void OnDraw(wxDC& dc); virtual void OnDraw(wxDC& dc);
void OnEvent(wxMouseEvent& event); void OnEvent(wxMouseEvent& event);
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
/**********************************************************************/ /**********************************************************************/
EDA_BaseStruct * WinEDA_GerberFrame::GerberGeneralLocateAndDisplay(void) EDA_BaseStruct * WinEDA_GerberFrame::GerberGeneralLocateAndDisplay()
/**********************************************************************/ /**********************************************************************/
{ {
return Locate(CURSEUR_OFF_GRILLE); return Locate(CURSEUR_OFF_GRILLE);
......
...@@ -80,7 +80,7 @@ int ii; ...@@ -80,7 +80,7 @@ int ii;
GERBER_Descr::~GERBER_Descr(void) GERBER_Descr::~GERBER_Descr()
{ {
int ii; int ii;
...@@ -95,7 +95,7 @@ int ii; ...@@ -95,7 +95,7 @@ int ii;
} }
/******************************************/ /******************************************/
void GERBER_Descr::ResetDefaultValues(void) void GERBER_Descr::ResetDefaultValues()
/******************************************/ /******************************************/
{ {
m_Parent = NULL; m_Parent = NULL;
...@@ -135,7 +135,7 @@ void GERBER_Descr::ResetDefaultValues(void) ...@@ -135,7 +135,7 @@ void GERBER_Descr::ResetDefaultValues(void)
} }
/********************************************/ /********************************************/
int GERBER_Descr::ReturnUsedDcodeNumber(void) int GERBER_Descr::ReturnUsedDcodeNumber()
/********************************************/ /********************************************/
{ {
int ii, jj; int ii, jj;
...@@ -155,7 +155,7 @@ int ii, jj; ...@@ -155,7 +155,7 @@ int ii, jj;
/******************************/ /******************************/
void GERBER_Descr::InitToolTable(void) void GERBER_Descr::InitToolTable()
/******************************/ /******************************/
/* Creation du tableau des MAX_TOOLS DCodes utilisables, si il n'existe pas, /* Creation du tableau des MAX_TOOLS DCodes utilisables, si il n'existe pas,
et Init des DCodes à une valeur raisonnable et Init des DCodes à une valeur raisonnable
...@@ -188,11 +188,11 @@ D_CODE::D_CODE(int num_dcode) ...@@ -188,11 +188,11 @@ D_CODE::D_CODE(int num_dcode)
Clear_D_CODE_Data(); Clear_D_CODE_Data();
} }
D_CODE::~D_CODE(void) D_CODE::~D_CODE()
{ {
} }
void D_CODE::Clear_D_CODE_Data(void) void D_CODE::Clear_D_CODE_Data()
{ {
m_Size.x = DEFAULT_SIZE; m_Size.x = DEFAULT_SIZE;
m_Size.y = DEFAULT_SIZE; m_Size.y = DEFAULT_SIZE;
...@@ -329,7 +329,7 @@ D_CODE ** ListeDCode; ...@@ -329,7 +329,7 @@ D_CODE ** ListeDCode;
/***************************************************/ /***************************************************/
void WinEDA_GerberFrame::CopyDCodesSizeToItems(void) void WinEDA_GerberFrame::CopyDCodesSizeToItems()
/***************************************************/ /***************************************************/
/* Set Size Items (Lines, Flashes) from DCodes List /* Set Size Items (Lines, Flashes) from DCodes List
*/ */
......
...@@ -152,7 +152,7 @@ WinEDA_GerberFrame::WinEDA_GerberFrame(wxWindow * father, WinEDA_App *parent, ...@@ -152,7 +152,7 @@ WinEDA_GerberFrame::WinEDA_GerberFrame(wxWindow * father, WinEDA_App *parent,
} }
WinEDA_GerberFrame::~WinEDA_GerberFrame(void) WinEDA_GerberFrame::~WinEDA_GerberFrame()
{ {
m_Parent->m_GerberFrame = NULL; m_Parent->m_GerberFrame = NULL;
m_CurrentScreen = ScreenPcb; m_CurrentScreen = ScreenPcb;
...@@ -196,7 +196,7 @@ PCB_SCREEN * screen; ...@@ -196,7 +196,7 @@ PCB_SCREEN * screen;
} }
/*******************************************/ /*******************************************/
void WinEDA_GerberFrame::SetToolbars(void) void WinEDA_GerberFrame::SetToolbars()
/*******************************************/ /*******************************************/
/* Active ou desactive les tools du toolbar horizontal, en fonction des commandes /* Active ou desactive les tools du toolbar horizontal, en fonction des commandes
en cours en cours
...@@ -285,7 +285,7 @@ GERBER_Descr * Gerber_layer_descr = g_GERBER_Descr_List[layer]; ...@@ -285,7 +285,7 @@ GERBER_Descr * Gerber_layer_descr = g_GERBER_Descr_List[layer];
} }
/*************************************/ /*************************************/
int WinEDA_GerberFrame::BestZoom(void) int WinEDA_GerberFrame::BestZoom()
/*************************************/ /*************************************/
{ {
int ii,jj ; int ii,jj ;
......
...@@ -22,7 +22,7 @@ wxString g_Main_Title = wxT("GerbView"); ...@@ -22,7 +22,7 @@ wxString g_Main_Title = wxT("GerbView");
IMPLEMENT_APP(WinEDA_App) IMPLEMENT_APP(WinEDA_App)
bool WinEDA_App::OnInit(void) bool WinEDA_App::OnInit()
{ {
wxString FFileName; wxString FFileName;
......
...@@ -143,11 +143,11 @@ public: ...@@ -143,11 +143,11 @@ public:
public: public:
GERBER_Descr(int layer); GERBER_Descr(int layer);
~GERBER_Descr(void); ~GERBER_Descr();
void Clear_GERBER_Descr(void); void Clear_GERBER_Descr();
int ReturnUsedDcodeNumber(void); int ReturnUsedDcodeNumber();
void ResetDefaultValues(void); void ResetDefaultValues();
void InitToolTable(void); void InitToolTable();
// Routines utilises en lecture de ficher gerber // Routines utilises en lecture de ficher gerber
wxPoint ReadXYCoord(char * &Text); wxPoint ReadXYCoord(char * &Text);
...@@ -180,7 +180,7 @@ public: ...@@ -180,7 +180,7 @@ public:
public: public:
D_CODE(int num_dcode); D_CODE(int num_dcode);
~D_CODE(); ~D_CODE();
void Clear_D_CODE_Data(void); void Clear_D_CODE_Data();
}; };
eda_global wxChar *g_GERBER_Tool_Type[6] eda_global wxChar *g_GERBER_Tool_Type[6]
......
...@@ -74,7 +74,7 @@ wxString FullFileName; ...@@ -74,7 +74,7 @@ wxString FullFileName;
/*****************************************************/ /*****************************************************/
bool Read_Config(void) bool Read_Config()
/*****************************************************/ /*****************************************************/
/* lit la configuration, si elle n'a pas deja etee lue /* lit la configuration, si elle n'a pas deja etee lue
1 - lit gerbview.cnf 1 - lit gerbview.cnf
...@@ -99,7 +99,7 @@ bool Read_Config(void) ...@@ -99,7 +99,7 @@ bool Read_Config(void)
/******************************************/ /******************************************/
void WinEDA_GerberFrame::Update_config(void) void WinEDA_GerberFrame::Update_config()
/******************************************/ /******************************************/
/* /*
creation du fichier de config creation du fichier de config
......
...@@ -128,7 +128,7 @@ private: ...@@ -128,7 +128,7 @@ private:
// Constructor and destructor // Constructor and destructor
public: public:
WinEDA_GerberGeneralOptionsFrame(WinEDA_BasePcbFrame *parent,const wxPoint& pos); WinEDA_GerberGeneralOptionsFrame(WinEDA_BasePcbFrame *parent,const wxPoint& pos);
~WinEDA_GerberGeneralOptionsFrame(void) {}; ~WinEDA_GerberGeneralOptionsFrame() {};
private: private:
void AcceptPcbOptions(wxCommandEvent& event); void AcceptPcbOptions(wxCommandEvent& event);
...@@ -263,7 +263,7 @@ public: ...@@ -263,7 +263,7 @@ public:
// Constructor and destructor // Constructor and destructor
WinEDA_LookFrame(WinEDA_BasePcbFrame *parent,const wxPoint& pos); WinEDA_LookFrame(WinEDA_BasePcbFrame *parent,const wxPoint& pos);
~WinEDA_LookFrame(void) {}; ~WinEDA_LookFrame() {};
void AcceptPcbOptions(wxCommandEvent& event); void AcceptPcbOptions(wxCommandEvent& event);
void OnQuit(wxCommandEvent & event); void OnQuit(wxCommandEvent & event);
......
...@@ -94,7 +94,7 @@ void WinEDA_PcbFrame::StartMoveTextePcb(TEXTE_PCB * TextePcb, wxDC * DC) ...@@ -94,7 +94,7 @@ void WinEDA_PcbFrame::StartMoveTextePcb(TEXTE_PCB * TextePcb, wxDC * DC)
} }
/*****************************/ /*****************************/
/* void Move_Texte_Pcb(void) */ /* void Move_Texte_Pcb() */
/*****************************/ /*****************************/
/* Routine deplacant le texte PCB suivant le curseur de la souris */ /* Routine deplacant le texte PCB suivant le curseur de la souris */
......
...@@ -75,7 +75,7 @@ wxString FullFileName; ...@@ -75,7 +75,7 @@ wxString FullFileName;
/*****************************************************/ /*****************************************************/
bool Read_Config(void) bool Read_Config()
/*****************************************************/ /*****************************************************/
/* lit la configuration, si elle n'a pas deja etee lue /* lit la configuration, si elle n'a pas deja etee lue
1 - lit gerbview.cnf 1 - lit gerbview.cnf
...@@ -100,7 +100,7 @@ bool Read_Config(void) ...@@ -100,7 +100,7 @@ bool Read_Config(void)
/******************************************/ /******************************************/
void WinEDA_GerberFrame::Update_config(void) void WinEDA_GerberFrame::Update_config()
/******************************************/ /******************************************/
/* /*
creation du fichier de config creation du fichier de config
......
...@@ -14,7 +14,7 @@ BOARD_ITEM* SaveItemEfface( BOARD_ITEM* PtItem, int nbitems ); ...@@ -14,7 +14,7 @@ BOARD_ITEM* SaveItemEfface( BOARD_ITEM* PtItem, int nbitems );
/***********************/ /***********************/
/* gerbview_config.cpp */ /* gerbview_config.cpp */
/***********************/ /***********************/
bool Read_Config(void); bool Read_Config();
bool Read_Hotkey_Config( WinEDA_DrawFrame * frame, bool verbose ); bool Read_Hotkey_Config( WinEDA_DrawFrame * frame, bool verbose );
...@@ -69,8 +69,8 @@ void trace_1_contour_GERBER(int cX,int cY, int dimX,int dimY, ...@@ -69,8 +69,8 @@ void trace_1_contour_GERBER(int cX,int cY, int dimX,int dimY,
ses variations deltaX et deltaY et son orientation orient */ ses variations deltaX et deltaY et son orientation orient */
/* PLOTHPGL.CC */ /* PLOTHPGL.CC */
void Init_Trace_HPGL(void); void Init_Trace_HPGL();
void Fin_Trace_HPGL(void); void Fin_Trace_HPGL();
void trace_1_segment_HPGL(int pos_X0,int pos_Y0,int pos_X1,int pos_Y1, void trace_1_segment_HPGL(int pos_X0,int pos_Y0,int pos_X1,int pos_Y1,
int hauteur); int hauteur);
......
...@@ -50,7 +50,7 @@ private: ...@@ -50,7 +50,7 @@ private:
// Constructor and destructor // Constructor and destructor
public: public:
WinEDA_ConfigFrame(WinEDA_GerberFrame *parent,const wxPoint& pos); WinEDA_ConfigFrame(WinEDA_GerberFrame *parent,const wxPoint& pos);
~WinEDA_ConfigFrame(void) {}; ~WinEDA_ConfigFrame() {};
private: private:
void SaveCfg(wxCommandEvent & event); void SaveCfg(wxCommandEvent & event);
......
...@@ -37,7 +37,7 @@ public: ...@@ -37,7 +37,7 @@ public:
// Constructor and destructor // Constructor and destructor
WinEDA_SwapLayerFrame(WinEDA_GerberFrame *parent); WinEDA_SwapLayerFrame(WinEDA_GerberFrame *parent);
~WinEDA_SwapLayerFrame(void) {}; ~WinEDA_SwapLayerFrame() {};
private: private:
void Sel_Layer(wxCommandEvent& event); void Sel_Layer(wxCommandEvent& event);
......
...@@ -61,7 +61,7 @@ public: ...@@ -61,7 +61,7 @@ public:
// Constructor and destructor // Constructor and destructor
WinEDA_SetColorsFrame(WinEDA_DrawFrame *parent, const wxPoint& framepos); WinEDA_SetColorsFrame(WinEDA_DrawFrame *parent, const wxPoint& framepos);
~WinEDA_SetColorsFrame(void) {}; ~WinEDA_SetColorsFrame() {};
private: private:
void SetColor(wxCommandEvent& event); void SetColor(wxCommandEvent& event);
......
This diff is collapsed.
/********************/ /********************/
/* includes systeme */ /* includes systeme */
/********************/ /********************/
#ifndef FCTSYS_H #ifndef FCTSYS_H
#define FCTSYS_H #define FCTSYS_H
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
#ifdef __FreeBSD__ #ifdef __FreeBSD__
#include <stdlib.h> #include <stdlib.h>
#else #else
# ifndef __DARWIN__ #ifndef __DARWIN__
# include <malloc.h> // MacOSX (DARWIN): malloc() and free() are in stdlib.h #include <malloc.h> // MacOSX (DARWIN): malloc() and free() are in stdlib.h
#endif #endif
#endif #endif
#include <time.h> #include <time.h>
...@@ -38,43 +38,41 @@ ...@@ -38,43 +38,41 @@
#define M_PI 3.141592653 #define M_PI 3.141592653
#endif #endif
#define PCB_INTERNAL_UNIT 10000 // PCBNEW internal unit = 1/10000 inch #define PCB_INTERNAL_UNIT 10000 // PCBNEW internal unit = 1/10000 inch
#define EESCHEMA_INTERNAL_UNIT 1000 // EESCHEMA internal unit = 1/1000 inch #define EESCHEMA_INTERNAL_UNIT 1000 // EESCHEMA internal unit = 1/1000 inch
#include "wxstruct.h" #include "wxstruct.h"
#include "gr_basic.h" #include "gr_basic.h"
// Old wxWidget compatibility (prior to wxWidget 2.7): // Old wxWidget compatibility (prior to wxWidget 2.7):
#if ( (wxMAJOR_VERSION < 2) || ((wxMAJOR_VERSION == 2)&& (wxMINOR_VERSION < 7)) ) #if ( ( wxMAJOR_VERSION < 2) || ( ( wxMAJOR_VERSION == 2)&& (wxMINOR_VERSION < 7 ) ) )
#define wxFD_OPEN wxOPEN #define wxFD_OPEN wxOPEN
#define wxFD_SAVE wxSAVE #define wxFD_SAVE wxSAVE
#define wxFD_OVERWRITE_PROMPT wxOVERWRITE_PROMPT #define wxFD_OVERWRITE_PROMPT wxOVERWRITE_PROMPT
#define WXK_PAGEUP WXK_PRIOR #define WXK_PAGEUP WXK_PRIOR
#define WXK_PAGEDOWN WXK_NEXT #define WXK_PAGEDOWN WXK_NEXT
#endif #endif
#ifdef __UNIX__ #ifdef __UNIX__
#define stricmp strcasecmp #define stricmp strcasecmp
#define strnicmp strncasecmp #define strnicmp strncasecmp
#endif #endif
#ifdef __WINDOWS__ #ifdef __WINDOWS__
#define DIR_SEP '\\' #define DIR_SEP '\\'
#define STRING_DIR_SEP wxT("\\") #define STRING_DIR_SEP wxT( "\\" )
#else #else
#define DIR_SEP '/' #define DIR_SEP '/'
#define STRING_DIR_SEP wxT("/") #define STRING_DIR_SEP wxT( "/" )
#endif #endif
#define UNIX_STRING_DIR_SEP wxT("/") #define UNIX_STRING_DIR_SEP wxT( "/" )
#define WIN_STRING_DIR_SEP wxT("\\") #define WIN_STRING_DIR_SEP wxT( "\\" )
#ifndef TRUE #ifndef TRUE
#define TRUE ((bool)1) #define TRUE ((bool)1)
#define FALSE ((bool)0) #define FALSE ((bool)0)
#endif #endif
#endif /* FCTSYS_H */ #endif /* FCTSYS_H */
...@@ -125,8 +125,8 @@ void GRSFillCSegm(EDA_Rect * ClipBox, wxDC * DC, ...@@ -125,8 +125,8 @@ void GRSFillCSegm(EDA_Rect * ClipBox, wxDC * DC,
int x1, int y1, int x2, int y2, int width, int Color); int x1, int y1, int x2, int y2, int width, int Color);
void GRSetColor(int Color); void GRSetColor(int Color);
void GRSetDefaultPalette(void); void GRSetDefaultPalette();
int GRGetColor(void); int GRGetColor();
void GRPutPixel(EDA_Rect * ClipBox, wxDC * DC, int x, int y, int color); void GRPutPixel(EDA_Rect * ClipBox, wxDC * DC, int x, int y, int color);
void GRSPutPixel(EDA_Rect * ClipBox, wxDC * DC, int x, int y, int color); void GRSPutPixel(EDA_Rect * ClipBox, wxDC * DC, int x, int y, int color);
int GRGetPixel(wxDC * DC, int x, int y); int GRGetPixel(wxDC * DC, int x, int y);
......
...@@ -33,7 +33,7 @@ void UserToDeviceCoordinate(wxPoint & pos ); ...@@ -33,7 +33,7 @@ void UserToDeviceCoordinate(wxPoint & pos );
// modifie les coord pos.x et pos.y pour le trace selon l'orientation, l'echelle, les offsets de trace // modifie les coord pos.x et pos.y pour le trace selon l'orientation, l'echelle, les offsets de trace
void UserToDeviceSize(wxSize & size ); void UserToDeviceSize(wxSize & size );
// modifie les dimension size.x et size.y pour le trace selon l'echelle // modifie les dimension size.x et size.y pour le trace selon l'echelle
void ForcePenReinit(void); void ForcePenReinit();
// set the flag g_CurrentPenWidth to -1 in order // set the flag g_CurrentPenWidth to -1 in order
// to force a pen width redefinition for the next draw command // to force a pen width redefinition for the next draw command
......
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