From f24372bc189f7a3ac1a2d18af2ace3a22c192c29 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Mon, 12 Dec 2022 23:54:40 +0000 Subject: [PATCH] Layout adjustments for wxWidgets 3.2. --- eeschema/dialogs/dialog_erc_base.cpp | 2 +- eeschema/dialogs/dialog_erc_base.fbp | 2 +- .../dialog_lib_symbol_properties_base.cpp | 4 ++-- .../dialog_lib_symbol_properties_base.fbp | 4 ++-- .../dialog_lib_symbol_properties_base.h | 2 +- eeschema/dialogs/dialog_sim_model_base.cpp | 11 ++++++---- eeschema/dialogs/dialog_sim_model_base.fbp | 22 ++++++++++++++----- .../dialogs/dialog_symbol_properties_base.cpp | 4 ++-- .../dialogs/dialog_symbol_properties_base.fbp | 2 +- .../dialogs/dialog_symbol_properties_base.h | 2 +- .../dialog_constraints_reporter_base.cpp | 4 ++-- .../dialog_constraints_reporter_base.fbp | 7 ++++-- .../dialog_constraints_reporter_base.h | 5 +++-- pcbnew/dialogs/dialog_drc_base.cpp | 2 +- pcbnew/dialogs/dialog_drc_base.fbp | 4 ++-- .../dialog_footprint_properties_base.cpp | 2 +- .../dialog_footprint_properties_base.fbp | 4 ++-- ...og_footprint_properties_fp_editor_base.cpp | 6 ++--- ...og_footprint_properties_fp_editor_base.fbp | 8 +++---- pcbnew/dialogs/dialog_pad_properties_base.cpp | 5 +---- pcbnew/dialogs/dialog_pad_properties_base.fbp | 12 +--------- pcbnew/widgets/appearance_controls_base.cpp | 2 +- pcbnew/widgets/appearance_controls_base.fbp | 2 +- 23 files changed, 61 insertions(+), 57 deletions(-) diff --git a/eeschema/dialogs/dialog_erc_base.cpp b/eeschema/dialogs/dialog_erc_base.cpp index cb14740c5d..343f34d5ed 100644 --- a/eeschema/dialogs/dialog_erc_base.cpp +++ b/eeschema/dialogs/dialog_erc_base.cpp @@ -155,7 +155,7 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin bMainSizer->Add( bSizer11, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - bSizer1->Add( bMainSizer, 1, wxEXPAND|wxBOTTOM|wxLEFT, 5 ); + bSizer1->Add( bMainSizer, 1, wxEXPAND|wxALL, 5 ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bSizer1->Add( m_staticline1, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); diff --git a/eeschema/dialogs/dialog_erc_base.fbp b/eeschema/dialogs/dialog_erc_base.fbp index 0e11380666..34b4bf9e1a 100644 --- a/eeschema/dialogs/dialog_erc_base.fbp +++ b/eeschema/dialogs/dialog_erc_base.fbp @@ -124,7 +124,7 @@ 5 - wxEXPAND|wxBOTTOM|wxLEFT + wxEXPAND|wxALL 1 diff --git a/eeschema/dialogs/dialog_lib_symbol_properties_base.cpp b/eeschema/dialogs/dialog_lib_symbol_properties_base.cpp index 32af330c21..4c588ed868 100644 --- a/eeschema/dialogs/dialog_lib_symbol_properties_base.cpp +++ b/eeschema/dialogs/dialog_lib_symbol_properties_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0-4761b0c5) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -323,7 +323,7 @@ DIALOG_LIB_SYMBOL_PROPERTIES_BASE::DIALOG_LIB_SYMBOL_PROPERTIES_BASE( wxWindow* bPanelFpFilterBoxSizer->Fit( m_PanelFootprintFilter ); m_NoteBook->AddPage( m_PanelFootprintFilter, _("Footprint Filters"), false ); - bUpperSizer->Add( m_NoteBook, 1, wxEXPAND, 5 ); + bUpperSizer->Add( m_NoteBook, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); bMainSizer->Add( bUpperSizer, 1, wxEXPAND, 5 ); diff --git a/eeschema/dialogs/dialog_lib_symbol_properties_base.fbp b/eeschema/dialogs/dialog_lib_symbol_properties_base.fbp index 7d9b3f4113..3816cbea5f 100644 --- a/eeschema/dialogs/dialog_lib_symbol_properties_base.fbp +++ b/eeschema/dialogs/dialog_lib_symbol_properties_base.fbp @@ -72,8 +72,8 @@ wxVERTICAL none - 5 - wxEXPAND + 10 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 1 1 diff --git a/eeschema/dialogs/dialog_lib_symbol_properties_base.h b/eeschema/dialogs/dialog_lib_symbol_properties_base.h index a3531f7994..8b2f9e72d0 100644 --- a/eeschema/dialogs/dialog_lib_symbol_properties_base.h +++ b/eeschema/dialogs/dialog_lib_symbol_properties_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0-4761b0c5) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/eeschema/dialogs/dialog_sim_model_base.cpp b/eeschema/dialogs/dialog_sim_model_base.cpp index 522ca9941d..83d876ff54 100644 --- a/eeschema/dialogs/dialog_sim_model_base.cpp +++ b/eeschema/dialogs/dialog_sim_model_base.cpp @@ -93,7 +93,7 @@ DIALOG_SIM_MODEL_BASE::DIALOG_SIM_MODEL_BASE( wxWindow* parent, wxWindowID id, c bSizerMargins->Add( gbSizer1, 0, wxEXPAND|wxLEFT, 28 ); - bSizerMargins->Add( 0, 18, 0, wxEXPAND, 5 ); + bSizerMargins->Add( 0, 20, 0, wxEXPAND, 5 ); m_useInstanceModelRadioButton = new wxRadioButton( m_modelPanel, wxID_ANY, _("Built-in SPICE model"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerMargins->Add( m_useInstanceModelRadioButton, 0, wxBOTTOM|wxLEFT, 5 ); @@ -125,6 +125,9 @@ DIALOG_SIM_MODEL_BASE::DIALOG_SIM_MODEL_BASE( wxWindow* parent, wxWindowID id, c bSizerMargins->Add( fgSizer16, 0, wxEXPAND|wxLEFT, 24 ); + + bSizerMargins->Add( 0, 15, 0, wxEXPAND, 5 ); + m_modelNotebook = new wxNotebook( m_modelPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); m_parametersPanel = new wxPanel( m_modelNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_parametersPanel->SetMinSize( wxSize( 500,-1 ) ); @@ -193,7 +196,7 @@ DIALOG_SIM_MODEL_BASE::DIALOG_SIM_MODEL_BASE( wxWindow* parent, wxWindowID id, c bSizer5->Fit( m_codePanel ); m_modelNotebook->AddPage( m_codePanel, _("Code"), false ); - bSizerMargins->Add( m_modelNotebook, 1, wxEXPAND|wxTOP, 10 ); + bSizerMargins->Add( m_modelNotebook, 1, wxEXPAND|wxALL, 5 ); m_saveInValueCheckbox = new wxCheckBox( m_modelPanel, wxID_ANY, _("Save {} in Value field as \"{}\""), wxDefaultPosition, wxDefaultSize, 0 ); bSizerMargins->Add( m_saveInValueCheckbox, 0, wxALL, 6 ); @@ -249,13 +252,13 @@ DIALOG_SIM_MODEL_BASE::DIALOG_SIM_MODEL_BASE( wxWindow* parent, wxWindowID id, c bSizer10->Fit( m_pinAssignmentsPanel ); m_notebook->AddPage( m_pinAssignmentsPanel, _("Pin Assignments"), false ); - bSizer8->Add( m_notebook, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + bSizer8->Add( m_notebook, 1, wxEXPAND|wxALL, 10 ); wxBoxSizer* bSizer81; bSizer81 = new wxBoxSizer( wxHORIZONTAL ); m_excludeCheckbox = new wxCheckBox( this, wxID_ANY, _("Exclude from simulation"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer81->Add( m_excludeCheckbox, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bSizer81->Add( m_excludeCheckbox, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); bSizer81->Add( 30, 0, 1, wxEXPAND, 5 ); diff --git a/eeschema/dialogs/dialog_sim_model_base.fbp b/eeschema/dialogs/dialog_sim_model_base.fbp index 18bc86aa80..a11e68ec28 100644 --- a/eeschema/dialogs/dialog_sim_model_base.fbp +++ b/eeschema/dialogs/dialog_sim_model_base.fbp @@ -62,8 +62,8 @@ wxVERTICAL none - 5 - wxEXPAND|wxRIGHT|wxLEFT + 10 + wxEXPAND|wxALL 1 1 @@ -987,7 +987,7 @@ wxEXPAND 0 - 18 + 20 protected 0 @@ -1331,8 +1331,18 @@ - 10 - wxEXPAND|wxTOP + 5 + wxEXPAND + 0 + + 15 + protected + 0 + + + + 5 + wxEXPAND|wxALL 1 1 @@ -1896,7 +1906,7 @@ none 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 diff --git a/eeschema/dialogs/dialog_symbol_properties_base.cpp b/eeschema/dialogs/dialog_symbol_properties_base.cpp index b97a13bc87..143e1f5e56 100644 --- a/eeschema/dialogs/dialog_symbol_properties_base.cpp +++ b/eeschema/dialogs/dialog_symbol_properties_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0-4761b0c5) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -297,7 +297,7 @@ DIALOG_SYMBOL_PROPERTIES_BASE::DIALOG_SYMBOL_PROPERTIES_BASE( wxWindow* parent, pinTableSizer->Fit( m_pinTablePage ); m_notebook1->AddPage( m_pinTablePage, _("Alternate Pin Assignments"), false ); - mainSizer->Add( m_notebook1, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + mainSizer->Add( m_notebook1, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); wxBoxSizer* bSizerBottom; bSizerBottom = new wxBoxSizer( wxHORIZONTAL ); diff --git a/eeschema/dialogs/dialog_symbol_properties_base.fbp b/eeschema/dialogs/dialog_symbol_properties_base.fbp index d2c26e5f37..0b772a47e3 100644 --- a/eeschema/dialogs/dialog_symbol_properties_base.fbp +++ b/eeschema/dialogs/dialog_symbol_properties_base.fbp @@ -64,7 +64,7 @@ wxVERTICAL none - 5 + 10 wxEXPAND|wxTOP|wxRIGHT|wxLEFT 1 diff --git a/eeschema/dialogs/dialog_symbol_properties_base.h b/eeschema/dialogs/dialog_symbol_properties_base.h index 90f36d0edb..7259f81e6b 100644 --- a/eeschema/dialogs/dialog_symbol_properties_base.h +++ b/eeschema/dialogs/dialog_symbol_properties_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0-4761b0c5) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_constraints_reporter_base.cpp b/pcbnew/dialogs/dialog_constraints_reporter_base.cpp index ded93a4747..d2c42c60e5 100644 --- a/pcbnew/dialogs/dialog_constraints_reporter_base.cpp +++ b/pcbnew/dialogs/dialog_constraints_reporter_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -20,7 +20,7 @@ DIALOG_CONSTRAINTS_REPORTER_BASE::DIALOG_CONSTRAINTS_REPORTER_BASE( wxWindow* pa m_notebook->SetMinSize( wxSize( 550,480 ) ); - bMainSizer->Add( m_notebook, 1, wxEXPAND|wxRIGHT|wxLEFT, 10 ); + bMainSizer->Add( m_notebook, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); diff --git a/pcbnew/dialogs/dialog_constraints_reporter_base.fbp b/pcbnew/dialogs/dialog_constraints_reporter_base.fbp index 1edcda339c..2bbec62eb7 100644 --- a/pcbnew/dialogs/dialog_constraints_reporter_base.fbp +++ b/pcbnew/dialogs/dialog_constraints_reporter_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ dialog_constraints_reporter_base 2240 none + 1 DialogConstraintsReporterBase @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -50,6 +52,7 @@ DIALOG_SHIM; dialog_shim.h; forward_declare Constraints Resolution Report + 0 @@ -60,7 +63,7 @@ none 10 - wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 1 1 diff --git a/pcbnew/dialogs/dialog_constraints_reporter_base.h b/pcbnew/dialogs/dialog_constraints_reporter_base.h index 7f25e6628e..661a1744d6 100644 --- a/pcbnew/dialogs/dialog_constraints_reporter_base.h +++ b/pcbnew/dialogs/dialog_constraints_reporter_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -36,13 +36,14 @@ class DIALOG_CONSTRAINTS_REPORTER_BASE : public DIALOG_SHIM wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK; - // Virtual event handlers, overide them in your derived class + // Virtual event handlers, override them in your derived class virtual void OnOK( wxCommandEvent& event ) { event.Skip(); } public: DIALOG_CONSTRAINTS_REPORTER_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Constraints Resolution Report"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_CONSTRAINTS_REPORTER_BASE(); }; diff --git a/pcbnew/dialogs/dialog_drc_base.cpp b/pcbnew/dialogs/dialog_drc_base.cpp index 1210f53b80..fe311cc67b 100644 --- a/pcbnew/dialogs/dialog_drc_base.cpp +++ b/pcbnew/dialogs/dialog_drc_base.cpp @@ -148,7 +148,7 @@ DIALOG_DRC_BASE::DIALOG_DRC_BASE( wxWindow* parent, wxWindowID id, const wxStrin bSizer15->Fit( m_panelIgnored ); m_Notebook->AddPage( m_panelIgnored, _("Ignored Tests (%s)"), false ); - bSizer13->Add( m_Notebook, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + bSizer13->Add( m_Notebook, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); results->SetSizer( bSizer13 ); diff --git a/pcbnew/dialogs/dialog_drc_base.fbp b/pcbnew/dialogs/dialog_drc_base.fbp index 587a9b7949..67d8c78add 100644 --- a/pcbnew/dialogs/dialog_drc_base.fbp +++ b/pcbnew/dialogs/dialog_drc_base.fbp @@ -721,8 +721,8 @@ wxVERTICAL none - 5 - wxEXPAND|wxRIGHT|wxLEFT + 10 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 1 1 diff --git a/pcbnew/dialogs/dialog_footprint_properties_base.cpp b/pcbnew/dialogs/dialog_footprint_properties_base.cpp index 81ffc1c288..52b77dcd63 100644 --- a/pcbnew/dialogs/dialog_footprint_properties_base.cpp +++ b/pcbnew/dialogs/dialog_footprint_properties_base.cpp @@ -369,7 +369,7 @@ DIALOG_FOOTPRINT_PROPERTIES_BASE::DIALOG_FOOTPRINT_PROPERTIES_BASE( wxWindow* pa bSizerPanelClearances->Fit( m_PanelClearances ); m_NoteBook->AddPage( m_PanelClearances, _("Clearance Overrides and Settings"), false ); - m_GeneralBoxSizer->Add( m_NoteBook, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + m_GeneralBoxSizer->Add( m_NoteBook, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); wxBoxSizer* bSizerButtons; bSizerButtons = new wxBoxSizer( wxHORIZONTAL ); diff --git a/pcbnew/dialogs/dialog_footprint_properties_base.fbp b/pcbnew/dialogs/dialog_footprint_properties_base.fbp index 8974df31e3..c0ca8fb313 100644 --- a/pcbnew/dialogs/dialog_footprint_properties_base.fbp +++ b/pcbnew/dialogs/dialog_footprint_properties_base.fbp @@ -64,8 +64,8 @@ wxVERTICAL private - 5 - wxEXPAND|wxRIGHT|wxLEFT + 10 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 1 1 diff --git a/pcbnew/dialogs/dialog_footprint_properties_fp_editor_base.cpp b/pcbnew/dialogs/dialog_footprint_properties_fp_editor_base.cpp index fb2d55c918..4ef9e62754 100644 --- a/pcbnew/dialogs/dialog_footprint_properties_fp_editor_base.cpp +++ b/pcbnew/dialogs/dialog_footprint_properties_fp_editor_base.cpp @@ -222,7 +222,7 @@ DIALOG_FOOTPRINT_PROPERTIES_FP_EDITOR_BASE::DIALOG_FOOTPRINT_PROPERTIES_FP_EDITO m_PanelGeneral->SetSizer( m_PanelPropertiesBoxSizer ); m_PanelGeneral->Layout(); m_PanelPropertiesBoxSizer->Fit( m_PanelGeneral ); - m_NoteBook->AddPage( m_PanelGeneral, _("General"), false ); + m_NoteBook->AddPage( m_PanelGeneral, _("General"), true ); m_PanelClearances = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizerPanelClearances; bSizerPanelClearances = new wxBoxSizer( wxVERTICAL ); @@ -392,9 +392,9 @@ DIALOG_FOOTPRINT_PROPERTIES_FP_EDITOR_BASE::DIALOG_FOOTPRINT_PROPERTIES_FP_EDITO m_PanelClearances->SetSizer( bSizerPanelClearances ); m_PanelClearances->Layout(); bSizerPanelClearances->Fit( m_PanelClearances ); - m_NoteBook->AddPage( m_PanelClearances, _("Clearance Overrides and Settings"), true ); + m_NoteBook->AddPage( m_PanelClearances, _("Clearance Overrides and Settings"), false ); - m_GeneralBoxSizer->Add( m_NoteBook, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + m_GeneralBoxSizer->Add( m_NoteBook, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); wxBoxSizer* bSizer16; bSizer16 = new wxBoxSizer( wxHORIZONTAL ); diff --git a/pcbnew/dialogs/dialog_footprint_properties_fp_editor_base.fbp b/pcbnew/dialogs/dialog_footprint_properties_fp_editor_base.fbp index 65be4110c1..64312b1228 100644 --- a/pcbnew/dialogs/dialog_footprint_properties_fp_editor_base.fbp +++ b/pcbnew/dialogs/dialog_footprint_properties_fp_editor_base.fbp @@ -64,8 +64,8 @@ wxVERTICAL private - 5 - wxEXPAND|wxRIGHT|wxLEFT + 10 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 1 1 @@ -123,7 +123,7 @@ General - 0 + 1 1 1 @@ -1541,7 +1541,7 @@ Clearance Overrides and Settings - 1 + 0 1 1 diff --git a/pcbnew/dialogs/dialog_pad_properties_base.cpp b/pcbnew/dialogs/dialog_pad_properties_base.cpp index 5a16cf9360..1ae94d33b9 100644 --- a/pcbnew/dialogs/dialog_pad_properties_base.cpp +++ b/pcbnew/dialogs/dialog_pad_properties_base.cpp @@ -836,16 +836,13 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_bSizerPanelPrimitives->Fit( m_panelCustomShapePrimitives ); m_notebook->AddPage( m_panelCustomShapePrimitives, _("Custom Shape Primitives"), false ); - bSizerUpper->Add( m_notebook, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 ); + bSizerUpper->Add( m_notebook, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 10 ); wxBoxSizer* bSizerDisplayPad; bSizerDisplayPad = new wxBoxSizer( wxVERTICAL ); bSizerDisplayPad->SetMinSize( wxSize( 290,-1 ) ); - bSizerDisplayPad->Add( 0, 0, 0, wxBOTTOM|wxEXPAND|wxTOP, 3 ); - - bSizerDisplayPad->Add( 0, 10, 0, wxEXPAND, 5 ); m_stackupImagesBook = new wxSimplebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE ); diff --git a/pcbnew/dialogs/dialog_pad_properties_base.fbp b/pcbnew/dialogs/dialog_pad_properties_base.fbp index 2e595e4e42..b706f828bb 100644 --- a/pcbnew/dialogs/dialog_pad_properties_base.fbp +++ b/pcbnew/dialogs/dialog_pad_properties_base.fbp @@ -72,7 +72,7 @@ wxHORIZONTAL none - 5 + 10 wxEXPAND|wxTOP|wxBOTTOM|wxLEFT 0 @@ -9860,16 +9860,6 @@ bSizerDisplayPad wxVERTICAL none - - 3 - wxBOTTOM|wxEXPAND|wxTOP - 0 - - 0 - protected - 0 - - 5 wxEXPAND diff --git a/pcbnew/widgets/appearance_controls_base.cpp b/pcbnew/widgets/appearance_controls_base.cpp index 8c98d8a56c..d7ef116590 100644 --- a/pcbnew/widgets/appearance_controls_base.cpp +++ b/pcbnew/widgets/appearance_controls_base.cpp @@ -150,7 +150,7 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID m_netsTabOuterSizer->Fit( m_panelNetsAndClasses ); m_notebook->AddPage( m_panelNetsAndClasses, _("Nets"), false ); - m_sizerOuter->Add( m_notebook, 1, wxEXPAND|wxBOTTOM, 5 ); + m_sizerOuter->Add( m_notebook, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 ); wxBoxSizer* bBottomMargin; bBottomMargin = new wxBoxSizer( wxVERTICAL ); diff --git a/pcbnew/widgets/appearance_controls_base.fbp b/pcbnew/widgets/appearance_controls_base.fbp index 1822cec998..85c8efd285 100644 --- a/pcbnew/widgets/appearance_controls_base.fbp +++ b/pcbnew/widgets/appearance_controls_base.fbp @@ -61,7 +61,7 @@ protected 5 - wxEXPAND|wxBOTTOM + wxEXPAND|wxTOP|wxBOTTOM 1 1