From 50b05aea4a1a0efa4759545e6572460afd230b2a Mon Sep 17 00:00:00 2001 From: Seth Hillbrand Date: Thu, 28 Jan 2021 10:54:51 -0800 Subject: [PATCH] Thou shalt not set minimum width --- eeschema/dialogs/dialog_symbol_properties_base.cpp | 8 +++----- eeschema/dialogs/dialog_symbol_properties_base.fbp | 2 +- eeschema/dialogs/dialog_symbol_properties_base.h | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/eeschema/dialogs/dialog_symbol_properties_base.cpp b/eeschema/dialogs/dialog_symbol_properties_base.cpp index 8ac0621d7d..5b6f26b949 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.9.0 Jun 18 2020) +// C++ code generated with wxFormBuilder (version 3.9.0 Dec 30 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -49,7 +49,6 @@ DIALOG_SYMBOL_PROPERTIES_BASE::DIALOG_SYMBOL_PROPERTIES_BASE( wxWindow* parent, m_fieldsGrid->SetColSize( 10, 84 ); m_fieldsGrid->EnableDragColMove( false ); m_fieldsGrid->EnableDragColSize( true ); - m_fieldsGrid->SetColLabelSize( 22 ); m_fieldsGrid->SetColLabelValue( 0, _("Name") ); m_fieldsGrid->SetColLabelValue( 1, _("Value") ); m_fieldsGrid->SetColLabelValue( 2, _("Show") ); @@ -61,6 +60,7 @@ DIALOG_SYMBOL_PROPERTIES_BASE::DIALOG_SYMBOL_PROPERTIES_BASE( wxWindow* parent, m_fieldsGrid->SetColLabelValue( 8, _("Orientation") ); m_fieldsGrid->SetColLabelValue( 9, _("X Position") ); m_fieldsGrid->SetColLabelValue( 10, _("Y Position") ); + m_fieldsGrid->SetColLabelSize( 22 ); m_fieldsGrid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); // Rows @@ -260,12 +260,12 @@ DIALOG_SYMBOL_PROPERTIES_BASE::DIALOG_SYMBOL_PROPERTIES_BASE( wxWindow* parent, m_pinGrid->SetColSize( 4, 140 ); m_pinGrid->EnableDragColMove( false ); m_pinGrid->EnableDragColSize( true ); - m_pinGrid->SetColLabelSize( 24 ); m_pinGrid->SetColLabelValue( 0, _("Pin Number") ); m_pinGrid->SetColLabelValue( 1, _("Base Pin Name") ); m_pinGrid->SetColLabelValue( 2, _("Alternate Assignment") ); m_pinGrid->SetColLabelValue( 3, _("Electrical Type") ); m_pinGrid->SetColLabelValue( 4, _("Graphic Style") ); + m_pinGrid->SetColLabelSize( 24 ); m_pinGrid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); // Rows @@ -313,8 +313,6 @@ DIALOG_SYMBOL_PROPERTIES_BASE::DIALOG_SYMBOL_PROPERTIES_BASE( wxWindow* parent, bSizerBottom->Add( 20, 0, 0, wxEXPAND, 5 ); m_spiceFieldsButton = new wxButton( this, wxID_ANY, _("Spice Model..."), wxDefaultPosition, wxDefaultSize, 0 ); - m_spiceFieldsButton->SetMinSize( wxSize( 112,-1 ) ); - bSizerBottom->Add( m_spiceFieldsButton, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_stdDialogButtonSizer = new wxStdDialogButtonSizer(); diff --git a/eeschema/dialogs/dialog_symbol_properties_base.fbp b/eeschema/dialogs/dialog_symbol_properties_base.fbp index aa70cfbae0..9fd0e97bb3 100644 --- a/eeschema/dialogs/dialog_symbol_properties_base.fbp +++ b/eeschema/dialogs/dialog_symbol_properties_base.fbp @@ -2090,7 +2090,7 @@ 0 - 112,-1 + -1,-1 1 m_spiceFieldsButton 1 diff --git a/eeschema/dialogs/dialog_symbol_properties_base.h b/eeschema/dialogs/dialog_symbol_properties_base.h index c39dede990..404cee786e 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.9.0 Jun 18 2020) +// C++ code generated with wxFormBuilder (version 3.9.0 Dec 30 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -76,7 +76,7 @@ class DIALOG_SYMBOL_PROPERTIES_BASE : public DIALOG_SHIM wxButton* m_stdDialogButtonSizerOK; wxButton* m_stdDialogButtonSizerCancel; - // Virtual event handlers, overide them in your derived class + // Virtual event handlers, override them in your derived class virtual void OnInitDlg( wxInitDialogEvent& event ) { event.Skip(); } virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } virtual void OnGridEditorShown( wxGridEvent& event ) { event.Skip(); }