From 9b57038c756d5545898655f6961ef42ff22e5b1a Mon Sep 17 00:00:00 2001 From: charras Date: Wed, 3 Feb 2010 17:38:32 +0000 Subject: [PATCH] fix 2 minor problems --- gerbview/gerberframe.cpp | 2 ++ gerbview/options.cpp | 1 - gerbview/tool_gerber.cpp | 2 +- pcbnew/dialog_copper_zones.cpp | 13 ++++--------- pcbnew/dialog_copper_zones.h | 5 +++-- pcbnew/dialog_copper_zones_base.cpp | 1 - pcbnew/dialog_copper_zones_base.fbp | 2 +- pcbnew/dialog_copper_zones_base.h | 2 -- 8 files changed, 11 insertions(+), 17 deletions(-) diff --git a/gerbview/gerberframe.cpp b/gerbview/gerberframe.cpp index 76a81ef876..a2a7078237 100644 --- a/gerbview/gerberframe.cpp +++ b/gerbview/gerberframe.cpp @@ -111,6 +111,8 @@ BEGIN_EVENT_TABLE( WinEDA_GerberFrame, WinEDA_BasePcbFrame ) WinEDA_GerberFrame::OnSelectOptionToolbar ) EVT_TOOL( ID_TB_OPTIONS_SHOW_LAYERS_MANAGER_VERTICAL_TOOLBAR, WinEDA_GerberFrame::OnSelectOptionToolbar ) + EVT_TOOL( ID_TB_OPTIONS_SHOW_DCODES, + WinEDA_GerberFrame::OnSelectOptionToolbar ) END_EVENT_TABLE() diff --git a/gerbview/options.cpp b/gerbview/options.cpp index afccca0afa..f4ef6b2a38 100644 --- a/gerbview/options.cpp +++ b/gerbview/options.cpp @@ -26,7 +26,6 @@ void WinEDA_GerberFrame::OnSelectOptionToolbar( wxCommandEvent& event ) { int id = event.GetId(); bool state; - switch( id ) { case ID_MENU_GERBVIEW_SHOW_HIDE_LAYERS_MANAGER_DIALOG: diff --git a/gerbview/tool_gerber.cpp b/gerbview/tool_gerber.cpp index 0f3d3cebbf..99baa62399 100644 --- a/gerbview/tool_gerber.cpp +++ b/gerbview/tool_gerber.cpp @@ -324,7 +324,7 @@ void WinEDA_GerberFrame::ReCreateOptToolbar( void ) _( "Show/hide the layers manager toolbar" ), wxITEM_CHECK ); - + m_OptionsToolBar->Realize(); SetToolbars(); diff --git a/pcbnew/dialog_copper_zones.cpp b/pcbnew/dialog_copper_zones.cpp index f07c54348d..fd658ff65c 100644 --- a/pcbnew/dialog_copper_zones.cpp +++ b/pcbnew/dialog_copper_zones.cpp @@ -6,10 +6,6 @@ /// Licence: GNU License ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "zones.h" -#endif - #include "fctsys.h" #include "appl_wxstruct.h" #include "common.h" @@ -41,17 +37,16 @@ dialog_copper_zone::dialog_copper_zone( WinEDA_PcbFrame* parent, ZONE_SETTING* z } SetReturnCode( ZONE_ABORT ); // Will be changed on buttons click + + initDialog(); - if( GetSizer() ) - { - GetSizer()->SetSizeHints( this ); - } + GetSizer()->SetSizeHints( this ); Center(); } /*****************************************************************/ -void dialog_copper_zone::OnInitDialog( wxInitDialogEvent& event ) +void dialog_copper_zone::initDialog( ) /*****************************************************************/ // Initialise all dialog options and values in wxTextCtrl diff --git a/pcbnew/dialog_copper_zones.h b/pcbnew/dialog_copper_zones.h index 0fbf6c3df7..2ddf941902 100644 --- a/pcbnew/dialog_copper_zones.h +++ b/pcbnew/dialog_copper_zones.h @@ -9,7 +9,7 @@ */ class dialog_copper_zone : public dialog_copper_zone_base { -public: +private: WinEDA_PcbFrame* m_Parent; wxConfig* m_Config; // Current config int m_OnExitCode; /* exit code: ZONE_ABORT if no change, @@ -23,7 +23,8 @@ public: public: dialog_copper_zone( WinEDA_PcbFrame* parent, ZONE_SETTING* zone_setting ); - void OnInitDialog( wxInitDialogEvent& event ); +private: + void initDialog( ); void OnButtonOkClick( wxCommandEvent& event ); void OnButtonCancelClick( wxCommandEvent& event ); bool AcceptOptions( bool aPromptForErrors, bool aUseExportableSetupOnly = false ); diff --git a/pcbnew/dialog_copper_zones_base.cpp b/pcbnew/dialog_copper_zones_base.cpp index 4fd04a1579..a28c6241b0 100644 --- a/pcbnew/dialog_copper_zones_base.cpp +++ b/pcbnew/dialog_copper_zones_base.cpp @@ -10,7 +10,6 @@ /////////////////////////////////////////////////////////////////////////// BEGIN_EVENT_TABLE( dialog_copper_zone_base, wxDialog ) - EVT_INIT_DIALOG( dialog_copper_zone_base::_wxFB_OnInitDialog ) EVT_RADIOBOX( wxID_PADS_IN_ZONE_OPTIONS, dialog_copper_zone_base::_wxFB_OnPadsInZoneClick ) EVT_BUTTON( wxID_BUTTON_EXPORT, dialog_copper_zone_base::_wxFB_ExportSetupToOtherCopperZones ) EVT_BUTTON( wxID_OK, dialog_copper_zone_base::_wxFB_OnButtonOkClick ) diff --git a/pcbnew/dialog_copper_zones_base.fbp b/pcbnew/dialog_copper_zones_base.fbp index c533a4b4ca..c0eded36c8 100644 --- a/pcbnew/dialog_copper_zones_base.fbp +++ b/pcbnew/dialog_copper_zones_base.fbp @@ -49,7 +49,7 @@ - OnInitDialog + diff --git a/pcbnew/dialog_copper_zones_base.h b/pcbnew/dialog_copper_zones_base.h index 75f1bd2347..09961e2a14 100644 --- a/pcbnew/dialog_copper_zones_base.h +++ b/pcbnew/dialog_copper_zones_base.h @@ -35,7 +35,6 @@ class dialog_copper_zone_base : public wxDialog private: // Private event handlers - void _wxFB_OnInitDialog( wxInitDialogEvent& event ){ OnInitDialog( event ); } void _wxFB_OnPadsInZoneClick( wxCommandEvent& event ){ OnPadsInZoneClick( event ); } void _wxFB_ExportSetupToOtherCopperZones( wxCommandEvent& event ){ ExportSetupToOtherCopperZones( event ); } void _wxFB_OnButtonOkClick( wxCommandEvent& event ){ OnButtonOkClick( event ); } @@ -87,7 +86,6 @@ class dialog_copper_zone_base : public wxDialog wxListBox* m_LayerSelectionCtrl; // Virtual event handlers, overide them in your derived class - virtual void OnInitDialog( wxInitDialogEvent& event ){ event.Skip(); } virtual void OnPadsInZoneClick( wxCommandEvent& event ){ event.Skip(); } virtual void ExportSetupToOtherCopperZones( wxCommandEvent& event ){ event.Skip(); } virtual void OnButtonOkClick( wxCommandEvent& event ){ event.Skip(); }