Coding policy fixes.

3d-viewer/3d_toolbar.cpp

@@ -19,7 +19,7 @@ void WinEDA3D_DrawFrame::ReCreateHToolbar()
     }
 
 
-    m_HToolBar = new WinEDA_Toolbar( TOOLBAR_MAIN, this, ID_H_TOOLBAR, TRUE );
+    m_HToolBar = new EDA_TOOLBAR( TOOLBAR_MAIN, this, ID_H_TOOLBAR, TRUE );
 
     // Set up toolbar
     m_HToolBar->AddTool( ID_RELOAD3D_BOARD, wxEmptyString,

3d-viewer/3d_viewer.h

@@ -208,8 +208,8 @@ private:
     wxString        m_FrameName;       // name used for writing and reading setup
                                        // It is "Frame3D"
     Pcb3D_GLCanvas* m_Canvas;
-    WinEDA_Toolbar*      m_HToolBar;
-    WinEDA_Toolbar*      m_VToolBar;
+    EDA_TOOLBAR*    m_HToolBar;
+    EDA_TOOLBAR*    m_VToolBar;
     int             m_InternalUnits;
     wxPoint         m_FramePos;
     wxSize          m_FrameSize;

common/class_layer_box_selector.cpp

@@ -20,11 +20,10 @@
  *
  */
 
-LAYER_BOX_SELECTOR::LAYER_BOX_SELECTOR( WinEDA_Toolbar* parent, wxWindowID id,
+LAYER_BOX_SELECTOR::LAYER_BOX_SELECTOR( EDA_TOOLBAR* parent, wxWindowID id,
                                         const wxPoint& pos, const wxSize& size,
                                         int n, const wxString choices[] ) :
-    wxBitmapComboBox( parent, id, wxEmptyString, pos, size,
-                      n, choices, wxCB_READONLY )
+    wxBitmapComboBox( parent, id, wxEmptyString, pos, size, n, choices, wxCB_READONLY )
 {
     m_layerorder   = true;
     m_layerhotkeys = true;
@@ -35,11 +34,10 @@ LAYER_BOX_SELECTOR::LAYER_BOX_SELECTOR( WinEDA_Toolbar* parent, wxWindowID id,
 }
 
 
-LAYER_BOX_SELECTOR::LAYER_BOX_SELECTOR( WinEDA_Toolbar* parent, wxWindowID id,
+LAYER_BOX_SELECTOR::LAYER_BOX_SELECTOR( EDA_TOOLBAR* parent, wxWindowID id,
                                         const wxPoint& pos, const wxSize& size,
                                         const wxArrayString& choices ) :
-    wxBitmapComboBox( parent, id, wxEmptyString, pos, size,
-                      choices, wxCB_READONLY )
+    wxBitmapComboBox( parent, id, wxEmptyString, pos, size, choices, wxCB_READONLY )
 {
     m_layerorder   = true;
     m_layerhotkeys = true;

common/wineda_toolbar.cpp

@@ -10,8 +10,7 @@
 #include "wxstruct.h"
 
 
-WinEDA_Toolbar::WinEDA_Toolbar( id_toolbar type, wxWindow * parent,
-                                wxWindowID id, bool horizontal ):
+EDA_TOOLBAR::EDA_TOOLBAR( id_toolbar type, wxWindow * parent, wxWindowID id, bool horizontal ):
     wxAuiToolBar( parent, id, wxDefaultPosition, wxDefaultSize,
                   wxAUI_TB_DEFAULT_STYLE | ( ( horizontal ) ?
                                              wxAUI_TB_HORZ_LAYOUT :
@@ -28,7 +27,7 @@ WinEDA_Toolbar::WinEDA_Toolbar( id_toolbar type, wxWindow * parent,
 }
 
 
-int WinEDA_Toolbar::GetDimension( )
+int EDA_TOOLBAR::GetDimension( )
 {
     if( m_Horizontal )
         return GetSize().y;

cvpcb/class_DisplayFootprintsFrame.cpp

@@ -158,7 +158,7 @@ void DISPLAY_FOOTPRINTS_FRAME::ReCreateOptToolbar()
         return;
 
     // Create options tool bar.
-    m_OptionsToolBar = new WinEDA_Toolbar( TOOLBAR_OPTION, this, ID_OPT_TOOLBAR, false );
+    m_OptionsToolBar = new EDA_TOOLBAR( TOOLBAR_OPTION, this, ID_OPT_TOOLBAR, false );
 
     m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_GRID, wxEmptyString, wxBitmap( grid_xpm ),
                                _( "Hide grid" ), wxITEM_CHECK );
@@ -201,7 +201,7 @@ void DISPLAY_FOOTPRINTS_FRAME::ReCreateHToolbar()
     if( m_HToolBar != NULL )
         return;
 
-    m_HToolBar = new WinEDA_Toolbar( TOOLBAR_MAIN, this, ID_H_TOOLBAR, true );
+    m_HToolBar = new EDA_TOOLBAR( TOOLBAR_MAIN, this, ID_H_TOOLBAR, true );
 
     m_HToolBar->AddTool( ID_OPTIONS_SETUP, wxEmptyString, wxBitmap( display_options_xpm ),
                          _( "Display options" ) );

cvpcb/cvpcb_mainframe.h

@@ -29,7 +29,7 @@ public:
     FOOTPRINTS_LISTBOX*  m_FootprintList;
     COMPONENTS_LISTBOX*  m_ListCmp;
     DISPLAY_FOOTPRINTS_FRAME* DrawFrame;
-    WinEDA_Toolbar*      m_HToolBar;
+    EDA_TOOLBAR*         m_HToolBar;
     wxFileName           m_NetlistFileName;
     wxArrayString        m_ModuleLibNames;
     wxArrayString        m_AliasLibNames;

cvpcb/tool_cvpcb.cpp

@@ -19,7 +19,7 @@ void CVPCB_MAINFRAME::ReCreateHToolbar()
     if( m_HToolBar != NULL )
         return;
 
-    m_HToolBar = new WinEDA_Toolbar( TOOLBAR_MAIN, this, ID_H_TOOLBAR, TRUE );
+    m_HToolBar = new EDA_TOOLBAR( TOOLBAR_MAIN, this, ID_H_TOOLBAR, TRUE );
 
     m_HToolBar->AddTool( ID_CVPCB_READ_INPUT_NETLIST, wxEmptyString,
                         wxBitmap( open_document_xpm ),

eeschema/tool_lib.cpp

@@ -32,7 +32,7 @@ void LIB_EDIT_FRAME::ReCreateVToolbar()
     if( m_VToolBar != NULL )
         return;
 
-    m_VToolBar = new WinEDA_Toolbar( TOOLBAR_TOOL, this, ID_V_TOOLBAR, false );
+    m_VToolBar = new EDA_TOOLBAR( TOOLBAR_TOOL, this, ID_V_TOOLBAR, false );
 
     // Set up toolbar
     m_VToolBar->AddTool( ID_NO_TOOL_SELECTED, wxEmptyString, wxBitmap( cursor_xpm ),
@@ -80,7 +80,7 @@ void LIB_EDIT_FRAME::ReCreateHToolbar()
     if( m_HToolBar != NULL )
         return;
 
-    m_HToolBar = new WinEDA_Toolbar( TOOLBAR_MAIN, this, ID_H_TOOLBAR, true );
+    m_HToolBar = new EDA_TOOLBAR( TOOLBAR_MAIN, this, ID_H_TOOLBAR, true );
 
     // Set up toolbar
     m_HToolBar->AddTool( ID_LIBEDIT_SAVE_CURRENT_LIB, wxEmptyString, wxBitmap( save_library_xpm ),
@@ -187,7 +187,7 @@ void LIB_EDIT_FRAME::CreateOptionToolbar()
     if( m_OptionsToolBar )
         return;
 
-    m_OptionsToolBar = new WinEDA_Toolbar( TOOLBAR_OPTION, this, ID_OPT_TOOLBAR, false );
+    m_OptionsToolBar = new EDA_TOOLBAR( TOOLBAR_OPTION, this, ID_OPT_TOOLBAR, false );
 
     m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_GRID, wxEmptyString, wxBitmap( grid_xpm ),
                                _( "Turn grid off" ), wxITEM_CHECK );

eeschema/tool_sch.cpp

@@ -25,7 +25,7 @@ void SCH_EDIT_FRAME::ReCreateHToolbar()
         return;
 
     wxString msg;
-    m_HToolBar = new WinEDA_Toolbar( TOOLBAR_MAIN, this, ID_H_TOOLBAR, TRUE );
+    m_HToolBar = new EDA_TOOLBAR( TOOLBAR_MAIN, this, ID_H_TOOLBAR, TRUE );
 
     // Set up toolbar
     m_HToolBar->AddTool( ID_NEW_PROJECT, wxEmptyString, wxBitmap( new_xpm ),
@@ -126,7 +126,7 @@ void SCH_EDIT_FRAME::ReCreateVToolbar()
     if( m_VToolBar )
         return;
 
-    m_VToolBar = new WinEDA_Toolbar( TOOLBAR_TOOL, this, ID_V_TOOLBAR, false );
+    m_VToolBar = new EDA_TOOLBAR( TOOLBAR_TOOL, this, ID_V_TOOLBAR, false );
 
     // Set up toolbar
     m_VToolBar->AddTool( ID_NO_TOOL_SELECTED, wxEmptyString, wxBitmap( cursor_xpm ),
@@ -202,7 +202,7 @@ void SCH_EDIT_FRAME::ReCreateOptToolbar()
     if( m_OptionsToolBar )
         return;
 
-    m_OptionsToolBar = new WinEDA_Toolbar( TOOLBAR_OPTION, this, ID_OPT_TOOLBAR, false );
+    m_OptionsToolBar = new EDA_TOOLBAR( TOOLBAR_OPTION, this, ID_OPT_TOOLBAR, false );
 
     m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_GRID, wxEmptyString,
                                wxBitmap( grid_xpm ),

eeschema/tool_viewlib.cpp

@@ -28,7 +28,7 @@ void LIB_VIEW_FRAME::ReCreateHToolbar()
 
     if( m_HToolBar  == NULL )
     {
-        m_HToolBar = new WinEDA_Toolbar( TOOLBAR_MAIN, this, ID_H_TOOLBAR, true );
+        m_HToolBar = new EDA_TOOLBAR( TOOLBAR_MAIN, this, ID_H_TOOLBAR, true );
 
         // Set up toolbar
         m_HToolBar->AddTool( ID_LIBVIEW_SELECT_LIB, wxEmptyString,

gerbview/class_DCodeSelectionbox.cpp

@@ -15,7 +15,7 @@
 /* Helper class for displaying DCodes list */
 /*******************************************/
 
-DCODE_SELECTION_BOX::DCODE_SELECTION_BOX( WinEDA_Toolbar* aParent, wxWindowID aId,
+DCODE_SELECTION_BOX::DCODE_SELECTION_BOX( EDA_TOOLBAR* aParent, wxWindowID aId,
                                           const wxPoint& aLocation, const wxSize& aSize,
                                           const wxArrayString& aChoices  ) :
     wxComboBox( aParent, aId, wxEmptyString, aLocation, aSize, 0, NULL, wxCB_READONLY )

gerbview/class_DCodeSelectionbox.h

@@ -14,7 +14,7 @@ class DCODE_SELECTION_BOX : public wxComboBox
 private:
     const wxArrayString* m_dcodeList;
 
-public: DCODE_SELECTION_BOX( WinEDA_Toolbar* aParent, wxWindowID aId,
+public: DCODE_SELECTION_BOX( EDA_TOOLBAR* aParent, wxWindowID aId,
                              const wxPoint& aLocation, const wxSize& aSize,
                              const wxArrayString& aChoices);
         ~DCODE_SELECTION_BOX();

gerbview/toolbars_gerber.cpp

@@ -31,7 +31,7 @@ void GERBVIEW_FRAME::ReCreateHToolbar( void )
         gerber = g_GERBER_List[layer];
     }
 
-    m_HToolBar = new WinEDA_Toolbar( TOOLBAR_MAIN, this, ID_H_TOOLBAR, TRUE );
+    m_HToolBar = new EDA_TOOLBAR( TOOLBAR_MAIN, this, ID_H_TOOLBAR, TRUE );
 
     // Set up toolbar
     m_HToolBar->AddTool( ID_GERBVIEW_ERASE_ALL, wxEmptyString, wxBitmap( gerbview_clear_layers_xpm ),
@@ -109,7 +109,7 @@ void GERBVIEW_FRAME::ReCreateVToolbar( void )
     if( m_VToolBar )
         return;
 
-    m_VToolBar = new WinEDA_Toolbar( TOOLBAR_TOOL, this, ID_V_TOOLBAR, FALSE );
+    m_VToolBar = new EDA_TOOLBAR( TOOLBAR_TOOL, this, ID_V_TOOLBAR, FALSE );
 
     // Set up toolbar
     m_VToolBar->AddTool( ID_NO_TOOL_SELECTED, wxEmptyString, wxBitmap( cursor_xpm ) );
@@ -128,7 +128,7 @@ void GERBVIEW_FRAME::ReCreateOptToolbar( void )
         return;
 
     // creation of tool bar options
-    m_OptionsToolBar = new WinEDA_Toolbar( TOOLBAR_OPTION, this, ID_OPT_TOOLBAR, FALSE );
+    m_OptionsToolBar = new EDA_TOOLBAR( TOOLBAR_OPTION, this, ID_OPT_TOOLBAR, FALSE );
 
     m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_GRID, wxEmptyString, wxBitmap( grid_xpm ),
                                _( "Turn grid off" ), wxITEM_CHECK );

include/class_layer_box_selector.h

@@ -14,12 +14,12 @@ private:
     bool m_layerhotkeys;
     bool m_layerorder;
 public:
-    LAYER_BOX_SELECTOR( WinEDA_Toolbar* parent, wxWindowID id,
+    LAYER_BOX_SELECTOR( EDA_TOOLBAR* parent, wxWindowID id,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         int n = 0, const wxString choices[] = NULL );
 
-    LAYER_BOX_SELECTOR( WinEDA_Toolbar* parent, wxWindowID id,
+    LAYER_BOX_SELECTOR( EDA_TOOLBAR* parent, wxWindowID id,
                         const wxPoint& pos, const wxSize& size,
                         const wxArrayString& choices );
 

include/wxBasePcbFrame.h

@@ -20,7 +20,6 @@
 
 
 /*  Forward declarations of classes. */
-class WinEDA_Toolbar;
 class WinEDA_CvpcbFrame;
 class PCB_EDIT_FRAME;
 class WinEDA_ModuleEditFrame;

include/wxPcbStruct.h

@@ -19,7 +19,6 @@
 
 /*  Forward declarations of classes. */
 class PCB_SCREEN;
-class WinEDA_Toolbar;
 class WinEDA_ModuleEditFrame;
 class BOARD;
 class TEXTE_PCB;
@@ -332,7 +331,7 @@ public:
     void             ReCreateMicrowaveVToolbar();
     void             ReCreateOptToolbar();
     void             ReCreateMenuBar();
-    LAYER_BOX_SELECTOR* ReCreateLayerBox( WinEDA_Toolbar* parent );
+    LAYER_BOX_SELECTOR* ReCreateLayerBox( EDA_TOOLBAR* parent );
 
     /** Virtual Function OnModify()
      * Must be called after a board change

include/wxstruct.h

@@ -29,8 +29,7 @@
 #endif
 
 //  Option for dialog boxes
-#define DIALOG_STYLE wxDEFAULT_DIALOG_STYLE | wxFRAME_FLOAT_ON_PARENT | \
-    MAYBE_RESIZE_BORDER
+#define DIALOG_STYLE wxDEFAULT_DIALOG_STYLE | wxFRAME_FLOAT_ON_PARENT | MAYBE_RESIZE_BORDER
 
 #define KICAD_DEFAULT_DRAWFRAME_STYLE wxDEFAULT_FRAME_STYLE | wxWANTS_CHARS
 
@@ -39,7 +38,7 @@ class EDA_RECT;
 class EDA_DRAW_PANEL;
 class EDA_MSG_PANEL;
 class BASE_SCREEN;
-class WinEDA_Toolbar;
+class EDA_TOOLBAR;
 class WinEDAChoiceBox;
 class PARAM_CFG_BASE;
 class Ki_PageDescr;
@@ -94,7 +93,7 @@ public:
     wxSize       m_FrameSize;
     int          m_MsgFrameHeight;
 
-    WinEDA_Toolbar* m_HToolBar;     // Standard horizontal Toolbar
+    EDA_TOOLBAR* m_HToolBar;     // Standard horizontal Toolbar
     bool         m_FrameIsActive;
     wxString     m_FrameName;    // name used for writing and reading setup
                                     // It is "SchematicFrame", "PcbFrame" ....
@@ -229,11 +228,11 @@ public:
     EDA_DRAW_PANEL*   DrawPanel;            // Draw area
     EDA_MSG_PANEL*    MsgPanel;             // Panel used to display some
                                             //  info (bottom of the screen)
-    WinEDA_Toolbar*   m_VToolBar;           // Vertical (right side) Toolbar
-    WinEDA_Toolbar*   m_AuxVToolBar;        // Auxiliary Vertical (right side)
+    EDA_TOOLBAR*      m_VToolBar;           // Vertical (right side) Toolbar
+    EDA_TOOLBAR*      m_AuxVToolBar;        // Auxiliary Vertical (right side)
                                             // Toolbar
-    WinEDA_Toolbar*   m_OptionsToolBar;     // Options Toolbar (left side)
-    WinEDA_Toolbar*   m_AuxiliaryToolBar;   // Auxiliary Toolbar used in pcbnew
+    EDA_TOOLBAR*      m_OptionsToolBar;     // Options Toolbar (left side)
+    EDA_TOOLBAR*      m_AuxiliaryToolBar;   // Auxiliary Toolbar used in pcbnew
 
     WinEDAChoiceBox*  m_SelGridBox;         // Choice box to choose the grid
                                             // size
@@ -671,7 +670,6 @@ public:
     EDA_MSG_PANEL( EDA_DRAW_FRAME* parent, int id, const wxPoint& pos, const wxSize& size );
     ~EDA_MSG_PANEL();
 
-
     /**
      * Function GetRequiredHeight
      * returns the required height (in pixels) of a EDA_MSG_PANEL.  This takes
@@ -714,11 +712,12 @@ public:
     DECLARE_EVENT_TABLE()
 };
 
-/*************************/
-/* class WinEDA_Toolbar */
-/*************************/
 
-class WinEDA_Toolbar : public wxAuiToolBar
+/*********************/
+/* class EDA_TOOLBAR */
+/*********************/
+
+class EDA_TOOLBAR : public wxAuiToolBar
 {
 public:
     wxWindow*       m_Parent;
@@ -726,7 +725,7 @@ public:
     bool            m_Horizontal;       // some auxiliary TB are horizontal, others vertical
 
 public:
-    WinEDA_Toolbar( id_toolbar type, wxWindow* parent, wxWindowID id, bool horizontal );
+    EDA_TOOLBAR( id_toolbar type, wxWindow* parent, wxWindowID id, bool horizontal );
 
     bool GetToolState( int toolId ) { return GetToolToggled(toolId); };
 

kicad/kicad.h

@@ -62,7 +62,7 @@ class WinEDA_MainFrame : public EDA_BASE_FRAME
 public:
     TREE_PROJECT_FRAME* m_LeftWin;
     RIGHT_KM_FRAME*     m_RightWin;
-    WinEDA_Toolbar*     m_VToolBar;  // Vertical toolbar (not used)
+    EDA_TOOLBAR*        m_VToolBar;  // Vertical toolbar (not used)
     wxString            m_BoardFileName;
     wxString            m_SchematicRootFileName;
     wxFileName          m_ProjectFileName;

kicad/menubar.cpp

@@ -11,56 +11,48 @@
 
 /* Menubar and toolbar event table */
 BEGIN_EVENT_TABLE( WinEDA_MainFrame, EDA_BASE_FRAME )
-/* Window events */
-EVT_SIZE( WinEDA_MainFrame::OnSize )
-EVT_CLOSE( WinEDA_MainFrame::OnCloseWindow )
-
-/* Sash drag events */
-EVT_SASH_DRAGGED( ID_LEFT_FRAME, WinEDA_MainFrame::OnSashDrag )
-
-/* Toolbar events */
-EVT_TOOL( ID_NEW_PROJECT, WinEDA_MainFrame::OnLoadProject )
-EVT_TOOL( ID_LOAD_PROJECT, WinEDA_MainFrame::OnLoadProject )
-EVT_TOOL( ID_SAVE_PROJECT, WinEDA_MainFrame::OnSaveProject )
-EVT_TOOL( ID_SAVE_AND_ZIP_FILES, WinEDA_MainFrame::OnArchiveFiles )
-
-/* Menu events */
-EVT_MENU( ID_SAVE_PROJECT, WinEDA_MainFrame::OnSaveProject )
-EVT_MENU( wxID_EXIT, WinEDA_MainFrame::OnExit )
-EVT_MENU( ID_TO_EDITOR, WinEDA_MainFrame::OnOpenTextEditor )
-EVT_MENU( ID_BROWSE_AN_SELECT_FILE,
-          WinEDA_MainFrame::OnOpenFileInTextEditor )
-EVT_MENU( ID_SELECT_PREFERED_EDITOR,
-          EDA_BASE_FRAME::OnSelectPreferredEditor )
-EVT_MENU( ID_SELECT_DEFAULT_PDF_BROWSER,
-          WinEDA_MainFrame::OnSelectDefaultPdfBrowser )
-EVT_MENU( ID_SELECT_PREFERED_PDF_BROWSER,
-          WinEDA_MainFrame::OnSelectPreferredPdfBrowser )
-EVT_MENU( ID_SELECT_PREFERED_PDF_BROWSER_NAME,
-          WinEDA_MainFrame::OnSelectPreferredPdfBrowser )
-EVT_MENU( ID_SAVE_AND_ZIP_FILES, WinEDA_MainFrame::OnArchiveFiles )
-EVT_MENU( ID_READ_ZIP_ARCHIVE, WinEDA_MainFrame::OnUnarchiveFiles )
-EVT_MENU( ID_PROJECT_TREE_REFRESH, WinEDA_MainFrame::OnRefresh )
-EVT_MENU( ID_GENERAL_HELP, WinEDA_MainFrame::GetKicadHelp )
-EVT_MENU( wxID_ABOUT, WinEDA_MainFrame::GetKicadAbout )
-
-/* Range menu events */
-EVT_MENU_RANGE( ID_LANGUAGE_CHOICE, ID_LANGUAGE_CHOICE_END,
-                WinEDA_MainFrame::SetLanguage )
-
-EVT_MENU_RANGE( wxID_FILE1, wxID_FILE9, WinEDA_MainFrame::OnFileHistory )
-
-/* Button events */
-EVT_BUTTON( ID_TO_PCB, WinEDA_MainFrame::OnRunPcbNew )
-EVT_BUTTON( ID_TO_CVPCB, WinEDA_MainFrame::OnRunCvpcb )
-EVT_BUTTON( ID_TO_EESCHEMA, WinEDA_MainFrame::OnRunEeschema )
-EVT_BUTTON( ID_TO_GERBVIEW, WinEDA_MainFrame::OnRunGerbview )
-EVT_BUTTON( ID_TO_BITMAP_CONVERTER, WinEDA_MainFrame::OnRunBitmapConverter )
-
-EVT_UPDATE_UI( ID_SELECT_DEFAULT_PDF_BROWSER,
-               WinEDA_MainFrame::OnUpdateDefaultPdfBrowser )
-EVT_UPDATE_UI( ID_SELECT_PREFERED_PDF_BROWSER,
-               WinEDA_MainFrame::OnUpdatePreferredPdfBrowser )
+    /* Window events */
+    EVT_SIZE( WinEDA_MainFrame::OnSize )
+    EVT_CLOSE( WinEDA_MainFrame::OnCloseWindow )
+
+    /* Sash drag events */
+    EVT_SASH_DRAGGED( ID_LEFT_FRAME, WinEDA_MainFrame::OnSashDrag )
+
+    /* Toolbar events */
+    EVT_TOOL( ID_NEW_PROJECT, WinEDA_MainFrame::OnLoadProject )
+    EVT_TOOL( ID_LOAD_PROJECT, WinEDA_MainFrame::OnLoadProject )
+    EVT_TOOL( ID_SAVE_PROJECT, WinEDA_MainFrame::OnSaveProject )
+    EVT_TOOL( ID_SAVE_AND_ZIP_FILES, WinEDA_MainFrame::OnArchiveFiles )
+
+    /* Menu events */
+    EVT_MENU( ID_SAVE_PROJECT, WinEDA_MainFrame::OnSaveProject )
+    EVT_MENU( wxID_EXIT, WinEDA_MainFrame::OnExit )
+    EVT_MENU( ID_TO_EDITOR, WinEDA_MainFrame::OnOpenTextEditor )
+    EVT_MENU( ID_BROWSE_AN_SELECT_FILE, WinEDA_MainFrame::OnOpenFileInTextEditor )
+    EVT_MENU( ID_SELECT_PREFERED_EDITOR, EDA_BASE_FRAME::OnSelectPreferredEditor )
+    EVT_MENU( ID_SELECT_DEFAULT_PDF_BROWSER, WinEDA_MainFrame::OnSelectDefaultPdfBrowser )
+    EVT_MENU( ID_SELECT_PREFERED_PDF_BROWSER, WinEDA_MainFrame::OnSelectPreferredPdfBrowser )
+    EVT_MENU( ID_SELECT_PREFERED_PDF_BROWSER_NAME, WinEDA_MainFrame::OnSelectPreferredPdfBrowser )
+    EVT_MENU( ID_SAVE_AND_ZIP_FILES, WinEDA_MainFrame::OnArchiveFiles )
+    EVT_MENU( ID_READ_ZIP_ARCHIVE, WinEDA_MainFrame::OnUnarchiveFiles )
+    EVT_MENU( ID_PROJECT_TREE_REFRESH, WinEDA_MainFrame::OnRefresh )
+    EVT_MENU( ID_GENERAL_HELP, WinEDA_MainFrame::GetKicadHelp )
+    EVT_MENU( wxID_ABOUT, WinEDA_MainFrame::GetKicadAbout )
+
+    /* Range menu events */
+    EVT_MENU_RANGE( ID_LANGUAGE_CHOICE, ID_LANGUAGE_CHOICE_END, WinEDA_MainFrame::SetLanguage )
+
+    EVT_MENU_RANGE( wxID_FILE1, wxID_FILE9, WinEDA_MainFrame::OnFileHistory )
+
+    /* Button events */
+    EVT_BUTTON( ID_TO_PCB, WinEDA_MainFrame::OnRunPcbNew )
+    EVT_BUTTON( ID_TO_CVPCB, WinEDA_MainFrame::OnRunCvpcb )
+    EVT_BUTTON( ID_TO_EESCHEMA, WinEDA_MainFrame::OnRunEeschema )
+    EVT_BUTTON( ID_TO_GERBVIEW, WinEDA_MainFrame::OnRunGerbview )
+    EVT_BUTTON( ID_TO_BITMAP_CONVERTER, WinEDA_MainFrame::OnRunBitmapConverter )
+
+    EVT_UPDATE_UI( ID_SELECT_DEFAULT_PDF_BROWSER, WinEDA_MainFrame::OnUpdateDefaultPdfBrowser )
+    EVT_UPDATE_UI( ID_SELECT_PREFERED_PDF_BROWSER, WinEDA_MainFrame::OnUpdatePreferredPdfBrowser )
 
 END_EVENT_TABLE()
 
@@ -266,7 +258,7 @@ void WinEDA_MainFrame::RecreateBaseHToolbar()
         return;
 
     // Allocate memory for m_HToolBar
-    m_HToolBar = new WinEDA_Toolbar( TOOLBAR_MAIN, this, ID_H_TOOLBAR, TRUE );
+    m_HToolBar = new EDA_TOOLBAR( TOOLBAR_MAIN, this, ID_H_TOOLBAR, TRUE );
 
     // New
     m_HToolBar->AddTool( ID_NEW_PROJECT, wxEmptyString,

pcbnew/tool_modedit.cpp

@@ -28,7 +28,7 @@ void WinEDA_ModuleEditFrame::ReCreateHToolbar()
 
     wxString msg;
 
-    m_HToolBar = new WinEDA_Toolbar( TOOLBAR_MAIN, this, ID_H_TOOLBAR, true );
+    m_HToolBar = new EDA_TOOLBAR( TOOLBAR_MAIN, this, ID_H_TOOLBAR, true );
 
     // Set up toolbar
     m_HToolBar->AddTool( ID_MODEDIT_SELECT_CURRENT_LIB, wxEmptyString,
@@ -122,7 +122,7 @@ void WinEDA_ModuleEditFrame::ReCreateVToolbar()
     if( m_VToolBar )
         return;
 
-    m_VToolBar = new WinEDA_Toolbar( TOOLBAR_TOOL, this, ID_V_TOOLBAR, false );
+    m_VToolBar = new EDA_TOOLBAR( TOOLBAR_TOOL, this, ID_V_TOOLBAR, false );
 
     // Set up toolbar
     m_VToolBar->AddTool( ID_NO_TOOL_SELECTED, wxEmptyString, wxBitmap( cursor_xpm ),
@@ -169,7 +169,7 @@ void WinEDA_ModuleEditFrame::ReCreateOptToolbar()
         return;
 
     // Create options tool bar.
-    m_OptionsToolBar = new WinEDA_Toolbar( TOOLBAR_OPTION, this, ID_OPT_TOOLBAR, false );
+    m_OptionsToolBar = new EDA_TOOLBAR( TOOLBAR_OPTION, this, ID_OPT_TOOLBAR, false );
     m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_GRID, wxEmptyString, wxBitmap( grid_xpm ),
                                _( "Hide grid" ), wxITEM_CHECK );
 
@@ -213,7 +213,7 @@ void WinEDA_ModuleEditFrame::ReCreateAuxiliaryToolbar()
     if( m_AuxiliaryToolBar )
         return;
 
-    m_AuxiliaryToolBar = new WinEDA_Toolbar( TOOLBAR_AUX, this, ID_AUX_TOOLBAR, true );
+    m_AuxiliaryToolBar = new EDA_TOOLBAR( TOOLBAR_AUX, this, ID_AUX_TOOLBAR, true );
 
     // Set up toolbar
     m_AuxiliaryToolBar->AddSeparator();

pcbnew/tool_pcb.cpp

@@ -187,7 +187,7 @@ void PCB_EDIT_FRAME::ReCreateHToolbar()
 
     wxWindowUpdateLocker dummy( this );
 
-    m_HToolBar = new WinEDA_Toolbar( TOOLBAR_MAIN, this, ID_H_TOOLBAR, true );
+    m_HToolBar = new EDA_TOOLBAR( TOOLBAR_MAIN, this, ID_H_TOOLBAR, true );
     m_HToolBar->SetRows( 1 );
 
     // Set up toolbar
@@ -293,7 +293,7 @@ void PCB_EDIT_FRAME::ReCreateOptToolbar()
 
     wxWindowUpdateLocker dummy( this );
 
-    m_OptionsToolBar = new WinEDA_Toolbar( TOOLBAR_OPTION, this, ID_OPT_TOOLBAR, false );
+    m_OptionsToolBar = new EDA_TOOLBAR( TOOLBAR_OPTION, this, ID_OPT_TOOLBAR, false );
 
     m_OptionsToolBar->AddTool( ID_TB_OPTIONS_DRC_OFF, wxEmptyString, wxBitmap( drc_off_xpm ),
                                _( "Enable design rule checking" ), wxITEM_CHECK );
@@ -385,7 +385,7 @@ void PCB_EDIT_FRAME::ReCreateVToolbar()
 
     wxWindowUpdateLocker dummy( this );
 
-    m_VToolBar = new WinEDA_Toolbar( TOOLBAR_TOOL, this, ID_V_TOOLBAR, false );
+    m_VToolBar = new EDA_TOOLBAR( TOOLBAR_TOOL, this, ID_V_TOOLBAR, false );
 
     // Set up toolbar
     m_VToolBar->AddTool( ID_NO_TOOL_SELECTED, wxEmptyString, wxBitmap( cursor_xpm ),
@@ -456,7 +456,7 @@ void PCB_EDIT_FRAME::ReCreateMicrowaveVToolbar()
 
     wxWindowUpdateLocker dummy(this);
 
-    m_AuxVToolBar = new WinEDA_Toolbar( TOOLBAR_TOOL, this, ID_MICROWAVE_V_TOOLBAR, false );
+    m_AuxVToolBar = new EDA_TOOLBAR( TOOLBAR_TOOL, this, ID_MICROWAVE_V_TOOLBAR, false );
 
     // Set up toolbar
     m_AuxVToolBar->AddTool( ID_PCB_MUWAVE_TOOL_SELF_CMD, wxEmptyString,
@@ -504,7 +504,7 @@ void PCB_EDIT_FRAME::ReCreateAuxiliaryToolbar()
     if( m_AuxiliaryToolBar )
         return;
 
-    m_AuxiliaryToolBar = new WinEDA_Toolbar( TOOLBAR_AUX, this, ID_AUX_TOOLBAR, true );
+    m_AuxiliaryToolBar = new EDA_TOOLBAR( TOOLBAR_AUX, this, ID_AUX_TOOLBAR, true );
 
     /* Set up toolbar items */
 
@@ -612,7 +612,7 @@ void PCB_EDIT_FRAME::updateViaSizeSelectBox()
 }
 
 
-LAYER_BOX_SELECTOR* PCB_EDIT_FRAME::ReCreateLayerBox( WinEDA_Toolbar* parent )
+LAYER_BOX_SELECTOR* PCB_EDIT_FRAME::ReCreateLayerBox( EDA_TOOLBAR* parent )
 {
     if( m_SelLayerBox == NULL )
         return NULL;