From 20eda54349627f590ffd0459605a5ea8da4f8aa2 Mon Sep 17 00:00:00 2001 From: John Beard Date: Wed, 27 Mar 2019 10:50:24 +0000 Subject: [PATCH] Pcbnew: update text properties dialog wxFB version No actual changes, but this keeps the diffs clean(er). (cherry picked from commit dd3252445df513cd7dd7a241a4e67b545b49b9e3) --- .../dialogs/dialog_text_properties_base.cpp | 154 +-- .../dialogs/dialog_text_properties_base.fbp | 1144 +---------------- pcbnew/dialogs/dialog_text_properties_base.h | 20 +- 3 files changed, 87 insertions(+), 1231 deletions(-) diff --git a/pcbnew/dialogs/dialog_text_properties_base.cpp b/pcbnew/dialogs/dialog_text_properties_base.cpp index ede64aa480..4bb0ec0832 100644 --- a/pcbnew/dialogs/dialog_text_properties_base.cpp +++ b/pcbnew/dialogs/dialog_text_properties_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 11 2018) +// C++ code generated with wxFormBuilder (version Nov 10 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -14,222 +14,222 @@ DIALOG_TEXT_PROPERTIES_BASE::DIALOG_TEXT_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) { this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize ); - + wxBoxSizer* bMainSizer; bMainSizer = new wxBoxSizer( wxVERTICAL ); - + m_MultiLineSizer = new wxBoxSizer( wxVERTICAL ); - + wxStaticText* textLabel; textLabel = new wxStaticText( this, wxID_ANY, _("Text:"), wxDefaultPosition, wxDefaultSize, 0 ); textLabel->Wrap( -1 ); m_MultiLineSizer->Add( textLabel, 0, wxRIGHT|wxLEFT, 5 ); - + m_MultiLineText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE ); m_MultiLineText->SetToolTip( _("Enter the text placed on selected layer.") ); m_MultiLineText->SetMinSize( wxSize( 400,60 ) ); - + m_MultiLineSizer->Add( m_MultiLineText, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - + + bMainSizer->Add( m_MultiLineSizer, 20, wxEXPAND|wxALL, 10 ); - + m_SingleLineSizer = new wxBoxSizer( wxHORIZONTAL ); - + m_TextLabel = new wxStaticText( this, wxID_ANY, _("Reference:"), wxDefaultPosition, wxDefaultSize, 0 ); m_TextLabel->Wrap( -1 ); m_SingleLineSizer->Add( m_TextLabel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_SingleLineText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER ); m_SingleLineSizer->Add( m_SingleLineText, 1, wxTOP|wxBOTTOM|wxRIGHT, 5 ); - - + + bMainSizer->Add( m_SingleLineSizer, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 ); - + m_DimensionTextSizer = new wxFlexGridSizer( 0, 4, 1, 5 ); m_DimensionTextSizer->AddGrowableCol( 1 ); m_DimensionTextSizer->SetFlexibleDirection( wxBOTH ); m_DimensionTextSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_DimensionTextLabel = new wxStaticText( this, wxID_ANY, _("Dimension text:"), wxDefaultPosition, wxDefaultSize, 0 ); m_DimensionTextLabel->Wrap( -1 ); m_DimensionTextSizer->Add( m_DimensionTextLabel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); - + m_DimensionText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_DimensionTextSizer->Add( m_DimensionText, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); - + m_staticText18 = new wxStaticText( this, wxID_ANY, _("Units:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText18->Wrap( -1 ); m_DimensionTextSizer->Add( m_staticText18, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); - + wxString m_DimensionUnitsOptChoices[] = { _("Inches"), _("Mils"), _("Millimeters") }; int m_DimensionUnitsOptNChoices = sizeof( m_DimensionUnitsOptChoices ) / sizeof( wxString ); m_DimensionUnitsOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_DimensionUnitsOptNChoices, m_DimensionUnitsOptChoices, 0 ); m_DimensionUnitsOpt->SetSelection( 0 ); m_DimensionTextSizer->Add( m_DimensionUnitsOpt, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); - - + + bMainSizer->Add( m_DimensionTextSizer, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 ); - + wxFlexGridSizer* fgSizerSetup; fgSizerSetup = new wxFlexGridSizer( 0, 5, 4, 0 ); fgSizerSetup->AddGrowableCol( 1 ); fgSizerSetup->AddGrowableCol( 4 ); fgSizerSetup->SetFlexibleDirection( wxBOTH ); fgSizerSetup->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_LayerLabel = new wxStaticText( this, wxID_ANY, _("Layer:"), wxDefaultPosition, wxDefaultSize, 0 ); m_LayerLabel->Wrap( -1 ); fgSizerSetup->Add( m_LayerLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); - - m_LayerSelectionCtrl = new PCB_LAYER_BOX_SELECTOR( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); + + m_LayerSelectionCtrl = new PCB_LAYER_BOX_SELECTOR( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); fgSizerSetup->Add( m_LayerSelectionCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); - - + + fgSizerSetup->Add( 0, 0, 0, wxRIGHT|wxLEFT, 40 ); - + m_Visible = new wxCheckBox( this, wxID_ANY, _("Visible"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizerSetup->Add( m_Visible, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); - - + + fgSizerSetup->Add( 0, 0, 1, wxEXPAND, 5 ); - + m_SizeXLabel = new wxStaticText( this, wxID_ANY, _("Width:"), wxDefaultPosition, wxDefaultSize, 0 ); m_SizeXLabel->Wrap( -1 ); fgSizerSetup->Add( m_SizeXLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - + m_SizeXCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER ); fgSizerSetup->Add( m_SizeXCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); - + m_SizeXUnits = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_SizeXUnits->Wrap( -1 ); fgSizerSetup->Add( m_SizeXUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - + m_Italic = new wxCheckBox( this, wxID_ANY, _("Italic"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizerSetup->Add( m_Italic, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); - - + + fgSizerSetup->Add( 0, 0, 0, 0, 5 ); - + m_SizeYLabel = new wxStaticText( this, wxID_ANY, _("Height:"), wxDefaultPosition, wxDefaultSize, 0 ); m_SizeYLabel->Wrap( -1 ); fgSizerSetup->Add( m_SizeYLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - + m_SizeYCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER ); fgSizerSetup->Add( m_SizeYCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); - + m_SizeYUnits = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_SizeYUnits->Wrap( -1 ); fgSizerSetup->Add( m_SizeYUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - + m_staticText11 = new wxStaticText( this, wxID_ANY, _("Justification:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText11->Wrap( -1 ); fgSizerSetup->Add( m_staticText11, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - + wxString m_JustifyChoiceChoices[] = { _("Left"), _("Center"), _("Right") }; int m_JustifyChoiceNChoices = sizeof( m_JustifyChoiceChoices ) / sizeof( wxString ); m_JustifyChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_JustifyChoiceNChoices, m_JustifyChoiceChoices, 0 ); m_JustifyChoice->SetSelection( 0 ); fgSizerSetup->Add( m_JustifyChoice, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT, 3 ); - + m_ThicknessLabel = new wxStaticText( this, wxID_ANY, _("Thickness:"), wxDefaultPosition, wxDefaultSize, 0 ); m_ThicknessLabel->Wrap( -1 ); fgSizerSetup->Add( m_ThicknessLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - + m_ThicknessCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER ); fgSizerSetup->Add( m_ThicknessCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM, 2 ); - + m_ThicknessUnits = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_ThicknessUnits->Wrap( -1 ); fgSizerSetup->Add( m_ThicknessUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - + m_OrientLabel = new wxStaticText( this, wxID_ANY, _("Orientation:"), wxDefaultPosition, wxDefaultSize, 0 ); m_OrientLabel->Wrap( -1 ); fgSizerSetup->Add( m_OrientLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - + m_OrientCtrl = new wxComboBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); m_OrientCtrl->Append( _("0.0") ); m_OrientCtrl->Append( _("90.0") ); m_OrientCtrl->Append( _("-90.0") ); m_OrientCtrl->Append( _("180.0") ); fgSizerSetup->Add( m_OrientCtrl, 0, wxEXPAND, 5 ); - + m_PositionXLabel = new wxStaticText( this, wxID_ANY, _("Position X:"), wxDefaultPosition, wxDefaultSize, 0 ); m_PositionXLabel->Wrap( -1 ); fgSizerSetup->Add( m_PositionXLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - + m_PositionXCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER ); fgSizerSetup->Add( m_PositionXCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); - + m_PositionXUnits = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_PositionXUnits->Wrap( -1 ); fgSizerSetup->Add( m_PositionXUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - + m_Mirrored = new wxCheckBox( this, wxID_ANY, _("Mirrored"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizerSetup->Add( m_Mirrored, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); - - + + fgSizerSetup->Add( 0, 0, 0, 0, 5 ); - + m_PositionYLabel = new wxStaticText( this, wxID_ANY, _("Position Y:"), wxDefaultPosition, wxDefaultSize, 0 ); m_PositionYLabel->Wrap( -1 ); fgSizerSetup->Add( m_PositionYLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - + m_PositionYCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER ); fgSizerSetup->Add( m_PositionYCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); - + m_PositionYUnits = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_PositionYUnits->Wrap( -1 ); fgSizerSetup->Add( m_PositionYUnits, 0, wxRIGHT|wxLEFT, 5 ); - + m_KeepUpright = new wxCheckBox( this, wxID_ANY, _("Keep Upright"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizerSetup->Add( m_KeepUpright, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); - - + + bMainSizer->Add( fgSizerSetup, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 ); - - + + bMainSizer->Add( 0, 0, 0, wxTOP, 5 ); - + wxBoxSizer* bMargins; bMargins = new wxBoxSizer( wxVERTICAL ); - + m_statusLine = new wxStaticText( this, wxID_ANY, _("Parent footprint description"), wxDefaultPosition, wxDefaultSize, 0 ); m_statusLine->Wrap( -1 ); m_statusLine->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - + bMargins->Add( m_statusLine, 0, wxBOTTOM|wxRIGHT|wxLEFT, 3 ); - - + + bMainSizer->Add( bMargins, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 12 ); - + m_staticline = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bMainSizer->Add( m_staticline, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); - + wxBoxSizer* lowerSizer; lowerSizer = new wxBoxSizer( wxHORIZONTAL ); - - + + lowerSizer->Add( 0, 0, 1, wxEXPAND, 5 ); - + m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); - + lowerSizer->Add( m_sdbSizer, 0, wxALL, 5 ); - - + + bMainSizer->Add( lowerSizer, 0, wxEXPAND, 5 ); - - + + this->SetSizer( bMainSizer ); this->Layout(); - + this->Centre( wxBOTH ); - + // Connect Events this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_TEXT_PROPERTIES_BASE::OnInitDlg ) ); m_SingleLineText->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_TEXT_PROPERTIES_BASE::OnOkClick ), NULL, this ); @@ -258,5 +258,5 @@ DIALOG_TEXT_PROPERTIES_BASE::~DIALOG_TEXT_PROPERTIES_BASE() m_PositionXCtrl->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_TEXT_PROPERTIES_BASE::OnOkClick ), NULL, this ); m_PositionYCtrl->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_TEXT_PROPERTIES_BASE::OnOkClick ), NULL, this ); m_sdbSizerOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_TEXT_PROPERTIES_BASE::OnOkClick ), NULL, this ); - + } diff --git a/pcbnew/dialogs/dialog_text_properties_base.fbp b/pcbnew/dialogs/dialog_text_properties_base.fbp index 9cb0a0e01e..9bc85d1cdf 100644 --- a/pcbnew/dialogs/dialog_text_properties_base.fbp +++ b/pcbnew/dialogs/dialog_text_properties_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -53,55 +53,7 @@ - - - - - - - - - - - - - - - - - - - - - - OnInitDlg - - - - - - - - - - - - - - - - - - - - - - - - - - bMainSizer @@ -175,36 +127,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -269,40 +191,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -375,36 +263,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -469,40 +327,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnOkClick - - - @@ -582,36 +407,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -676,40 +471,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnDimensionTextChange - - - - @@ -771,36 +533,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -865,37 +597,7 @@ - - - - - - - - OnDimensionUnitsChange - - - - - - - - - - - - - - - - - - - - - - @@ -975,36 +677,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1070,39 +742,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1177,37 +816,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1279,36 +887,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1373,40 +951,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnOkClick - - - @@ -1468,36 +1013,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1562,37 +1077,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1664,36 +1148,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1758,40 +1212,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnOkClick - - - @@ -1853,36 +1274,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1944,36 +1335,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2038,37 +1399,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2130,36 +1460,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2224,40 +1524,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnOkClick - - - @@ -2319,36 +1586,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2410,36 +1647,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2505,41 +1712,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnOkClick - @@ -2601,36 +1774,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2695,40 +1838,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnOkClick - - - @@ -2790,36 +1900,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2884,37 +1964,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2986,36 +2035,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3080,40 +2099,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnOkClick - - - @@ -3175,36 +2161,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3269,37 +2225,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3382,36 +2307,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3472,36 +2367,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3539,14 +2404,7 @@ m_sdbSizer protected - - - - - OnOkClick - - diff --git a/pcbnew/dialogs/dialog_text_properties_base.h b/pcbnew/dialogs/dialog_text_properties_base.h index bf1f0144e3..0997e329f8 100644 --- a/pcbnew/dialogs/dialog_text_properties_base.h +++ b/pcbnew/dialogs/dialog_text_properties_base.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 11 2018) +// C++ code generated with wxFormBuilder (version Nov 10 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __DIALOG_TEXT_PROPERTIES_BASE_H__ -#define __DIALOG_TEXT_PROPERTIES_BASE_H__ +#pragma once #include #include @@ -39,7 +38,7 @@ class PCB_LAYER_BOX_SELECTOR; class DIALOG_TEXT_PROPERTIES_BASE : public DIALOG_SHIM { private: - + protected: wxBoxSizer* m_MultiLineSizer; wxTextCtrl* m_MultiLineText; @@ -81,19 +80,18 @@ class DIALOG_TEXT_PROPERTIES_BASE : public DIALOG_SHIM wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK; wxButton* m_sdbSizerCancel; - + // Virtual event handlers, overide them in your derived class virtual void OnInitDlg( wxInitDialogEvent& event ) { event.Skip(); } virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnDimensionTextChange( wxCommandEvent& event ) { event.Skip(); } virtual void OnDimensionUnitsChange( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - DIALOG_TEXT_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Text Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 504,463 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSYSTEM_MENU ); + + DIALOG_TEXT_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Text Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 504,463 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSYSTEM_MENU ); ~DIALOG_TEXT_PROPERTIES_BASE(); - + }; -#endif //__DIALOG_TEXT_PROPERTIES_BASE_H__