diff --git a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.fbp b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.fbp index 647cfd8e2f..692687dc31 100644 --- a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.fbp +++ b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.fbp @@ -1,6 +1,6 @@ - + ; C++ @@ -16,9 +16,9 @@ none 1 DialogEditLibentryFields_in_lib_base - + . - + 1 1 1 @@ -29,67 +29,67 @@ 0 wxAUI_MGR_DEFAULT - - - + + + 1 1 impl_virtual - - - + + + 0 wxID_ANY - - + + DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE - + -1,-1 wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER|wxSYSTEM_MENU DIALOG_SHIM; dialog_shim.h Field Properties - - - - - - - - - - - - - + + + + + + + + + + + + + OnCloseDialog - - - - - + + + + + OnInitDialog - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + mainSizer wxVERTICAL none @@ -98,7 +98,7 @@ wxEXPAND 1 - + bSizerFieldsSetup wxHORIZONTAL none @@ -107,7 +107,7 @@ wxEXPAND 3 - + bSizerFiledsList wxVERTICAL none @@ -120,100 +120,100 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 220,-1 1 fieldListCtrl 1 - - + + protected 1 - + Resizable 1 - + wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_VRULES - + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnListItemDeselected - - - + + + OnListItemSelected - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -225,17 +225,17 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 0 @@ -243,65 +243,65 @@ 0 Left 1 - + 1 - + 0 0 wxID_ANY Add Field - + 0 - - + + 0 - + 1 addFieldButton 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 Add a new custom field - + wxFILTER_NONE wxDefaultValidator - - - - + + + + addFieldButtonHandler - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -313,17 +313,17 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 0 @@ -331,65 +331,65 @@ 0 Left 1 - + 1 - + 0 0 wxID_ANY Delete Field - + 0 - - + + 0 - + 1 deleteFieldButton 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 Delete one of the optional fields - + wxFILTER_NONE wxDefaultValidator - - - - + + + + deleteFieldButtonHandler - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -401,17 +401,17 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 0 @@ -419,65 +419,65 @@ 0 Left 1 - + 1 - + 0 0 wxID_ANY Move Up - + 0 - - + + 0 - + 1 moveUpButton 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 Move the selected optional fields up one position - + wxFILTER_NONE wxDefaultValidator - - - - + + + + moveUpButtonHandler - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -487,7 +487,7 @@ wxEXPAND 2 - + fieldEditBoxSizer wxVERTICAL none @@ -496,7 +496,7 @@ wxEXPAND|wxBOTTOM 0 - + bSizerJustify wxHORIZONTAL none @@ -509,85 +509,85 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 "Left" "Center" "Right" 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Horiz. Justify 1 - + 0 - - + + 0 - + 1 m_FieldHJustifyCtrl 1 - - + + protected 1 - + Resizable 1 1 - + wxRA_SPECIFY_COLS - + 0 Select if the component is to be rotated when drawn - + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -599,85 +599,85 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 "Bottom" "Center" "Top" 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Vert. Justify 1 - + 0 - - + + 0 - + 1 m_FieldVJustifyCtrl 1 - - + + protected 1 - + Resizable 0 1 - + wxRA_SPECIFY_COLS - + 0 Pick the graphical transformation to be used when displaying the component, if any - + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -687,7 +687,7 @@ wxEXPAND|wxTOP 0 - + bSizerAspect wxHORIZONTAL none @@ -698,11 +698,11 @@ wxID_ANY Visibility - + visibilitySizer wxVERTICAL none - + 5 wxALL @@ -712,83 +712,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Show - + 0 - - + + 0 - + 1 showCheckBox 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 Check if you want this field visible - + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -800,83 +800,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Rotate - + 0 - - + + 0 - + 1 rotateCheckBox 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 Check if you want this field's text rotated 90 degrees - + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -890,85 +890,85 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 "Normal" "Italic" "Bold" "Bold Italic" 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Style: 1 - + 0 - - + + 0 - + 1 m_StyleRadioBox 1 - - + + protected 1 - + Resizable 0 1 - + wxRA_SPECIFY_COLS - + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -978,91 +978,91 @@ wxALL|wxEXPAND 0 - + fieldNameBoxSizer wxVERTICAL none 5 - + 0 1 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Field Name - + 0 - - + + 0 - + 1 fieldNameLabel 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1074,86 +1074,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + 0 - + 0 - + 1 fieldNameTextCtrl 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 The text (or value) of the currently selected field - + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1165,78 +1165,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Field Value - + 0 - - + + 0 - + 1 fieldValueLabel 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1248,86 +1248,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + 0 - + 0 - + 1 fieldValueTextCtrl 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 The text (or value) of the currently selected field - + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1339,17 +1339,17 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 0 @@ -1357,65 +1357,65 @@ 0 Left 1 - + 1 - + 0 0 wxID_ANY Show in Browser - + 0 - - + + 0 - + 1 m_show_datasheet_button 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 If your datasheet is given as an http:// link, then pressing this button should bring it up in your webbrowser. - + wxFILTER_NONE wxDefaultValidator - - - - + + + + showButtonHandler - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1428,9 +1428,9 @@ 3 wxBOTH 1 - + 0 - + fgSizerPosSize wxFLEX_GROWMODE_SPECIFIED none @@ -1445,78 +1445,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Size - + 0 - - + + 0 - + 1 textSizeLabel 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1528,86 +1528,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + 0 - + 0 - + 1 textSizeTextCtrl 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 The vertical height of the currently selected field's text in the schematic - + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1619,78 +1619,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY unit - + 0 - - + + 0 - + 1 m_staticTextUnitSize 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1702,78 +1702,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY PosX - + 0 - - + + 0 - + 1 posXLabel 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1785,86 +1785,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + 0 - + 0 - + 1 posXTextCtrl 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1876,78 +1876,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY unit - + 0 - - + + 0 - + 1 m_staticTextUnitPosX 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1959,78 +1959,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY PosY - + 0 - - + + 0 - + 1 posYLabel 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2042,86 +2042,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + 0 - + 0 - + 1 posYTextCtrl 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 The Y coordinate of the text relative to the component - + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2133,78 +2133,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY unit - + 0 - - + + 0 - + 1 m_staticTextUnitPosY 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2222,76 +2222,76 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_staticline1 1 - - + + protected 1 - + Resizable 1 - + wxLI_HORIZONTAL - + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2307,17 +2307,17 @@ 1 0 0 - + stdDialogButtonSizer protected - + OnCancelButtonClick - - - + + + OnOKButtonClick - - + + diff --git a/eeschema/dialogs/dialog_eeschema_options.cpp b/eeschema/dialogs/dialog_eeschema_options.cpp index 308f51ff56..2dddd1ac78 100644 --- a/eeschema/dialogs/dialog_eeschema_options.cpp +++ b/eeschema/dialogs/dialog_eeschema_options.cpp @@ -31,6 +31,7 @@ #include +#include "wx/settings.h" DIALOG_EESCHEMA_OPTIONS::DIALOG_EESCHEMA_OPTIONS( wxWindow* parent ) : DIALOG_EESCHEMA_OPTIONS_BASE( parent ) @@ -38,7 +39,14 @@ DIALOG_EESCHEMA_OPTIONS::DIALOG_EESCHEMA_OPTIONS( wxWindow* parent ) : m_choiceUnits->SetFocus(); m_sdbSizer1OK->SetDefault(); - // Setup the wxListCtrl for displaying the template fieldnames + // Dialog should not shrink beyond it's minimal size. + GetSizer()->SetSizeHints( this ); + + // The width returned by GetSize includes the amount taken up by the scroll bar, remove the + // scrollbar width + int listWidth = templateFieldListCtrl->GetSize().GetWidth() - 1; +// - wxSystemSettings::GetMetric( wxSYS_HSCROLL_Y ); + wxListItem col0; col0.SetId( 0 ); col0.SetText( _( "Field Name" ) ); @@ -54,31 +62,28 @@ DIALOG_EESCHEMA_OPTIONS::DIALOG_EESCHEMA_OPTIONS( wxWindow* parent ) : templateFieldListCtrl->InsertColumn( 0, col0 ); templateFieldListCtrl->InsertColumn( 1, col1 ); templateFieldListCtrl->InsertColumn( 2, col2 ); - templateFieldListCtrl->SetColumnWidth( 0, templateFieldListCtrl->GetViewRect().GetWidth() / 3 ); - templateFieldListCtrl->SetColumnWidth( 1, templateFieldListCtrl->GetViewRect().GetWidth() / 3 ); - templateFieldListCtrl->SetColumnWidth( 2, templateFieldListCtrl->GetViewRect().GetWidth() / 3 ); + + templateFieldListCtrl->SetColumnWidth( 0, 200 ); + templateFieldListCtrl->SetColumnWidth( 1, 200 ); + templateFieldListCtrl->SetColumnWidth( 2, 75 ); // Invalid field selected and don't ignore selection events because // they'll be from the user selectedField = -1; ignoreSelection = false; + // Set the html help for th template editor + m_htmlWin2->SetPage( + _( "Template Field Names
" + "

