diff --git a/eeschema/dialogs/dialog_edit_line_style_base.cpp b/eeschema/dialogs/dialog_edit_line_style_base.cpp index 61fa0edb5f..15d5ccb5a7 100644 --- a/eeschema/dialogs/dialog_edit_line_style_base.cpp +++ b/eeschema/dialogs/dialog_edit_line_style_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version v3.8.0) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -21,9 +21,6 @@ DIALOG_EDIT_LINE_STYLE_BASE::DIALOG_EDIT_LINE_STYLE_BASE( wxWindow* parent, wxWi wxBoxSizer* mainSizer; mainSizer = new wxBoxSizer( wxVERTICAL ); - - mainSizer->Add( 0, 0, 1, wxEXPAND, 5 ); - wxFlexGridSizer* fgSizerGeneral; fgSizerGeneral = new wxFlexGridSizer( 0, 3, 0, 0 ); fgSizerGeneral->AddGrowableCol( 1 ); @@ -35,8 +32,6 @@ DIALOG_EDIT_LINE_STYLE_BASE::DIALOG_EDIT_LINE_STYLE_BASE( wxWindow* parent, wxWi fgSizerGeneral->Add( m_staticTextWidth, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); m_lineWidth = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 ); - m_lineWidth->SetMinSize( wxSize( 80,-1 ) ); - fgSizerGeneral->Add( m_lineWidth, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); m_staticWidthUnits = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -67,10 +62,7 @@ DIALOG_EDIT_LINE_STYLE_BASE::DIALOG_EDIT_LINE_STYLE_BASE( wxWindow* parent, wxWi fgSizerGeneral->Add( m_typeCombo, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); - mainSizer->Add( fgSizerGeneral, 3, wxEXPAND, 5 ); - - - mainSizer->Add( 0, 0, 1, wxALL|wxEXPAND, 1 ); + mainSizer->Add( fgSizerGeneral, 1, wxEXPAND|wxALL, 5 ); m_staticline = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); mainSizer->Add( m_staticline, 0, wxEXPAND | wxALL, 5 ); @@ -89,6 +81,7 @@ DIALOG_EDIT_LINE_STYLE_BASE::DIALOG_EDIT_LINE_STYLE_BASE( wxWindow* parent, wxWi this->SetSizer( mainSizer ); this->Layout(); + mainSizer->Fit( this ); this->Centre( wxBOTH ); } diff --git a/eeschema/dialogs/dialog_edit_line_style_base.fbp b/eeschema/dialogs/dialog_edit_line_style_base.fbp index fd8bf95061..eebc13fe1f 100644 --- a/eeschema/dialogs/dialog_edit_line_style_base.fbp +++ b/eeschema/dialogs/dialog_edit_line_style_base.fbp @@ -45,7 +45,7 @@ DIALOG_EDIT_LINE_STYLE_BASE - 349,194 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h Line Style @@ -60,18 +60,8 @@ none 5 - wxEXPAND + wxEXPAND|wxALL 1 - - 0 - protected - 0 - - - - 5 - wxEXPAND - 3 3 wxBOTH @@ -183,7 +173,7 @@ 0 -1,-1 0 - 80,-1 + -1,-1 1 m_lineWidth 1 @@ -199,10 +189,10 @@ 0 - bool - wxFILTER_NUMERIC + + wxFILTER_NONE wxDefaultValidator - m_isValid + @@ -542,16 +532,6 @@ - - 1 - wxALL|wxEXPAND - 1 - - 0 - protected - 0 - - 5 wxEXPAND | wxALL diff --git a/eeschema/dialogs/dialog_edit_line_style_base.h b/eeschema/dialogs/dialog_edit_line_style_base.h index 6ebaf1fece..6448d04a8e 100644 --- a/eeschema/dialogs/dialog_edit_line_style_base.h +++ b/eeschema/dialogs/dialog_edit_line_style_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version v3.8.0) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -68,9 +68,8 @@ class DIALOG_EDIT_LINE_STYLE_BASE : public DIALOG_SHIM public: - bool m_isValid; - DIALOG_EDIT_LINE_STYLE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Line Style"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 349,194 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_EDIT_LINE_STYLE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Line Style"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_EDIT_LINE_STYLE_BASE(); };