diff --git a/common/widgets/gal_options_panel.cpp b/common/widgets/gal_options_panel.cpp index b3a69ef892..f34221103a 100644 --- a/common/widgets/gal_options_panel.cpp +++ b/common/widgets/gal_options_panel.cpp @@ -1,7 +1,7 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2017-2019 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2017-2021 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -46,6 +46,7 @@ static const double gridMinSpacingMin = 5; static const double gridMinSpacingMax = 200; static const double gridMinSpacingStep = 5; + ///TODO: These are duplicated in gal_display_options - Unify! static const UTIL::CFG_MAP gridStyleSelectMap = { @@ -54,6 +55,7 @@ static const UTIL::CFG_MAP gridStyleSelectMap = { KIGFX::GRID_STYLE::SMALL_CROSS, 2 }, }; + static const UTIL::CFG_MAP gridSnapConfigVals = { { KIGFX::GRID_SNAPPING::ALWAYS, 0 }, @@ -61,6 +63,7 @@ static const UTIL::CFG_MAP gridSnapConfigVals = { KIGFX::GRID_SNAPPING::NEVER, 2 } }; + GAL_OPTIONS_PANEL::GAL_OPTIONS_PANEL( wxWindow* aParent, EDA_DRAW_FRAME* aDrawFrame ) : wxPanel( aParent, wxID_ANY ), m_drawFrame( aDrawFrame ), @@ -106,11 +109,12 @@ GAL_OPTIONS_PANEL::GAL_OPTIONS_PANEL( wxWindow* aParent, EDA_DRAW_FRAME* aDrawFr _( "Lines" ), _( "Small crosses" ) }; + int m_gridStyleNChoices = sizeof( m_gridStyleChoices ) / sizeof( wxString ); m_gridStyle = new wxRadioBox( sGridSettings->GetStaticBox(), wxID_ANY, _( "Grid Style" ), wxDefaultPosition, wxDefaultSize, m_gridStyleNChoices, m_gridStyleChoices, 1, wxRA_SPECIFY_COLS ); - sGridSettings->Add( m_gridStyle, 0, wxBOTTOM|wxEXPAND, 5 ); + sGridSettings->Add( m_gridStyle, 0, wxLEFT | wxRIGHT | wxBOTTOM | wxEXPAND, 5 ); wxFlexGridSizer* sGridSettingsGrid; sGridSettingsGrid = new wxFlexGridSizer( 0, 3, 0, 0 ); @@ -121,7 +125,7 @@ GAL_OPTIONS_PANEL::GAL_OPTIONS_PANEL( wxWindow* aParent, EDA_DRAW_FRAME* aDrawFr l_gridLineWidth = new wxStaticText( sGridSettings->GetStaticBox(), wxID_ANY, _( "Grid thickness:" ) ); l_gridLineWidth->Wrap( -1 ); - sGridSettingsGrid->Add( l_gridLineWidth, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + sGridSettingsGrid->Add( l_gridLineWidth, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 ); m_gridLineWidth = new wxSpinCtrlDouble( sGridSettings->GetStaticBox(), wxID_ANY ); m_gridLineWidth->SetRange( gridThicknessMin, gridThicknessMax ); @@ -137,7 +141,7 @@ GAL_OPTIONS_PANEL::GAL_OPTIONS_PANEL( wxWindow* aParent, EDA_DRAW_FRAME* aDrawFr l_gridMinSpacing = new wxStaticText( sGridSettings->GetStaticBox(), wxID_ANY, _( "Min grid spacing:" ) ); l_gridMinSpacing->Wrap( -1 ); - sGridSettingsGrid->Add( l_gridMinSpacing, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + sGridSettingsGrid->Add( l_gridMinSpacing, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 ); m_gridMinSpacing = new wxSpinCtrlDouble( sGridSettings->GetStaticBox(), wxID_ANY); m_gridMinSpacing->SetRange( gridMinSpacingMin, gridMinSpacingMax ); @@ -155,14 +159,14 @@ GAL_OPTIONS_PANEL::GAL_OPTIONS_PANEL( wxWindow* aParent, EDA_DRAW_FRAME* aDrawFr l_gridSnapOptions->Wrap( -1 ); sGridSettingsGrid->Add( l_gridSnapOptions, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 ); - wxString gridSnapChoices[] = { _( "Always"), _("When grid shown"), _("Never") }; + wxString gridSnapChoices[] = { _( "Always" ), _( "When grid shown" ), _( "Never" ) }; int gridSnapNChoices = sizeof( gridSnapChoices ) / sizeof( wxString ); m_gridSnapOptions = new wxChoice( sGridSettings->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, gridSnapNChoices, gridSnapChoices ); m_gridSnapOptions->Select( 0 ); - sGridSettingsGrid->Add( m_gridSnapOptions, 0, wxALIGN_CENTER_VERTICAL | wxEXPAND | wxALL, - 5 ); + sGridSettingsGrid->Add( m_gridSnapOptions, 0, + wxALIGN_CENTER_VERTICAL | wxEXPAND | wxTOP | wxBOTTOM, 5 ); l_gridSnapSpace = new wxStaticText( sGridSettings->GetStaticBox(), wxID_ANY, _( "px" ) ); l_gridSnapSpace->Wrap( -1 ); @@ -199,7 +203,7 @@ GAL_OPTIONS_PANEL::GAL_OPTIONS_PANEL( wxWindow* aParent, EDA_DRAW_FRAME* aDrawFr m_cursorShape->SetSelection( 0 ); m_cursorShape->SetToolTip( _( "Cursor shape for drawing, placement and movement tools" ) ); - sCursorSettings->Add( m_cursorShape, 0, wxBOTTOM | wxEXPAND, 5 ); + sCursorSettings->Add( m_cursorShape, 0, wxLEFT | wxRIGHT | wxBOTTOM | wxEXPAND, 5 ); m_forceCursorDisplay = new wxCheckBox( this, wxID_ANY, _( "Always show crosshairs" ) ); sCursorSettings->Add( m_forceCursorDisplay, 0, wxALL | wxEXPAND, 5 ); diff --git a/eeschema/dialogs/panel_setup_formatting_base.cpp b/eeschema/dialogs/panel_setup_formatting_base.cpp index a4c3bf5a68..3c320562ce 100644 --- a/eeschema/dialogs/panel_setup_formatting_base.cpp +++ b/eeschema/dialogs/panel_setup_formatting_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Mar 8 2021) +// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -47,40 +47,40 @@ PANEL_SETUP_FORMATTING_BASE::PANEL_SETUP_FORMATTING_BASE( wxWindow* parent, wxWi sbSizer4 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Text") ), wxVERTICAL ); wxFlexGridSizer* fgSizer2; - fgSizer2 = new wxFlexGridSizer( 0, 3, 0, 0 ); + fgSizer2 = new wxFlexGridSizer( 0, 3, 5, 5 ); fgSizer2->AddGrowableCol( 1 ); fgSizer2->SetFlexibleDirection( wxBOTH ); fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); m_textSizeLabel = new wxStaticText( sbSizer4->GetStaticBox(), wxID_ANY, _("Default text size:"), wxDefaultPosition, wxDefaultSize, 0 ); m_textSizeLabel->Wrap( -1 ); - fgSizer2->Add( m_textSizeLabel, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer2->Add( m_textSizeLabel, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_textSizeCtrl = new wxTextCtrl( sbSizer4->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer2->Add( m_textSizeCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); + fgSizer2->Add( m_textSizeCtrl, 0, wxEXPAND, 5 ); m_textSizeUnits = new wxStaticText( sbSizer4->GetStaticBox(), wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); m_textSizeUnits->Wrap( -1 ); - fgSizer2->Add( m_textSizeUnits, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer2->Add( m_textSizeUnits, 0, wxALIGN_CENTER_VERTICAL|wxFIXED_MINSIZE, 5 ); m_textOffsetRatioLabel = new wxStaticText( sbSizer4->GetStaticBox(), wxID_ANY, _("Text offset ratio:"), wxDefaultPosition, wxDefaultSize, 0 ); m_textOffsetRatioLabel->Wrap( -1 ); m_textOffsetRatioLabel->SetToolTip( _("Percentage of the text size to offset text above or below wire or bus") ); - fgSizer2->Add( m_textOffsetRatioLabel, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer2->Add( m_textOffsetRatioLabel, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_textOffsetRatioCtrl = new wxTextCtrl( sbSizer4->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer2->Add( m_textOffsetRatioCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); + fgSizer2->Add( m_textOffsetRatioCtrl, 0, wxEXPAND, 5 ); m_offsetRatioUnits = new wxStaticText( sbSizer4->GetStaticBox(), wxID_ANY, _("%"), wxDefaultPosition, wxDefaultSize, 0 ); m_offsetRatioUnits->Wrap( -1 ); - fgSizer2->Add( m_offsetRatioUnits, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); + fgSizer2->Add( m_offsetRatioUnits, 0, wxALIGN_CENTER_VERTICAL|wxFIXED_MINSIZE, 5 ); - sbSizer4->Add( fgSizer2, 1, wxEXPAND|wxBOTTOM, 5 ); + sbSizer4->Add( fgSizer2, 1, wxALL|wxEXPAND, 5 ); - bLeftColumn->Add( sbSizer4, 1, wxEXPAND|wxALL, 5 ); + bLeftColumn->Add( sbSizer4, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxStaticBoxSizer* sbSizer41; sbSizer41 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Symbols") ), wxVERTICAL ); @@ -100,7 +100,7 @@ PANEL_SETUP_FORMATTING_BASE::PANEL_SETUP_FORMATTING_BASE( wxWindow* parent, wxWi m_lineWidthUnits = new wxStaticText( sbSizer41->GetStaticBox(), wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); m_lineWidthUnits->Wrap( -1 ); - fgSizer321->Add( m_lineWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); + fgSizer321->Add( m_lineWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxFIXED_MINSIZE|wxLEFT|wxRIGHT, 5 ); m_pinSymbolSizeLabel = new wxStaticText( sbSizer41->GetStaticBox(), wxID_ANY, _("Pin symbol size:"), wxDefaultPosition, wxDefaultSize, 0 ); m_pinSymbolSizeLabel->Wrap( -1 ); @@ -111,7 +111,7 @@ PANEL_SETUP_FORMATTING_BASE::PANEL_SETUP_FORMATTING_BASE( wxWindow* parent, wxWi m_pinSymbolSizeUnits = new wxStaticText( sbSizer41->GetStaticBox(), wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); m_pinSymbolSizeUnits->Wrap( -1 ); - fgSizer321->Add( m_pinSymbolSizeUnits, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer321->Add( m_pinSymbolSizeUnits, 0, wxALIGN_CENTER_VERTICAL|wxFIXED_MINSIZE|wxLEFT|wxRIGHT, 5 ); sbSizer41->Add( fgSizer321, 1, wxEXPAND|wxBOTTOM, 5 ); @@ -142,7 +142,7 @@ PANEL_SETUP_FORMATTING_BASE::PANEL_SETUP_FORMATTING_BASE( wxWindow* parent, wxWi bLeftColumn->Add( sbSizer2, 0, wxEXPAND|wxALL, 5 ); - bPanelSizer->Add( bLeftColumn, 1, wxTOP|wxLEFT, 10 ); + bPanelSizer->Add( bLeftColumn, 1, wxLEFT|wxTOP, 10 ); wxBoxSizer* bRightColumn; bRightColumn = new wxBoxSizer( wxVERTICAL ); diff --git a/eeschema/dialogs/panel_setup_formatting_base.fbp b/eeschema/dialogs/panel_setup_formatting_base.fbp index 04d61d7469..9cba32ce67 100644 --- a/eeschema/dialogs/panel_setup_formatting_base.fbp +++ b/eeschema/dialogs/panel_setup_formatting_base.fbp @@ -58,7 +58,7 @@ none 10 - wxTOP|wxLEFT + wxLEFT|wxTOP 1 @@ -81,7 +81,7 @@ 5 wxEXPAND|wxBOTTOM|wxRIGHT 0 - + bSizer6 wxHORIZONTAL @@ -217,7 +217,7 @@ 5 - wxEXPAND|wxALL + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 1 wxID_ANY @@ -229,23 +229,23 @@ none 5 - wxEXPAND|wxBOTTOM + wxALL|wxEXPAND 1 3 wxBOTH 1 - 0 + 5 fgSizer2 wxFLEX_GROWMODE_SPECIFIED none 0 - 0 + 5 5 - wxALL|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL 0 1 @@ -306,7 +306,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT + wxEXPAND 0 1 @@ -370,7 +370,7 @@ 5 - wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxFIXED_MINSIZE 0 1 @@ -431,7 +431,7 @@ 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL 0 1 @@ -492,7 +492,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT + wxEXPAND 0 1 @@ -556,7 +556,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxFIXED_MINSIZE 0 1 @@ -774,7 +774,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxFIXED_MINSIZE|wxLEFT|wxRIGHT 0 1 @@ -960,7 +960,7 @@ 5 - wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxFIXED_MINSIZE|wxLEFT|wxRIGHT 0 1 diff --git a/eeschema/dialogs/panel_setup_formatting_base.h b/eeschema/dialogs/panel_setup_formatting_base.h index 24699fd763..35054e4799 100644 --- a/eeschema/dialogs/panel_setup_formatting_base.h +++ b/eeschema/dialogs/panel_setup_formatting_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Mar 8 2021) +// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -64,7 +64,7 @@ class PANEL_SETUP_FORMATTING_BASE : public wxPanel wxStaticText* m_suffixLabel; wxTextCtrl* m_suffixCtrl; - // Virtual event handlers, override them in your derived class + // Virtual event handlers, overide them in your derived class virtual void onCheckBoxIref( wxCommandEvent& event ) { event.Skip(); } diff --git a/pcbnew/dialogs/dialog_export_step_base.cpp b/pcbnew/dialogs/dialog_export_step_base.cpp index ac86542d88..994f78790b 100644 --- a/pcbnew/dialogs/dialog_export_step_base.cpp +++ b/pcbnew/dialogs/dialog_export_step_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -62,7 +62,7 @@ DIALOG_EXPORT_STEP_BASE::DIALOG_EXPORT_STEP_BASE( wxWindow* parent, wxWindowID i m_staticTextUnits = new wxStaticText( sbUserDefinedOrigin->GetStaticBox(), wxID_ANY, _("Units:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextUnits->Wrap( -1 ); - fgSizer1->Add( m_staticTextUnits, 0, wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer1->Add( m_staticTextUnits, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); wxString m_STEP_OrgUnitChoiceChoices[] = { _("mm"), _("inch") }; int m_STEP_OrgUnitChoiceNChoices = sizeof( m_STEP_OrgUnitChoiceChoices ) / sizeof( wxString ); @@ -72,7 +72,7 @@ DIALOG_EXPORT_STEP_BASE::DIALOG_EXPORT_STEP_BASE( wxWindow* parent, wxWindowID i m_staticTextXpos = new wxStaticText( sbUserDefinedOrigin->GetStaticBox(), wxID_ANY, _("X position:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextXpos->Wrap( -1 ); - fgSizer1->Add( m_staticTextXpos, 0, wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer1->Add( m_staticTextXpos, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_STEP_Xorg = new TEXT_CTRL_EVAL( sbUserDefinedOrigin->GetStaticBox(), wxID_ANY, _("0"), wxDefaultPosition, wxDefaultSize, 0 ); #ifdef __WXGTK__ @@ -87,7 +87,7 @@ DIALOG_EXPORT_STEP_BASE::DIALOG_EXPORT_STEP_BASE( wxWindow* parent, wxWindowID i m_staticTextYpos = new wxStaticText( sbUserDefinedOrigin->GetStaticBox(), wxID_ANY, _("Y position:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextYpos->Wrap( -1 ); - fgSizer1->Add( m_staticTextYpos, 0, wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer1->Add( m_staticTextYpos, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_STEP_Yorg = new TEXT_CTRL_EVAL( sbUserDefinedOrigin->GetStaticBox(), wxID_ANY, _("0"), wxDefaultPosition, wxDefaultSize, 0 ); #ifdef __WXGTK__ @@ -122,7 +122,7 @@ DIALOG_EXPORT_STEP_BASE::DIALOG_EXPORT_STEP_BASE( wxWindow* parent, wxWindowID i m_staticTextTolerance = new wxStaticText( sbOtherOptions->GetStaticBox(), wxID_ANY, _("Board outline chaining tolerance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextTolerance->Wrap( -1 ); - sbOtherOptions->Add( m_staticTextTolerance, 0, wxTOP|wxRIGHT, 5 ); + sbOtherOptions->Add( m_staticTextTolerance, 0, wxLEFT|wxRIGHT|wxTOP, 5 ); wxString m_toleranceChoices[] = { _("Tight (0.001 mm)"), _("Standard (0.01 mm)"), _("Loose (0.1 mm)") }; int m_toleranceNChoices = sizeof( m_toleranceChoices ) / sizeof( wxString ); @@ -130,7 +130,7 @@ DIALOG_EXPORT_STEP_BASE::DIALOG_EXPORT_STEP_BASE( wxWindow* parent, wxWindowID i m_tolerance->SetSelection( 1 ); m_tolerance->SetToolTip( _("Tolerance sets the distance between two points that are considered joined.") ); - sbOtherOptions->Add( m_tolerance, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 ); + sbOtherOptions->Add( m_tolerance, 0, wxALL|wxEXPAND, 5 ); bSizer2->Add( sbOtherOptions, 1, wxEXPAND|wxRIGHT|wxLEFT, 10 ); diff --git a/pcbnew/dialogs/dialog_export_step_base.fbp b/pcbnew/dialogs/dialog_export_step_base.fbp index 0432e62983..09146ccd1a 100644 --- a/pcbnew/dialogs/dialog_export_step_base.fbp +++ b/pcbnew/dialogs/dialog_export_step_base.fbp @@ -14,6 +14,7 @@ dialog_export_step_base 1000 none + 1 dialog_export_step_base @@ -25,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -504,7 +506,7 @@ 5 5 - wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxLEFT 0 1 @@ -630,7 +632,7 @@ 5 - wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxLEFT 0 1 @@ -756,7 +758,7 @@ 5 - wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxLEFT 0 1 @@ -1090,7 +1092,7 @@ 5 - wxTOP|wxRIGHT + wxLEFT|wxRIGHT|wxTOP 0 1 @@ -1151,7 +1153,7 @@ 5 - wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT + wxALL|wxEXPAND 0 1 diff --git a/pcbnew/dialogs/dialog_export_step_base.h b/pcbnew/dialogs/dialog_export_step_base.h index bbad15ef75..697ca5f12b 100644 --- a/pcbnew/dialogs/dialog_export_step_base.h +++ b/pcbnew/dialogs/dialog_export_step_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE!