From 3e8f7acd31f0608212a53fc355ecceeec2858962 Mon Sep 17 00:00:00 2001 From: charras Date: Wed, 10 Feb 2010 14:17:21 +0000 Subject: [PATCH] fixed pcbnew crash --- pcbnew/dialog_graphic_items_options.cpp | 15 +++------------ pcbnew/dialog_graphic_items_options.h | 2 -- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/pcbnew/dialog_graphic_items_options.cpp b/pcbnew/dialog_graphic_items_options.cpp index 0371c2d147..043ed5d015 100644 --- a/pcbnew/dialog_graphic_items_options.cpp +++ b/pcbnew/dialog_graphic_items_options.cpp @@ -93,11 +93,6 @@ void WinEDA_GraphicItemsOptionsDialog::AcceptOptions( wxCommandEvent& event ) } -/*! - * WinEDA_GraphicItemsOptionsDialog type definition - */ - -IMPLEMENT_DYNAMIC_CLASS( WinEDA_GraphicItemsOptionsDialog, wxDialog ) /*! * WinEDA_GraphicItemsOptionsDialog event table definition @@ -114,15 +109,9 @@ EVT_BUTTON( wxID_CANCEL, WinEDA_GraphicItemsOptionsDialog::OnCancelClick ) END_EVENT_TABLE() /*! - * WinEDA_GraphicItemsOptionsDialog constructors + * WinEDA_GraphicItemsOptionsDialog constructor */ -WinEDA_GraphicItemsOptionsDialog::WinEDA_GraphicItemsOptionsDialog() -{ - m_BrdSettings = m_Parent->GetBoard()->GetBoardDesignSettings(); -} - - WinEDA_GraphicItemsOptionsDialog::WinEDA_GraphicItemsOptionsDialog( WinEDA_BasePcbFrame* parent, wxWindowID id, @@ -131,6 +120,8 @@ WinEDA_GraphicItemsOptionsDialog::WinEDA_GraphicItemsOptionsDialog( const wxSize& size, long style ) { + m_Parent = parent; + m_BrdSettings = m_Parent->GetBoard()->GetBoardDesignSettings(); Create( parent, id, caption, pos, size, style ); } diff --git a/pcbnew/dialog_graphic_items_options.h b/pcbnew/dialog_graphic_items_options.h index d42b1ac0f1..f9a09a5e6f 100644 --- a/pcbnew/dialog_graphic_items_options.h +++ b/pcbnew/dialog_graphic_items_options.h @@ -64,14 +64,12 @@ class WinEDA_GraphicItemsOptionsDialog: public wxDialog { - DECLARE_DYNAMIC_CLASS( WinEDA_GraphicItemsOptionsDialog ) DECLARE_EVENT_TABLE() public: BOARD_DESIGN_SETTINGS* m_BrdSettings; /// Constructors - WinEDA_GraphicItemsOptionsDialog( ); WinEDA_GraphicItemsOptionsDialog( WinEDA_BasePcbFrame* parent, wxWindowID id = SYMBOL_WINEDA_GRAPHICITEMSOPTIONSDIALOG_IDNAME, const wxString& caption = SYMBOL_WINEDA_GRAPHICITEMSOPTIONSDIALOG_TITLE, const wxPoint& pos = SYMBOL_WINEDA_GRAPHICITEMSOPTIONSDIALOG_POSITION, const wxSize& size = SYMBOL_WINEDA_GRAPHICITEMSOPTIONSDIALOG_SIZE, long style = SYMBOL_WINEDA_GRAPHICITEMSOPTIONSDIALOG_STYLE ); /// Creation