Field names must be unique, and should be alpha-numeric only

" + "

Some field names are reserved and cannot be used. The following fieldnames are " + "reserved:

" ) ); + // Make sure we select the first tab of the options tab page m_notebook1->SetSelection( 0 ); } -void DIALOG_EESCHEMA_OPTIONS::OnSize( wxSizeEvent& event ) -{ - templateFieldListCtrl->SetColumnWidth( 0, templateFieldListCtrl->GetViewRect().GetWidth() / 3 ); - templateFieldListCtrl->SetColumnWidth( 1, templateFieldListCtrl->GetViewRect().GetWidth() / 3 ); - templateFieldListCtrl->SetColumnWidth( 2, templateFieldListCtrl->GetViewRect().GetWidth() / 3 ); - - /* We're just eves dropping on the event, pass it on... */ - event.Skip(); -} - - void DIALOG_EESCHEMA_OPTIONS::SetUnits( const wxArrayString& units, int select ) { wxASSERT( units.GetCount() > 0 diff --git a/eeschema/dialogs/dialog_eeschema_options.h b/eeschema/dialogs/dialog_eeschema_options.h index c1787b4f27..2876d21f21 100644 --- a/eeschema/dialogs/dialog_eeschema_options.h +++ b/eeschema/dialogs/dialog_eeschema_options.h @@ -70,12 +70,7 @@ protected: * Deletes the selected template fieldname from the template fieldnames data */ void OnDeleteButtonClick( wxCommandEvent& event ); - - /** - * Function OnSize - * Resize any controls that are dynamically sized when the dialog is resized - */ - void OnSize( wxSizeEvent& event ); + void OnInitDialog( wxInitDialogEvent& event ); /** * Function copyPanelToSelected diff --git a/eeschema/dialogs/dialog_eeschema_options_base.cpp b/eeschema/dialogs/dialog_eeschema_options_base.cpp index e9fe31c14d..b834a98e6a 100644 --- a/eeschema/dialogs/dialog_eeschema_options_base.cpp +++ b/eeschema/dialogs/dialog_eeschema_options_base.cpp @@ -242,6 +242,9 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx fieldVisibleCheckbox = new wxCheckBox( m_panel2, wxID_ANY, _("Visible"), wxDefaultPosition, wxDefaultSize, 0 ); fieldSizer->Add( fieldVisibleCheckbox, 0, wxALL, 5 ); + m_htmlWin2 = new wxHtmlWindow( m_panel2, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO ); + fieldSizer->Add( m_htmlWin2, 1, wxALL|wxEXPAND, 5 ); + bSizer6->Add( fieldSizer, 1, wxEXPAND, 5 ); diff --git a/eeschema/dialogs/dialog_eeschema_options_base.fbp b/eeschema/dialogs/dialog_eeschema_options_base.fbp index f65d30dabf..4ce88cd812 100644 --- a/eeschema/dialogs/dialog_eeschema_options_base.fbp +++ b/eeschema/dialogs/dialog_eeschema_options_base.fbp @@ -45,7 +45,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE -1,-1 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + wxDEFAULT_DIALOG_STYLE DIALOG_SHIM; dialog_shim.h Schematic Editor Options @@ -4052,6 +4052,90 @@ + + 5 + wxALL|wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_htmlWin2 + 1 + + + protected + 1 + + Resizable + 1 + + wxHW_SCROLLBAR_AUTO + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eeschema/dialogs/dialog_eeschema_options_base.h b/eeschema/dialogs/dialog_eeschema_options_base.h index 07e4c59367..9e91572fc6 100644 --- a/eeschema/dialogs/dialog_eeschema_options_base.h +++ b/eeschema/dialogs/dialog_eeschema_options_base.h @@ -31,6 +31,7 @@ class DIALOG_SHIM; #include #include #include +#include #include #include #include @@ -45,7 +46,7 @@ class DIALOG_EESCHEMA_OPTIONS_BASE : public DIALOG_SHIM { DECLARE_EVENT_TABLE() private: - + // Private event handlers void _wxFB_OnSize( wxSizeEvent& event ){ OnSize( event ); } void _wxFB_OnChooseUnits( wxCommandEvent& event ){ OnChooseUnits( event ); } @@ -54,8 +55,8 @@ class DIALOG_EESCHEMA_OPTIONS_BASE : public DIALOG_SHIM void _wxFB_OnTemplateFieldSelected( wxListEvent& event ){ OnTemplateFieldSelected( event ); } void _wxFB_OnAddButtonClick( wxCommandEvent& event ){ OnAddButtonClick( event ); } void _wxFB_OnDeleteButtonClick( wxCommandEvent& event ){ OnDeleteButtonClick( event ); } - - + + protected: enum { @@ -64,7 +65,7 @@ class DIALOG_EESCHEMA_OPTIONS_BASE : public DIALOG_SHIM wxID_ADD_FIELD, wxID_DELETE_FIELD }; - + wxNotebook* m_notebook1; wxPanel* m_panel1; wxStaticText* m_staticText2; @@ -110,12 +111,13 @@ class DIALOG_EESCHEMA_OPTIONS_BASE : public DIALOG_SHIM wxStaticText* fieldDefaultValueLabel; wxTextCtrl* fieldDefaultValueTextCtrl; wxCheckBox* fieldVisibleCheckbox; + wxHtmlWindow* m_htmlWin2; wxButton* addFieldButton; wxButton* deleteFieldButton; wxStdDialogButtonSizer* m_sdbSizer1; wxButton* m_sdbSizer1OK; wxButton* m_sdbSizer1Cancel; - + // Virtual event handlers, overide them in your derived class virtual void OnSize( wxSizeEvent& event ) { event.Skip(); } virtual void OnChooseUnits( wxCommandEvent& event ) { event.Skip(); } @@ -124,13 +126,13 @@ class DIALOG_EESCHEMA_OPTIONS_BASE : public DIALOG_SHIM virtual void OnTemplateFieldSelected( wxListEvent& event ) { event.Skip(); } virtual void OnAddButtonClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnDeleteButtonClick( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Schematic Editor Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + + DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Schematic Editor Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE ); ~DIALOG_EESCHEMA_OPTIONS_BASE(); - + }; #endif //__DIALOG_EESCHEMA_OPTIONS_BASE_H__