diff --git a/common/widgets/paged_dialog.cpp b/common/widgets/paged_dialog.cpp index 6b5c8e6ed5..b9f30fab16 100644 --- a/common/widgets/paged_dialog.cpp +++ b/common/widgets/paged_dialog.cpp @@ -1,7 +1,7 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2019-2022 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2019-2023 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 as published by the @@ -58,10 +58,6 @@ PAGED_DIALOG::PAGED_DIALOG( wxWindow* aParent, const wxString& aTitle, bool aSho m_treebook->SetFont( KIUI::GetControlFont( this ) ); mainSizer->Add( m_treebook, 1, wxEXPAND|wxLEFT|wxTOP, 10 ); - auto line = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, - wxLI_HORIZONTAL ); - mainSizer->Add( line, 0, wxEXPAND|wxLEFT|wxTOP|wxRIGHT, 10 ); - m_buttonsSizer = new wxBoxSizer( wxHORIZONTAL ); if( aShowReset ) diff --git a/eeschema/dialogs/dialog_bom_base.cpp b/eeschema/dialogs/dialog_bom_base.cpp index f47e6f5437..3732193432 100644 --- a/eeschema/dialogs/dialog_bom_base.cpp +++ b/eeschema/dialogs/dialog_bom_base.cpp @@ -108,9 +108,6 @@ DIALOG_BOM_BASE::DIALOG_BOM_BASE( wxWindow* parent, wxWindowID id, const wxStrin bMainSizer->Add( bbottomSizer, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 ); - m_staticline = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bMainSizer->Add( m_staticline, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - wxBoxSizer* bSizer8; bSizer8 = new wxBoxSizer( wxHORIZONTAL ); diff --git a/eeschema/dialogs/dialog_bom_base.fbp b/eeschema/dialogs/dialog_bom_base.fbp index 2003dd7360..4243d2f0ca 100644 --- a/eeschema/dialogs/dialog_bom_base.fbp +++ b/eeschema/dialogs/dialog_bom_base.fbp @@ -866,64 +866,6 @@ - - 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - ; forward_declare - 0 - - - - - - 5 wxEXPAND|wxLEFT diff --git a/eeschema/dialogs/dialog_bom_base.h b/eeschema/dialogs/dialog_bom_base.h index 489f67527a..1306b4cc91 100644 --- a/eeschema/dialogs/dialog_bom_base.h +++ b/eeschema/dialogs/dialog_bom_base.h @@ -28,7 +28,6 @@ class STD_BITMAP_BUTTON; #include #include #include -#include #include /////////////////////////////////////////////////////////////////////////// @@ -58,7 +57,6 @@ class DIALOG_BOM_BASE : public DIALOG_SHIM wxStaticText* m_staticTextCmd; wxTextCtrl* m_textCtrlCommand; wxCheckBox* m_checkBoxShowConsole; - wxStaticLine* m_staticline; wxButton* m_buttonReset; wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK; diff --git a/eeschema/dialogs/dialog_erc_base.cpp b/eeschema/dialogs/dialog_erc_base.cpp index 8e0de2fab7..2ed3c4e9f2 100644 --- a/eeschema/dialogs/dialog_erc_base.cpp +++ b/eeschema/dialogs/dialog_erc_base.cpp @@ -5,8 +5,8 @@ // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#include "widgets/wx_infobar.h" #include "widgets/wx_html_report_box.h" +#include "widgets/wx_infobar.h" #include "dialog_erc_base.h" @@ -157,9 +157,6 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin 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 ); - m_buttonsSizer = new wxBoxSizer( wxHORIZONTAL ); m_deleteOneMarker = new wxButton( this, wxID_ANY, _("Delete Marker"), wxDefaultPosition, wxDefaultSize, 0 ); diff --git a/eeschema/dialogs/dialog_erc_base.fbp b/eeschema/dialogs/dialog_erc_base.fbp index 34b4bf9e1a..a8dcc95bb9 100644 --- a/eeschema/dialogs/dialog_erc_base.fbp +++ b/eeschema/dialogs/dialog_erc_base.fbp @@ -62,11 +62,11 @@ bSizer1 wxVERTICAL none - + 5 wxEXPAND 0 - + 1 1 1 @@ -114,7 +114,7 @@ 1 wxSHOW_EFFECT_NONE - WX_INFOBAR; widgets/infobar.h; forward_declare + WX_INFOBAR; widgets/wx_infobar.h; forward_declare 0 @@ -122,20 +122,20 @@ - + 5 wxEXPAND|wxALL 1 - + bMainSizer wxVERTICAL none - + 5 wxEXPAND|wxTOP|wxRIGHT 1 - + 1 1 1 @@ -186,10 +186,10 @@ - + a page 0 - + 1 1 1 @@ -240,16 +240,16 @@ wxTAB_TRAVERSAL - + bSizer14 wxVERTICAL none - + 5 wxEXPAND | wxALL 1 - + 1 1 1 @@ -302,11 +302,11 @@ - + Tests Running... 1 - + 1 1 1 @@ -357,16 +357,16 @@ wxTAB_TRAVERSAL - + bSizer10 wxVERTICAL none - + 5 wxEXPAND|wxTOP|wxRIGHT|wxLEFT 1 - + 1 1 1 @@ -421,20 +421,20 @@ OnLinkClicked - + 5 wxEXPAND|wxRIGHT|wxLEFT 0 - + bGaugeMargins wxVERTICAL none - + 5 wxALL|wxEXPAND 0 - + 1 1 1 @@ -504,10 +504,10 @@ - + a page 1 - + 1 1 1 @@ -558,16 +558,16 @@ wxTAB_TRAVERSAL - + bSizer13 wxVERTICAL none - + 5 wxEXPAND 1 - + 1 1 1 @@ -620,11 +620,11 @@ - + Violations (%s) 0 - + 1 1 1 @@ -675,16 +675,16 @@ wxTAB_TRAVERSAL - + bViolationsSizer wxVERTICAL none - + 5 wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 2 - + 1 @@ -713,11 +713,11 @@ - + Ignored Tests (%s) 0 - + 1 1 1 @@ -768,16 +768,16 @@ wxTAB_TRAVERSAL - + bSizer15 wxVERTICAL none - + 5 wxALL|wxEXPAND 1 - + 1 1 1 @@ -846,20 +846,20 @@ - + 5 wxEXPAND|wxRIGHT|wxLEFT 0 - + bSizer11 wxVERTICAL none - + 5 wxEXPAND|wxALL 0 - + bSeveritySizer wxHORIZONTAL @@ -1471,78 +1471,20 @@ - - 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline1 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - ; ; forward_declare - 0 - - - - - - - + 10 wxEXPAND|wxLEFT 0 - + m_buttonsSizer wxHORIZONTAL protected - + 5 wxALL|wxALIGN_CENTER_VERTICAL 0 - + 1 1 1 @@ -1612,11 +1554,11 @@ OnDeleteOneClick - + 8 wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL 0 - + 1 1 1 @@ -1686,21 +1628,21 @@ OnDeleteAllClick - + 5 wxEXPAND 1 - + 0 protected 0 - + 5 wxEXPAND|wxALL 0 - + 0 1 0 diff --git a/eeschema/dialogs/dialog_erc_base.h b/eeschema/dialogs/dialog_erc_base.h index df8f8ac672..dd5b3d9e29 100644 --- a/eeschema/dialogs/dialog_erc_base.h +++ b/eeschema/dialogs/dialog_erc_base.h @@ -35,7 +35,6 @@ class WX_INFOBAR; #include #include #include -#include #include /////////////////////////////////////////////////////////////////////////// @@ -72,7 +71,6 @@ class DIALOG_ERC_BASE : public DIALOG_SHIM wxCheckBox* m_showExclusions; NUMBER_BADGE* m_exclusionsBadge; wxButton* m_saveReport; - wxStaticLine* m_staticline1; wxBoxSizer* m_buttonsSizer; wxButton* m_deleteOneMarker; wxButton* m_deleteAllMarkers; diff --git a/eeschema/dialogs/dialog_field_properties_base.cpp b/eeschema/dialogs/dialog_field_properties_base.cpp index 15b85828b2..5df67575c7 100644 --- a/eeschema/dialogs/dialog_field_properties_base.cpp +++ b/eeschema/dialogs/dialog_field_properties_base.cpp @@ -306,9 +306,6 @@ DIALOG_FIELD_PROPERTIES_BASE::DIALOG_FIELD_PROPERTIES_BASE( wxWindow* parent, wx bMainSizer->Add( bPropertiesSizer, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bMainSizer->Add( m_staticline2, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); - m_sdbSizerButtons = new wxStdDialogButtonSizer(); m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK ); diff --git a/eeschema/dialogs/dialog_field_properties_base.fbp b/eeschema/dialogs/dialog_field_properties_base.fbp index 2a53b1ad29..14f02c554e 100644 --- a/eeschema/dialogs/dialog_field_properties_base.fbp +++ b/eeschema/dialogs/dialog_field_properties_base.fbp @@ -2907,64 +2907,6 @@ - - 10 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline2 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - ; forward_declare - 0 - - - - - - 5 wxEXPAND|wxALL diff --git a/eeschema/dialogs/dialog_field_properties_base.h b/eeschema/dialogs/dialog_field_properties_base.h index 6451f7f539..b0706e4a33 100644 --- a/eeschema/dialogs/dialog_field_properties_base.h +++ b/eeschema/dialogs/dialog_field_properties_base.h @@ -33,7 +33,6 @@ class FONT_CHOICE; #include #include #include -#include #include /////////////////////////////////////////////////////////////////////////// @@ -85,7 +84,6 @@ class DIALOG_FIELD_PROPERTIES_BASE : public DIALOG_SHIM wxStaticText* m_yPosUnits; wxCheckBox* m_CommonUnit; wxCheckBox* m_CommonConvert; - wxStaticLine* m_staticline2; wxStdDialogButtonSizer* m_sdbSizerButtons; wxButton* m_sdbSizerButtonsOK; wxButton* m_sdbSizerButtonsCancel; diff --git a/eeschema/dialogs/dialog_image_properties_base.cpp b/eeschema/dialogs/dialog_image_properties_base.cpp index a206e89f5d..ca106077e3 100644 --- a/eeschema/dialogs/dialog_image_properties_base.cpp +++ b/eeschema/dialogs/dialog_image_properties_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-133-g388db8e4) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -67,12 +67,6 @@ DIALOG_IMAGE_PROPERTIES_BASE::DIALOG_IMAGE_PROPERTIES_BASE( wxWindow* parent, wx m_GeneralBoxSizer->Add( m_Notebook, 1, wxEXPAND | wxALL, 5 ); - wxBoxSizer* bSizerButtons; - bSizerButtons = new wxBoxSizer( wxHORIZONTAL ); - - - bSizerButtons->Add( 0, 0, 1, wxEXPAND, 5 ); - m_sdbSizerStdButtons = new wxStdDialogButtonSizer(); m_sdbSizerStdButtonsOK = new wxButton( this, wxID_OK ); m_sdbSizerStdButtons->AddButton( m_sdbSizerStdButtonsOK ); @@ -80,10 +74,7 @@ DIALOG_IMAGE_PROPERTIES_BASE::DIALOG_IMAGE_PROPERTIES_BASE( wxWindow* parent, wx m_sdbSizerStdButtons->AddButton( m_sdbSizerStdButtonsCancel ); m_sdbSizerStdButtons->Realize(); - bSizerButtons->Add( m_sdbSizerStdButtons, 0, wxALL, 5 ); - - - m_GeneralBoxSizer->Add( bSizerButtons, 0, wxEXPAND, 5 ); + m_GeneralBoxSizer->Add( m_sdbSizerStdButtons, 0, wxALL|wxEXPAND, 5 ); this->SetSizer( m_GeneralBoxSizer ); diff --git a/eeschema/dialogs/dialog_image_properties_base.fbp b/eeschema/dialogs/dialog_image_properties_base.fbp index bf8fa547fa..12aac7b0b3 100644 --- a/eeschema/dialogs/dialog_image_properties_base.fbp +++ b/eeschema/dialogs/dialog_image_properties_base.fbp @@ -36,7 +36,6 @@ wxBOTH 1 - 0 1 impl_virtual @@ -62,11 +61,11 @@ m_GeneralBoxSizer wxVERTICAL none - + 5 wxEXPAND | wxALL 1 - + 1 1 1 @@ -88,7 +87,6 @@ Dock 0 Left - 0 1 1 @@ -120,11 +118,11 @@ - + General 0 - + 1 1 1 @@ -145,7 +143,6 @@ Dock 0 Left - 0 1 1 @@ -234,7 +231,6 @@ Dock 0 Left - 0 1 1 @@ -296,7 +292,6 @@ Dock 0 Left - 0 1 1 @@ -361,7 +356,6 @@ Dock 0 Left - 0 1 1 @@ -423,7 +417,6 @@ Dock 0 Left - 0 1 1 @@ -485,7 +478,6 @@ Dock 0 Left - 0 1 1 @@ -550,7 +542,6 @@ Dock 0 Left - 0 1 1 @@ -596,43 +587,22 @@ - + 5 - wxEXPAND + wxALL|wxEXPAND 0 - + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 - bSizerButtons - wxHORIZONTAL - none - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALL - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizerStdButtons - protected - - + m_sdbSizerStdButtons + protected diff --git a/eeschema/dialogs/dialog_image_properties_base.h b/eeschema/dialogs/dialog_image_properties_base.h index 42ed689fae..999c46ec22 100644 --- a/eeschema/dialogs/dialog_image_properties_base.h +++ b/eeschema/dialogs/dialog_image_properties_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-133-g388db8e4) +// 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_junction_props_base.cpp b/eeschema/dialogs/dialog_junction_props_base.cpp index 279a458d6a..8e2cb3317c 100644 --- a/eeschema/dialogs/dialog_junction_props_base.cpp +++ b/eeschema/dialogs/dialog_junction_props_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! @@ -66,9 +66,6 @@ DIALOG_JUNCTION_PROPS_BASE::DIALOG_JUNCTION_PROPS_BASE( wxWindow* parent, wxWind m_helpLabel2->Wrap( -1 ); bSizer2->Add( m_helpLabel2, 0, wxBOTTOM|wxRIGHT|wxLEFT, 10 ); - m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bSizer2->Add( m_staticline2, 0, wxEXPAND | wxALL, 5 ); - m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); @@ -78,7 +75,7 @@ DIALOG_JUNCTION_PROPS_BASE::DIALOG_JUNCTION_PROPS_BASE( wxWindow* parent, wxWind m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); - bSizer2->Add( m_sdbSizer, 0, wxBOTTOM|wxEXPAND, 5 ); + bSizer2->Add( m_sdbSizer, 0, wxBOTTOM|wxEXPAND|wxTOP, 5 ); this->SetSizer( bSizer2 ); diff --git a/eeschema/dialogs/dialog_junction_props_base.fbp b/eeschema/dialogs/dialog_junction_props_base.fbp index ebc0720b74..98dc2297bf 100644 --- a/eeschema/dialogs/dialog_junction_props_base.fbp +++ b/eeschema/dialogs/dialog_junction_props_base.fbp @@ -1,6 +1,6 @@ - + ; C++ @@ -14,6 +14,7 @@ dialog_junction_props_base 1000 none + 1 dialog_junction_props_base @@ -25,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -50,6 +52,7 @@ DIALOG_SHIM; dialog_shim.h; forward_declare Junction Properties + 0 @@ -490,7 +493,7 @@ 0 0 wxID_ANY - Set diameter to 0 to use schematic's junction dot size. + Set diameter to 0 to use schematic's junction dot size. 0 0 @@ -582,65 +585,7 @@ 5 - wxEXPAND | wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline2 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - ; ; forward_declare - 0 - - - - - - - - 5 - wxBOTTOM|wxEXPAND + wxBOTTOM|wxEXPAND|wxTOP 0 1 diff --git a/eeschema/dialogs/dialog_junction_props_base.h b/eeschema/dialogs/dialog_junction_props_base.h index 0577729ea2..8a8c26fb11 100644 --- a/eeschema/dialogs/dialog_junction_props_base.h +++ b/eeschema/dialogs/dialog_junction_props_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! @@ -22,7 +22,6 @@ class COLOR_SWATCH; #include #include #include -#include #include #include @@ -44,19 +43,19 @@ class DIALOG_JUNCTION_PROPS_BASE : public DIALOG_SHIM COLOR_SWATCH* m_colorSwatch; wxStaticText* m_helpLabel1; wxStaticText* m_helpLabel2; - wxStaticLine* m_staticline2; wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK; wxButton* m_sdbSizerApply; wxButton* m_sdbSizerCancel; - // Virtual event handlers, overide them in your derived class + // Virtual event handlers, override them in your derived class virtual void resetDefaults( wxCommandEvent& event ) { event.Skip(); } public: DIALOG_JUNCTION_PROPS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Junction Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_JUNCTION_PROPS_BASE(); }; diff --git a/eeschema/dialogs/dialog_label_properties_base.cpp b/eeschema/dialogs/dialog_label_properties_base.cpp index dd196fc221..88c30f7166 100644 --- a/eeschema/dialogs/dialog_label_properties_base.cpp +++ b/eeschema/dialogs/dialog_label_properties_base.cpp @@ -177,7 +177,7 @@ DIALOG_LABEL_PROPERTIES_BASE::DIALOG_LABEL_PROPERTIES_BASE( wxWindow* parent, wx m_shapeSizer->Add( m_rectangle, 0, wxBOTTOM|wxRIGHT, 3 ); - optionsSizer->Add( m_shapeSizer, 0, wxEXPAND|wxTOP|wxRIGHT, 5 ); + optionsSizer->Add( m_shapeSizer, 0, wxBOTTOM|wxEXPAND|wxRIGHT|wxTOP, 5 ); wxStaticBoxSizer* formatting; formatting = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Formatting") ), wxVERTICAL ); @@ -188,7 +188,7 @@ DIALOG_LABEL_PROPERTIES_BASE::DIALOG_LABEL_PROPERTIES_BASE( wxWindow* parent, wx m_fontLabel = new wxStaticText( formatting->GetStaticBox(), wxID_ANY, _("Font:"), wxDefaultPosition, wxDefaultSize, 0 ); m_fontLabel->Wrap( -1 ); - m_formattingGB->Add( m_fontLabel, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 ); + m_formattingGB->Add( m_fontLabel, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); wxString m_fontCtrlChoices[] = { _("Default Font"), _("KiCad Font") }; int m_fontCtrlNChoices = sizeof( m_fontCtrlChoices ) / sizeof( wxString ); @@ -243,7 +243,7 @@ DIALOG_LABEL_PROPERTIES_BASE::DIALOG_LABEL_PROPERTIES_BASE( wxWindow* parent, wx m_textSizeLabel = new wxStaticText( formatting->GetStaticBox(), wxID_ANY, _("Text size:"), wxDefaultPosition, wxDefaultSize, 0 ); m_textSizeLabel->Wrap( -1 ); - m_formattingGB->Add( m_textSizeLabel, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + m_formattingGB->Add( m_textSizeLabel, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); wxBoxSizer* bSizer71; bSizer71 = new wxBoxSizer( wxHORIZONTAL ); @@ -282,14 +282,11 @@ DIALOG_LABEL_PROPERTIES_BASE::DIALOG_LABEL_PROPERTIES_BASE( wxWindow* parent, wx formatting->Add( m_formattingGB, 1, wxEXPAND, 5 ); - optionsSizer->Add( formatting, 1, wxEXPAND|wxTOP, 5 ); + optionsSizer->Add( formatting, 1, wxBOTTOM|wxEXPAND|wxTOP, 5 ); bMainSizer->Add( optionsSizer, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - wxBoxSizer* bSizer4; - bSizer4 = new wxBoxSizer( wxHORIZONTAL ); - m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); @@ -297,10 +294,7 @@ DIALOG_LABEL_PROPERTIES_BASE::DIALOG_LABEL_PROPERTIES_BASE( wxWindow* parent, wx m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); - bSizer4->Add( m_sdbSizer1, 1, wxALL|wxEXPAND, 5 ); - - - bMainSizer->Add( bSizer4, 0, wxEXPAND, 5 ); + bMainSizer->Add( m_sdbSizer1, 0, wxBOTTOM|wxEXPAND|wxTOP, 5 ); this->SetSizer( bMainSizer ); diff --git a/eeschema/dialogs/dialog_label_properties_base.fbp b/eeschema/dialogs/dialog_label_properties_base.fbp index 42ed523d9e..dc811373a6 100644 --- a/eeschema/dialogs/dialog_label_properties_base.fbp +++ b/eeschema/dialogs/dialog_label_properties_base.fbp @@ -840,7 +840,7 @@ none 5 - wxEXPAND|wxTOP|wxRIGHT + wxBOTTOM|wxEXPAND|wxRIGHT|wxTOP 0 wxID_ANY @@ -1430,7 +1430,7 @@ 5 - wxEXPAND|wxTOP + wxBOTTOM|wxEXPAND|wxTOP 1 wxID_ANY @@ -1459,7 +1459,7 @@ 5 1 0 - wxRIGHT|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 1 @@ -2325,7 +2325,7 @@ 5 1 0 - wxALIGN_CENTER_VERTICAL|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 1 1 @@ -2728,31 +2728,20 @@ 5 - wxEXPAND + wxBOTTOM|wxEXPAND|wxTOP 0 - + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 - bSizer4 - wxHORIZONTAL - none - - 5 - wxALL|wxEXPAND - 1 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizer1 - protected - - + m_sdbSizer1 + protected diff --git a/eeschema/dialogs/dialog_lib_shape_properties_base.cpp b/eeschema/dialogs/dialog_lib_shape_properties_base.cpp index 21b4b0e42a..a8c9e9670b 100644 --- a/eeschema/dialogs/dialog_lib_shape_properties_base.cpp +++ b/eeschema/dialogs/dialog_lib_shape_properties_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! @@ -33,7 +33,7 @@ DIALOG_LIB_SHAPE_PROPERTIES_BASE::DIALOG_LIB_SHAPE_PROPERTIES_BASE( wxWindow* pa bLeftCol = new wxBoxSizer( wxVERTICAL ); wxGridBagSizer* gbSizer2; - gbSizer2 = new wxGridBagSizer( 0, 0 ); + gbSizer2 = new wxGridBagSizer( 3, 0 ); gbSizer2->SetFlexibleDirection( wxBOTH ); gbSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -152,9 +152,6 @@ DIALOG_LIB_SHAPE_PROPERTIES_BASE::DIALOG_LIB_SHAPE_PROPERTIES_BASE( wxWindow* pa mainSizer->Add( bBottom, 0, wxEXPAND|wxALL, 10 ); - m_staticline = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - mainSizer->Add( m_staticline, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); diff --git a/eeschema/dialogs/dialog_lib_shape_properties_base.fbp b/eeschema/dialogs/dialog_lib_shape_properties_base.fbp index 63777a0c54..b2e97e509d 100644 --- a/eeschema/dialogs/dialog_lib_shape_properties_base.fbp +++ b/eeschema/dialogs/dialog_lib_shape_properties_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ dialog_lib_shape_properties_base 1000 none + 1 dialog_lib_shape_properties @@ -25,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -50,6 +52,7 @@ DIALOG_SHIM; dialog_shim.h Drawing Properties + 0 @@ -90,7 +93,7 @@ gbSizer2 wxFLEX_GROWMODE_SPECIFIED none - 0 + 3 5 2 @@ -1355,64 +1358,6 @@ - - 5 - wxEXPAND|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - ; forward_declare - 0 - - - - - - 5 wxALL|wxEXPAND diff --git a/eeschema/dialogs/dialog_lib_shape_properties_base.h b/eeschema/dialogs/dialog_lib_shape_properties_base.h index f08a3f2e36..2f86d47da9 100644 --- a/eeschema/dialogs/dialog_lib_shape_properties_base.h +++ b/eeschema/dialogs/dialog_lib_shape_properties_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! @@ -27,7 +27,6 @@ class COLOR_SWATCH; #include #include #include -#include #include #include @@ -73,12 +72,11 @@ class DIALOG_LIB_SHAPE_PROPERTIES_BASE : public DIALOG_SHIM wxCheckBox* m_privateCheckbox; wxCheckBox* m_checkApplyToAllUnits; wxCheckBox* m_checkApplyToAllConversions; - wxStaticLine* m_staticline; wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK; wxButton* m_sdbSizerCancel; - // Virtual event handlers, overide them in your derived class + // Virtual event handlers, override them in your derived class virtual void onBorderChecked( wxCommandEvent& event ) { event.Skip(); } virtual void onFill( wxCommandEvent& event ) { event.Skip(); } @@ -86,6 +84,7 @@ class DIALOG_LIB_SHAPE_PROPERTIES_BASE : public DIALOG_SHIM public: DIALOG_LIB_SHAPE_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Drawing Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_LIB_SHAPE_PROPERTIES_BASE(); }; diff --git a/eeschema/dialogs/dialog_lib_text_properties_base.cpp b/eeschema/dialogs/dialog_lib_text_properties_base.cpp index 6d8cd54b1f..bb3113c055 100644 --- a/eeschema/dialogs/dialog_lib_text_properties_base.cpp +++ b/eeschema/dialogs/dialog_lib_text_properties_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! @@ -43,6 +43,7 @@ DIALOG_LIB_TEXT_PROPERTIES_BASE::DIALOG_LIB_TEXT_PROPERTIES_BASE( wxWindow* pare m_StyledTextCtrl->SetViewWhiteSpace( false ); m_StyledTextCtrl->SetMarginWidth( 2, 0 ); m_StyledTextCtrl->SetIndentationGuides( false ); + m_StyledTextCtrl->SetReadOnly( false ); m_StyledTextCtrl->SetMarginWidth( 1, 0 ); m_StyledTextCtrl->SetMarginWidth( 0, 0 ); m_StyledTextCtrl->MarkerDefine( wxSTC_MARKNUM_FOLDER, wxSTC_MARK_BOXPLUS ); @@ -236,9 +237,6 @@ DIALOG_LIB_TEXT_PROPERTIES_BASE::DIALOG_LIB_TEXT_PROPERTIES_BASE( wxWindow* pare bMainSizer->Add( bPropertiesSizer, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bMainSizer->Add( m_staticline2, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); - m_sdbSizerButtons = new wxStdDialogButtonSizer(); m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK ); diff --git a/eeschema/dialogs/dialog_lib_text_properties_base.fbp b/eeschema/dialogs/dialog_lib_text_properties_base.fbp index 036609f281..2fab22e445 100644 --- a/eeschema/dialogs/dialog_lib_text_properties_base.fbp +++ b/eeschema/dialogs/dialog_lib_text_properties_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ dialog_lib_text_properties_base 1000 none + 1 DIALOG_LIB_TEXT_PROPERTIES_BASE @@ -25,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -50,6 +52,7 @@ DIALOG_SHIM; dialog_shim.h Text Item Properties + 0 @@ -200,6 +203,7 @@ protected 1 + 0 Resizable 1 @@ -374,6 +378,7 @@ + 0 @@ -446,6 +451,7 @@ + 0 @@ -518,6 +524,7 @@ + 0 @@ -590,6 +597,7 @@ + 0 @@ -662,6 +670,7 @@ + 0 @@ -734,6 +743,7 @@ + 0 @@ -806,6 +816,7 @@ + 0 @@ -878,6 +889,7 @@ + 0 @@ -950,6 +962,7 @@ + 0 @@ -1022,6 +1035,7 @@ + 0 @@ -1094,6 +1108,7 @@ + 0 @@ -1166,6 +1181,7 @@ + 0 @@ -1238,6 +1254,7 @@ + 0 @@ -1310,6 +1327,7 @@ + 0 @@ -1382,6 +1400,7 @@ + 0 @@ -2126,64 +2145,6 @@ - - 10 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline2 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - ; forward_declare - 0 - - - - - - 5 wxEXPAND|wxALL diff --git a/eeschema/dialogs/dialog_lib_text_properties_base.h b/eeschema/dialogs/dialog_lib_text_properties_base.h index 392f2249ab..18d70bb573 100644 --- a/eeschema/dialogs/dialog_lib_text_properties_base.h +++ b/eeschema/dialogs/dialog_lib_text_properties_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! @@ -33,7 +33,6 @@ class FONT_CHOICE; #include #include #include -#include #include /////////////////////////////////////////////////////////////////////////// @@ -74,12 +73,11 @@ class DIALOG_LIB_TEXT_PROPERTIES_BASE : public DIALOG_SHIM wxCheckBox* m_privateCheckbox; wxCheckBox* m_CommonUnit; wxCheckBox* m_CommonConvert; - wxStaticLine* m_staticline2; wxStdDialogButtonSizer* m_sdbSizerButtons; wxButton* m_sdbSizerButtonsOK; wxButton* m_sdbSizerButtonsCancel; - // Virtual event handlers, overide them in your derived class + // Virtual event handlers, override them in your derived class virtual void OnCloseDialog( wxCloseEvent& event ) { event.Skip(); } virtual void onMultiLineTCLostFocus( wxFocusEvent& event ) { event.Skip(); } virtual void OnSetFocusText( wxFocusEvent& event ) { event.Skip(); } @@ -88,6 +86,7 @@ class DIALOG_LIB_TEXT_PROPERTIES_BASE : public DIALOG_SHIM public: DIALOG_LIB_TEXT_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Text Item Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_LIB_TEXT_PROPERTIES_BASE(); }; diff --git a/eeschema/dialogs/dialog_lib_textbox_properties_base.cpp b/eeschema/dialogs/dialog_lib_textbox_properties_base.cpp index 0bcf9a41e6..a910cdc6d0 100644 --- a/eeschema/dialogs/dialog_lib_textbox_properties_base.cpp +++ b/eeschema/dialogs/dialog_lib_textbox_properties_base.cpp @@ -294,13 +294,7 @@ DIALOG_LIB_TEXTBOX_PROPERTIES_BASE::DIALOG_LIB_TEXTBOX_PROPERTIES_BASE( wxWindow m_textEntrySizer->AddGrowableCol( 3 ); - bMainSizer->Add( m_textEntrySizer, 1, wxEXPAND|wxALL, 10 ); - - m_staticline = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bMainSizer->Add( m_staticline, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - - wxBoxSizer* bSizer4; - bSizer4 = new wxBoxSizer( wxHORIZONTAL ); + bMainSizer->Add( m_textEntrySizer, 1, wxALL|wxEXPAND, 10 ); m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); @@ -309,10 +303,7 @@ DIALOG_LIB_TEXTBOX_PROPERTIES_BASE::DIALOG_LIB_TEXTBOX_PROPERTIES_BASE( wxWindow m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); - bSizer4->Add( m_sdbSizer1, 1, wxALL|wxEXPAND, 5 ); - - - bMainSizer->Add( bSizer4, 0, wxEXPAND|wxALL, 5 ); + bMainSizer->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 ); this->SetSizer( bMainSizer ); diff --git a/eeschema/dialogs/dialog_lib_textbox_properties_base.fbp b/eeschema/dialogs/dialog_lib_textbox_properties_base.fbp index 34d1fb053e..03ed293d95 100644 --- a/eeschema/dialogs/dialog_lib_textbox_properties_base.fbp +++ b/eeschema/dialogs/dialog_lib_textbox_properties_base.fbp @@ -63,7 +63,7 @@ none 10 - wxEXPAND|wxALL + wxALL|wxEXPAND 1 -1,-1 @@ -3026,89 +3026,20 @@ 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxALL|wxEXPAND 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 - 1 - m_staticline - 1 - - + m_sdbSizer1 protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - ; ; forward_declare - 0 - - - - - - - - 5 - wxEXPAND|wxALL - 0 - - - bSizer4 - wxHORIZONTAL - none - - 5 - wxALL|wxEXPAND - 1 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizer1 - protected - - diff --git a/eeschema/dialogs/dialog_lib_textbox_properties_base.h b/eeschema/dialogs/dialog_lib_textbox_properties_base.h index 495721714a..72256f882f 100644 --- a/eeschema/dialogs/dialog_lib_textbox_properties_base.h +++ b/eeschema/dialogs/dialog_lib_textbox_properties_base.h @@ -35,7 +35,6 @@ class FONT_CHOICE; #include #include #include -#include #include /////////////////////////////////////////////////////////////////////////// @@ -91,7 +90,6 @@ class DIALOG_LIB_TEXTBOX_PROPERTIES_BASE : public DIALOG_SHIM wxCheckBox* m_privateCheckbox; wxCheckBox* m_CommonUnit; wxCheckBox* m_CommonConvert; - wxStaticLine* m_staticline; wxStdDialogButtonSizer* m_sdbSizer1; wxButton* m_sdbSizer1OK; wxButton* m_sdbSizer1Cancel; diff --git a/eeschema/dialogs/dialog_line_properties_base.cpp b/eeschema/dialogs/dialog_line_properties_base.cpp index 9f8ddddf8a..930da8c59f 100644 --- a/eeschema/dialogs/dialog_line_properties_base.cpp +++ b/eeschema/dialogs/dialog_line_properties_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -85,10 +85,7 @@ DIALOG_LINE_PROPERTIES_BASE::DIALOG_LINE_PROPERTIES_BASE( wxWindow* parent, wxWi bSizer3->Add( m_helpLabel2, 0, wxRIGHT|wxLEFT, 10 ); - mainSizer->Add( bSizer3, 0, wxEXPAND|wxTOP, 5 ); - - m_staticline = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - mainSizer->Add( m_staticline, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + mainSizer->Add( bSizer3, 0, wxBOTTOM|wxEXPAND|wxTOP, 5 ); m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); @@ -99,11 +96,12 @@ DIALOG_LINE_PROPERTIES_BASE::DIALOG_LINE_PROPERTIES_BASE( wxWindow* parent, wxWi m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); - mainSizer->Add( m_sdbSizer, 0, wxALL|wxALIGN_RIGHT, 5 ); + mainSizer->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 5 ); this->SetSizer( mainSizer ); this->Layout(); + mainSizer->Fit( this ); this->Centre( wxBOTH ); } diff --git a/eeschema/dialogs/dialog_line_properties_base.fbp b/eeschema/dialogs/dialog_line_properties_base.fbp index 7c4980e923..c5e926f1cf 100644 --- a/eeschema/dialogs/dialog_line_properties_base.fbp +++ b/eeschema/dialogs/dialog_line_properties_base.fbp @@ -47,7 +47,7 @@ DIALOG_LINE_PROPERTIES_BASE - 412,182 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h Line Properties @@ -599,7 +599,7 @@ 5 - wxEXPAND|wxTOP + wxBOTTOM|wxEXPAND|wxTOP 0 @@ -732,65 +732,7 @@ 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - - 0 - - - - - - - - 5 - wxALL|wxALIGN_RIGHT + wxALL|wxEXPAND 0 1 diff --git a/eeschema/dialogs/dialog_line_properties_base.h b/eeschema/dialogs/dialog_line_properties_base.h index 9573133b2b..5ce2ea3069 100644 --- a/eeschema/dialogs/dialog_line_properties_base.h +++ b/eeschema/dialogs/dialog_line_properties_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -24,7 +24,6 @@ class COLOR_SWATCH; #include #include #include -#include #include #include @@ -53,7 +52,6 @@ class DIALOG_LINE_PROPERTIES_BASE : public DIALOG_SHIM wxBitmapComboBox* m_typeCombo; wxStaticText* m_helpLabel1; wxStaticText* m_helpLabel2; - wxStaticLine* m_staticline; wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK; wxButton* m_sdbSizerApply; @@ -65,7 +63,7 @@ class DIALOG_LINE_PROPERTIES_BASE : public DIALOG_SHIM public: - DIALOG_LINE_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Line Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 412,182 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_LINE_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Line Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_LINE_PROPERTIES_BASE(); diff --git a/eeschema/dialogs/dialog_migrate_buses_base.cpp b/eeschema/dialogs/dialog_migrate_buses_base.cpp index 1531522535..bce79c2649 100644 --- a/eeschema/dialogs/dialog_migrate_buses_base.cpp +++ b/eeschema/dialogs/dialog_migrate_buses_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! @@ -48,9 +48,6 @@ DIALOG_MIGRATE_BUSES_BASE::DIALOG_MIGRATE_BUSES_BASE( wxWindow* parent, wxWindow main_sizer->Add( bSizer7, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - main_sizer->Add( m_staticline1, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 ); - m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); diff --git a/eeschema/dialogs/dialog_migrate_buses_base.fbp b/eeschema/dialogs/dialog_migrate_buses_base.fbp index e2701ca6b8..791839e967 100644 --- a/eeschema/dialogs/dialog_migrate_buses_base.fbp +++ b/eeschema/dialogs/dialog_migrate_buses_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ dialog_migrate_buses_base 1000 none + 1 DIALOG_MIGRATE_BUSES_BASE @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -50,6 +52,7 @@ DIALOG_SHIM; dialog_shim.h Migrate Buses + 0 @@ -390,6 +393,7 @@ + 0 @@ -451,64 +455,6 @@ - - 10 - wxEXPAND|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline1 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - ; ; forward_declare - 0 - - - - - - 5 wxEXPAND|wxALL diff --git a/eeschema/dialogs/dialog_migrate_buses_base.h b/eeschema/dialogs/dialog_migrate_buses_base.h index e58542dc0d..19845c5a9f 100644 --- a/eeschema/dialogs/dialog_migrate_buses_base.h +++ b/eeschema/dialogs/dialog_migrate_buses_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! @@ -10,6 +10,8 @@ #include #include #include +class wxListView; + #include "dialog_shim.h" #include #include @@ -19,12 +21,11 @@ #include #include #include +#include #include #include #include -#include #include -#include #include /////////////////////////////////////////////////////////////////////////// @@ -44,13 +45,13 @@ class DIALOG_MIGRATE_BUSES_BASE : public DIALOG_SHIM wxStaticText* m_staticText6; wxComboBox* m_cb_new_name; wxButton* m_btn_accept; - wxStaticLine* m_staticline1; wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK; public: DIALOG_MIGRATE_BUSES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Migrate Buses"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); + ~DIALOG_MIGRATE_BUSES_BASE(); }; diff --git a/eeschema/dialogs/dialog_pin_properties_base.cpp b/eeschema/dialogs/dialog_pin_properties_base.cpp index 5ada6ea9c6..df1b19bdd6 100644 --- a/eeschema/dialogs/dialog_pin_properties_base.cpp +++ b/eeschema/dialogs/dialog_pin_properties_base.cpp @@ -7,9 +7,9 @@ #include "pin_shape_combobox.h" #include "pin_type_combobox.h" -#include "widgets/wx_infobar.h" #include "widgets/std_bitmap_button.h" #include "widgets/wx_grid.h" +#include "widgets/wx_infobar.h" #include "wx/bmpcbox.h" #include "dialog_pin_properties_base.h" @@ -255,9 +255,6 @@ DIALOG_PIN_PROPERTIES_BASE::DIALOG_PIN_PROPERTIES_BASE( wxWindow* parent, wxWind mainSizer->Add( bLowerSizer, 1, wxEXPAND|wxLEFT, 10 ); - m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - mainSizer->Add( m_staticline1, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - m_sdbSizerButtons = new wxStdDialogButtonSizer(); m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK ); @@ -265,7 +262,7 @@ DIALOG_PIN_PROPERTIES_BASE::DIALOG_PIN_PROPERTIES_BASE( wxWindow* parent, wxWind m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel ); m_sdbSizerButtons->Realize(); - mainSizer->Add( m_sdbSizerButtons, 0, wxALL|wxALIGN_RIGHT, 5 ); + mainSizer->Add( m_sdbSizerButtons, 0, wxALL|wxEXPAND, 5 ); this->SetSizer( mainSizer ); diff --git a/eeschema/dialogs/dialog_pin_properties_base.fbp b/eeschema/dialogs/dialog_pin_properties_base.fbp index f3e58b912b..6166e64370 100644 --- a/eeschema/dialogs/dialog_pin_properties_base.fbp +++ b/eeschema/dialogs/dialog_pin_properties_base.fbp @@ -115,7 +115,7 @@ 1 wxSHOW_EFFECT_NONE - WX_INFOBAR; widgets/infobar.h; forward_declare + WX_INFOBAR; widgets/wx_infobar.h; forward_declare 0 @@ -2500,65 +2500,7 @@ 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline1 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - - 0 - - - - - - - - 5 - wxALL|wxALIGN_RIGHT + wxALL|wxEXPAND 0 0 diff --git a/eeschema/dialogs/dialog_pin_properties_base.h b/eeschema/dialogs/dialog_pin_properties_base.h index 2fe8ff6da4..1466cdfed0 100644 --- a/eeschema/dialogs/dialog_pin_properties_base.h +++ b/eeschema/dialogs/dialog_pin_properties_base.h @@ -38,7 +38,6 @@ class wxBitmapComboBox; #include #include #include -#include #include /////////////////////////////////////////////////////////////////////////// @@ -86,7 +85,6 @@ class DIALOG_PIN_PROPERTIES_BASE : public DIALOG_SHIM WX_GRID* m_alternatesGrid; STD_BITMAP_BUTTON* m_addAlternate; STD_BITMAP_BUTTON* m_deleteAlternate; - wxStaticLine* m_staticline1; wxStdDialogButtonSizer* m_sdbSizerButtons; wxButton* m_sdbSizerButtonsOK; wxButton* m_sdbSizerButtonsCancel; diff --git a/eeschema/dialogs/dialog_print_using_printer_base.cpp b/eeschema/dialogs/dialog_print_using_printer_base.cpp index 1001bc8bbb..d43367746f 100644 --- a/eeschema/dialogs/dialog_print_using_printer_base.cpp +++ b/eeschema/dialogs/dialog_print_using_printer_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! @@ -53,9 +53,6 @@ DIALOG_PRINT_USING_PRINTER_BASE::DIALOG_PRINT_USING_PRINTER_BASE( wxWindow* pare bMainSizer->Add( bleftSizer, 1, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 10 ); - m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bMainSizer->Add( m_staticline1, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - wxBoxSizer* bbuttonsSizer; bbuttonsSizer = new wxBoxSizer( wxHORIZONTAL ); @@ -63,7 +60,7 @@ DIALOG_PRINT_USING_PRINTER_BASE::DIALOG_PRINT_USING_PRINTER_BASE( wxWindow* pare bbuttonsSizer->Add( m_buttonPageSetup, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - bbuttonsSizer->Add( 40, 0, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + bbuttonsSizer->Add( 0, 0, 1, wxEXPAND, 5 ); m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); @@ -74,10 +71,10 @@ DIALOG_PRINT_USING_PRINTER_BASE::DIALOG_PRINT_USING_PRINTER_BASE( wxWindow* pare m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); - bbuttonsSizer->Add( m_sdbSizer1, 0, wxALL, 5 ); + bbuttonsSizer->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 ); - bMainSizer->Add( bbuttonsSizer, 0, wxEXPAND|wxLEFT, 10 ); + bMainSizer->Add( bbuttonsSizer, 0, wxEXPAND|wxLEFT|wxTOP, 10 ); this->SetSizer( bMainSizer ); diff --git a/eeschema/dialogs/dialog_print_using_printer_base.fbp b/eeschema/dialogs/dialog_print_using_printer_base.fbp index 6d2cefbd37..cb849f8424 100644 --- a/eeschema/dialogs/dialog_print_using_printer_base.fbp +++ b/eeschema/dialogs/dialog_print_using_printer_base.fbp @@ -406,67 +406,9 @@ - - 5 - wxEXPAND|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline1 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - ; forward_declare - 0 - - - - - - 10 - wxEXPAND|wxLEFT + wxEXPAND|wxLEFT|wxTOP 0 @@ -549,17 +491,17 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND 1 0 protected - 40 + 0 5 - wxALL + wxALL|wxEXPAND 0 1 diff --git a/eeschema/dialogs/dialog_print_using_printer_base.h b/eeschema/dialogs/dialog_print_using_printer_base.h index 3ee4a012e3..ae9d7a72c7 100644 --- a/eeschema/dialogs/dialog_print_using_printer_base.h +++ b/eeschema/dialogs/dialog_print_using_printer_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! @@ -19,11 +19,10 @@ #include #include #include -#include +#include #include #include #include -#include #include /////////////////////////////////////////////////////////////////////////// @@ -41,14 +40,13 @@ class DIALOG_PRINT_USING_PRINTER_BASE : public DIALOG_SHIM wxCheckBox* m_checkBackgroundColor; wxCheckBox* m_checkUseColorTheme; wxChoice* m_colorTheme; - wxStaticLine* m_staticline1; wxButton* m_buttonPageSetup; wxStdDialogButtonSizer* m_sdbSizer1; wxButton* m_sdbSizer1OK; wxButton* m_sdbSizer1Apply; wxButton* m_sdbSizer1Cancel; - // Virtual event handlers, overide them in your derived class + // Virtual event handlers, override them in your derived class virtual void OnCloseWindow( wxCloseEvent& event ) { event.Skip(); } virtual void OnMonochromeChecked( wxCommandEvent& event ) { event.Skip(); } virtual void OnUseColorThemeChecked( wxCommandEvent& event ) { event.Skip(); } @@ -59,6 +57,7 @@ class DIALOG_PRINT_USING_PRINTER_BASE : public DIALOG_SHIM public: DIALOG_PRINT_USING_PRINTER_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Print"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_PRINT_USING_PRINTER_BASE(); }; diff --git a/eeschema/dialogs/dialog_shape_properties_base.cpp b/eeschema/dialogs/dialog_shape_properties_base.cpp index 900358a560..b1a0a24172 100644 --- a/eeschema/dialogs/dialog_shape_properties_base.cpp +++ b/eeschema/dialogs/dialog_shape_properties_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! @@ -128,10 +128,7 @@ DIALOG_SHAPE_PROPERTIES_BASE::DIALOG_SHAPE_PROPERTIES_BASE( wxWindow* parent, wx bSizer12->Add( m_helpLabel2, 0, wxBOTTOM|wxRIGHT|wxLEFT, 10 ); - mainSizer->Add( bSizer12, 0, wxEXPAND, 5 ); - - m_staticline = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - mainSizer->Add( m_staticline, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + mainSizer->Add( bSizer12, 0, wxBOTTOM|wxEXPAND, 5 ); m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); @@ -140,7 +137,7 @@ DIALOG_SHAPE_PROPERTIES_BASE::DIALOG_SHAPE_PROPERTIES_BASE( wxWindow* parent, wx m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); - mainSizer->Add( m_sdbSizer, 0, wxALL|wxALIGN_RIGHT, 5 ); + mainSizer->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 5 ); this->SetSizer( mainSizer ); diff --git a/eeschema/dialogs/dialog_shape_properties_base.fbp b/eeschema/dialogs/dialog_shape_properties_base.fbp index ab9655c102..405e741e37 100644 --- a/eeschema/dialogs/dialog_shape_properties_base.fbp +++ b/eeschema/dialogs/dialog_shape_properties_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ dialog_shape_properties_base 1000 none + 1 dialog_shape_properties @@ -25,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -50,6 +52,7 @@ DIALOG_SHIM; dialog_shim.h %s Properties + 0 @@ -110,7 +113,7 @@ 1 wxSHOW_EFFECT_NONE - WX_INFOBAR; widgets/infobar.h; forward_declare + WX_INFOBAR; widgets/wx_infobar.h; forward_declare 0 @@ -1004,7 +1007,7 @@ 5 - wxEXPAND + wxBOTTOM|wxEXPAND 0 @@ -1137,65 +1140,7 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - - 0 - - - - - - - - 5 - wxALL|wxALIGN_RIGHT + wxALL|wxEXPAND 0 0 diff --git a/eeschema/dialogs/dialog_shape_properties_base.h b/eeschema/dialogs/dialog_shape_properties_base.h index 88b739baac..7bdf4e08a4 100644 --- a/eeschema/dialogs/dialog_shape_properties_base.h +++ b/eeschema/dialogs/dialog_shape_properties_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! @@ -27,7 +27,6 @@ class WX_INFOBAR; #include #include #include -#include #include #include @@ -64,12 +63,11 @@ class DIALOG_SHAPE_PROPERTIES_BASE : public DIALOG_SHIM COLOR_SWATCH* m_fillColorSwatch; wxStaticText* m_helpLabel1; wxStaticText* m_helpLabel2; - wxStaticLine* m_staticline; wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK; wxButton* m_sdbSizerCancel; - // Virtual event handlers, overide them in your derived class + // Virtual event handlers, override them in your derived class virtual void onBorderChecked( wxCommandEvent& event ) { event.Skip(); } virtual void onFillChecked( wxCommandEvent& event ) { event.Skip(); } @@ -77,6 +75,7 @@ class DIALOG_SHAPE_PROPERTIES_BASE : public DIALOG_SHIM public: DIALOG_SHAPE_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("%s Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_SHAPE_PROPERTIES_BASE(); }; diff --git a/eeschema/dialogs/dialog_sheet_pin_properties_base.cpp b/eeschema/dialogs/dialog_sheet_pin_properties_base.cpp index f4840e1462..f4ac2342a8 100644 --- a/eeschema/dialogs/dialog_sheet_pin_properties_base.cpp +++ b/eeschema/dialogs/dialog_sheet_pin_properties_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! @@ -80,7 +80,7 @@ DIALOG_SHEET_PIN_PROPERTIES_BASE::DIALOG_SHEET_PIN_PROPERTIES_BASE( wxWindow* pa m_fontLabel = new wxStaticText( formatting->GetStaticBox(), wxID_ANY, _("Font:"), wxDefaultPosition, wxDefaultSize, 0 ); m_fontLabel->Wrap( -1 ); - gbSizer1->Add( m_fontLabel, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 ); + gbSizer1->Add( m_fontLabel, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); wxString m_fontCtrlChoices[] = { _("Default Font"), _("KiCad Font") }; int m_fontCtrlNChoices = sizeof( m_fontCtrlChoices ) / sizeof( wxString ); @@ -116,7 +116,7 @@ DIALOG_SHEET_PIN_PROPERTIES_BASE::DIALOG_SHEET_PIN_PROPERTIES_BASE( wxWindow* pa m_textSizeLabel = new wxStaticText( formatting->GetStaticBox(), wxID_ANY, _("Text size:"), wxDefaultPosition, wxDefaultSize, 0 ); m_textSizeLabel->Wrap( -1 ); - gbSizer1->Add( m_textSizeLabel, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + gbSizer1->Add( m_textSizeLabel, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); wxBoxSizer* bSizer71; bSizer71 = new wxBoxSizer( wxHORIZONTAL ); @@ -163,9 +163,6 @@ DIALOG_SHEET_PIN_PROPERTIES_BASE::DIALOG_SHEET_PIN_PROPERTIES_BASE( wxWindow* pa m_mainSizer->Add( m_nameSizer, 1, wxALL|wxEXPAND, 10 ); - m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - m_mainSizer->Add( m_staticline2, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); diff --git a/eeschema/dialogs/dialog_sheet_pin_properties_base.fbp b/eeschema/dialogs/dialog_sheet_pin_properties_base.fbp index 344fc355f9..bff1b02344 100644 --- a/eeschema/dialogs/dialog_sheet_pin_properties_base.fbp +++ b/eeschema/dialogs/dialog_sheet_pin_properties_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ dialog_sheet_pin_properties_base 1000 none + 1 dialog_sheet_pin_properties @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -50,6 +52,7 @@ DIALOG_SHIM; dialog_shim.h Sheet Pin Properties + 0 @@ -660,7 +663,7 @@ 5 1 0 - wxRIGHT|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 1 @@ -812,6 +815,7 @@ + 0 @@ -884,6 +888,7 @@ + 0 @@ -956,6 +961,7 @@ + 0 @@ -1028,6 +1034,7 @@ + 0 @@ -1093,7 +1100,7 @@ 5 1 0 - wxALIGN_CENTER_VERTICAL|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 1 1 @@ -1496,64 +1503,6 @@ - - 5 - wxEXPAND|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline2 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - ; ; forward_declare - 0 - - - - - - 6 wxALL|wxEXPAND diff --git a/eeschema/dialogs/dialog_sheet_pin_properties_base.h b/eeschema/dialogs/dialog_sheet_pin_properties_base.h index acbcd3611a..e785cceb74 100644 --- a/eeschema/dialogs/dialog_sheet_pin_properties_base.h +++ b/eeschema/dialogs/dialog_sheet_pin_properties_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! @@ -35,7 +35,6 @@ class FONT_CHOICE; #include #include #include -#include #include /////////////////////////////////////////////////////////////////////////// @@ -70,12 +69,11 @@ class DIALOG_SHEET_PIN_PROPERTIES_BASE : public DIALOG_SHIM wxStaticText* m_textColorLabel; wxPanel* m_panelBorderColor1; COLOR_SWATCH* m_textColorSwatch; - wxStaticLine* m_staticline2; wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK; wxButton* m_sdbSizerCancel; - // Virtual event handlers, overide them in your derived class + // Virtual event handlers, override them in your derived class virtual void onComboBox( wxCommandEvent& event ) { event.Skip(); } virtual void OnSyntaxHelp( wxHyperlinkEvent& event ) { event.Skip(); } virtual void onOKButton( wxCommandEvent& event ) { event.Skip(); } @@ -84,6 +82,7 @@ class DIALOG_SHEET_PIN_PROPERTIES_BASE : public DIALOG_SHIM public: DIALOG_SHEET_PIN_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Sheet Pin Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_SHEET_PIN_PROPERTIES_BASE(); }; diff --git a/eeschema/dialogs/dialog_sheet_properties_base.cpp b/eeschema/dialogs/dialog_sheet_properties_base.cpp index ebb5c99408..459a2223e4 100644 --- a/eeschema/dialogs/dialog_sheet_properties_base.cpp +++ b/eeschema/dialogs/dialog_sheet_properties_base.cpp @@ -5,9 +5,9 @@ // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#include "widgets/wx_infobar.h" #include "widgets/std_bitmap_button.h" #include "widgets/wx_grid.h" +#include "widgets/wx_infobar.h" #include "dialog_sheet_properties_base.h" @@ -188,9 +188,6 @@ DIALOG_SHEET_PROPERTIES_BASE::DIALOG_SHEET_PROPERTIES_BASE( wxWindow* parent, wx mainSizer->Add( bSizer6, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 ); - m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - mainSizer->Add( m_staticline1, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); - m_sizerBottom = new wxBoxSizer( wxHORIZONTAL ); m_hierarchicalPathLabel = new wxStaticText( this, wxID_ANY, _("Hierarchical path:"), wxDefaultPosition, wxDefaultSize, 0 ); diff --git a/eeschema/dialogs/dialog_sheet_properties_base.fbp b/eeschema/dialogs/dialog_sheet_properties_base.fbp index eb2019e63a..bc178b1385 100644 --- a/eeschema/dialogs/dialog_sheet_properties_base.fbp +++ b/eeschema/dialogs/dialog_sheet_properties_base.fbp @@ -115,7 +115,7 @@ 1 wxSHOW_EFFECT_NONE - WX_INFOBAR; widgets/infobar.h; forward_declare + WX_INFOBAR; widgets/wx_infobar.h; forward_declare 0 @@ -1187,64 +1187,6 @@ - - 5 - wxEXPAND|wxLEFT|wxRIGHT|wxTOP - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline1 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - ; forward_declare - 0 - - - - - - 5 wxEXPAND|wxLEFT diff --git a/eeschema/dialogs/dialog_sheet_properties_base.h b/eeschema/dialogs/dialog_sheet_properties_base.h index 1e53140cc4..7838facea5 100644 --- a/eeschema/dialogs/dialog_sheet_properties_base.h +++ b/eeschema/dialogs/dialog_sheet_properties_base.h @@ -32,7 +32,6 @@ class WX_INFOBAR; #include #include #include -#include #include /////////////////////////////////////////////////////////////////////////// @@ -62,7 +61,6 @@ class DIALOG_SHEET_PROPERTIES_BASE : public DIALOG_SHIM COLOR_SWATCH* m_backgroundSwatch; wxStaticText* m_pageNumberStaticText; wxTextCtrl* m_pageNumberTextCtrl; - wxStaticLine* m_staticline1; wxBoxSizer* m_sizerBottom; wxStaticText* m_hierarchicalPathLabel; wxStaticText* m_hierarchicalPath; diff --git a/eeschema/dialogs/dialog_sim_command_base.cpp b/eeschema/dialogs/dialog_sim_command_base.cpp index d066117159..4f895f1092 100644 --- a/eeschema/dialogs/dialog_sim_command_base.cpp +++ b/eeschema/dialogs/dialog_sim_command_base.cpp @@ -89,7 +89,7 @@ DIALOG_SIM_COMMAND_BASE::DIALOG_SIM_COMMAND_BASE( wxWindow* parent, wxWindowID i gbSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); m_dcEnable2 = new wxCheckBox( m_pgDC, wxID_ANY, _("Source 2"), wxDefaultPosition, wxDefaultSize, 0 ); - m_dcEnable2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); + m_dcEnable2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); gbSizer1->Add( m_dcEnable2, wxGBPosition( 0, 3 ), wxGBSpan( 1, 2 ), wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); @@ -115,7 +115,7 @@ DIALOG_SIM_COMMAND_BASE::DIALOG_SIM_COMMAND_BASE( wxWindow* parent, wxWindowID i m_staticText411 = new wxStaticText( m_pgDC, wxID_ANY, _("Source 1"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText411->Wrap( -1 ); - m_staticText411->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); + m_staticText411->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); gbSizer1->Add( m_staticText411, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxBOTTOM|wxRIGHT|wxLEFT, 5 ); @@ -400,7 +400,7 @@ DIALOG_SIM_COMMAND_BASE::DIALOG_SIM_COMMAND_BASE( wxWindow* parent, wxWindowID i m_pgTransient->SetSizer( bSizer81 ); m_pgTransient->Layout(); bSizer81->Fit( m_pgTransient ); - m_simPages->AddPage( m_pgTransient, _("Transient"), true ); + m_simPages->AddPage( m_pgTransient, _("Transient"), false ); m_pgCustom = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer2; bSizer2 = new wxBoxSizer( wxVERTICAL ); @@ -421,7 +421,7 @@ DIALOG_SIM_COMMAND_BASE::DIALOG_SIM_COMMAND_BASE( wxWindow* parent, wxWindowID i m_pgCustom->SetSizer( bSizer2 ); m_pgCustom->Layout(); bSizer2->Fit( m_pgCustom ); - m_simPages->AddPage( m_pgCustom, _("Custom"), false ); + m_simPages->AddPage( m_pgCustom, _("Custom"), true ); bSizer1->Add( m_simPages, 1, wxALL|wxEXPAND, 10 ); @@ -448,9 +448,6 @@ DIALOG_SIM_COMMAND_BASE::DIALOG_SIM_COMMAND_BASE( wxWindow* parent, wxWindowID i bSizer88->Add( m_compatibilityMode, 1, wxEXPAND|wxBOTTOM, 5 ); - m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bSizer88->Add( m_staticline1, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - bSizer1->Add( bSizer88, 0, wxEXPAND, 5 ); diff --git a/eeschema/dialogs/dialog_sim_command_base.fbp b/eeschema/dialogs/dialog_sim_command_base.fbp index 9999341033..543688a861 100644 --- a/eeschema/dialogs/dialog_sim_command_base.fbp +++ b/eeschema/dialogs/dialog_sim_command_base.fbp @@ -2516,7 +2516,7 @@ Noise 0 - + 1 1 1 @@ -2567,7 +2567,7 @@ wxTAB_TRAVERSAL - + bSizer15 wxVERTICAL @@ -3555,7 +3555,7 @@ Operating Point 0 - + 1 1 1 @@ -3606,7 +3606,7 @@ wxTAB_TRAVERSAL - + bSizer8 wxVERTICAL @@ -3869,7 +3869,7 @@ Transient - 1 + 0 1 1 @@ -4589,7 +4589,7 @@ Custom - 0 + 1 1 1 @@ -5059,64 +5059,6 @@ - - 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline1 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - ; ; forward_declare - 0 - - - - - - diff --git a/eeschema/dialogs/dialog_sim_command_base.h b/eeschema/dialogs/dialog_sim_command_base.h index e47a1f7608..e57edd38fb 100644 --- a/eeschema/dialogs/dialog_sim_command_base.h +++ b/eeschema/dialogs/dialog_sim_command_base.h @@ -31,7 +31,6 @@ #include #include #include -#include #include /////////////////////////////////////////////////////////////////////////// @@ -120,7 +119,6 @@ class DIALOG_SIM_COMMAND_BASE : public DIALOG_SHIM wxCheckBox* m_fixIncludePaths; wxBoxSizer* m_compatibilityMode; wxChoice* m_compatibilityModeChoice; - wxStaticLine* m_staticline1; wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK; wxButton* m_sdbSizerCancel; diff --git a/eeschema/dialogs/dialog_text_properties_base.cpp b/eeschema/dialogs/dialog_text_properties_base.cpp index 454c05d8d5..229d299274 100644 --- a/eeschema/dialogs/dialog_text_properties_base.cpp +++ b/eeschema/dialogs/dialog_text_properties_base.cpp @@ -8,8 +8,8 @@ #include "widgets/bitmap_button.h" #include "widgets/color_swatch.h" #include "widgets/font_choice.h" -#include "widgets/wx_infobar.h" #include "widgets/wx_combobox.h" +#include "widgets/wx_infobar.h" #include "dialog_text_properties_base.h" @@ -305,12 +305,6 @@ DIALOG_TEXT_PROPERTIES_BASE::DIALOG_TEXT_PROPERTIES_BASE( wxWindow* parent, wxWi bMainSizer->Add( m_textEntrySizer, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); - m_staticline = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bMainSizer->Add( m_staticline, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - - wxBoxSizer* bSizer4; - bSizer4 = new wxBoxSizer( wxHORIZONTAL ); - m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); @@ -318,10 +312,7 @@ DIALOG_TEXT_PROPERTIES_BASE::DIALOG_TEXT_PROPERTIES_BASE( wxWindow* parent, wxWi m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); - bSizer4->Add( m_sdbSizer1, 1, wxALL|wxEXPAND, 5 ); - - - bMainSizer->Add( bSizer4, 0, wxEXPAND, 5 ); + bMainSizer->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 ); this->SetSizer( bMainSizer ); diff --git a/eeschema/dialogs/dialog_text_properties_base.fbp b/eeschema/dialogs/dialog_text_properties_base.fbp index 8f27776784..c9f93c8f97 100644 --- a/eeschema/dialogs/dialog_text_properties_base.fbp +++ b/eeschema/dialogs/dialog_text_properties_base.fbp @@ -113,7 +113,7 @@ 1 wxSHOW_EFFECT_NONE - WX_INFOBAR; widgets/infobar.h; forward_declare + WX_INFOBAR; widgets/wx_infobar.h; forward_declare 0 @@ -3008,89 +3008,20 @@ 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxALL|wxEXPAND 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 - 1 - m_staticline - 1 - - + m_sdbSizer1 protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - ; ; forward_declare - 0 - - - - - - - - 5 - wxEXPAND - 0 - - - bSizer4 - wxHORIZONTAL - none - - 5 - wxALL|wxEXPAND - 1 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizer1 - protected - - diff --git a/eeschema/dialogs/dialog_text_properties_base.h b/eeschema/dialogs/dialog_text_properties_base.h index 82cab07fd4..a2e7e641c1 100644 --- a/eeschema/dialogs/dialog_text_properties_base.h +++ b/eeschema/dialogs/dialog_text_properties_base.h @@ -38,7 +38,6 @@ class WX_INFOBAR; #include #include #include -#include #include /////////////////////////////////////////////////////////////////////////// @@ -94,7 +93,6 @@ class DIALOG_TEXT_PROPERTIES_BASE : public DIALOG_SHIM COLOR_SWATCH* m_fillColorSwatch; wxCheckBox* m_hyperlinkCb; WX_COMBOBOX* m_hyperlinkCombo; - wxStaticLine* m_staticline; wxStdDialogButtonSizer* m_sdbSizer1; wxButton* m_sdbSizer1OK; wxButton* m_sdbSizer1Cancel; diff --git a/eeschema/dialogs/dialog_wire_bus_properties_base.cpp b/eeschema/dialogs/dialog_wire_bus_properties_base.cpp index caf4999788..ea0c80039a 100644 --- a/eeschema/dialogs/dialog_wire_bus_properties_base.cpp +++ b/eeschema/dialogs/dialog_wire_bus_properties_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! @@ -96,10 +96,7 @@ DIALOG_WIRE_BUS_PROPERTIES_BASE::DIALOG_WIRE_BUS_PROPERTIES_BASE( wxWindow* pare bSizer3->Add( m_helpLabel2, 0, wxRIGHT|wxLEFT, 10 ); - mainSizer->Add( bSizer3, 0, wxEXPAND|wxTOP, 5 ); - - m_staticline = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - mainSizer->Add( m_staticline, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + mainSizer->Add( bSizer3, 0, wxBOTTOM|wxEXPAND|wxTOP, 5 ); m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); @@ -110,7 +107,7 @@ DIALOG_WIRE_BUS_PROPERTIES_BASE::DIALOG_WIRE_BUS_PROPERTIES_BASE( wxWindow* pare m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); - mainSizer->Add( m_sdbSizer, 0, wxALL|wxALIGN_RIGHT, 5 ); + mainSizer->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 5 ); this->SetSizer( mainSizer ); diff --git a/eeschema/dialogs/dialog_wire_bus_properties_base.fbp b/eeschema/dialogs/dialog_wire_bus_properties_base.fbp index cf36c369eb..0dd0f6d6f4 100644 --- a/eeschema/dialogs/dialog_wire_bus_properties_base.fbp +++ b/eeschema/dialogs/dialog_wire_bus_properties_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ dialog_wire_bus_properties_base 1000 none + 1 dialog_wire_bus_properties @@ -25,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -50,6 +52,7 @@ DIALOG_SHIM; dialog_shim.h Wire & Bus Properties + 0 @@ -791,7 +794,7 @@ 5 - wxEXPAND|wxTOP + wxBOTTOM|wxEXPAND|wxTOP 0 @@ -924,65 +927,7 @@ 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - - 0 - - - - - - - - 5 - wxALL|wxALIGN_RIGHT + wxALL|wxEXPAND 0 1 diff --git a/eeschema/dialogs/dialog_wire_bus_properties_base.h b/eeschema/dialogs/dialog_wire_bus_properties_base.h index a4f7f8d340..b4c62b9da5 100644 --- a/eeschema/dialogs/dialog_wire_bus_properties_base.h +++ b/eeschema/dialogs/dialog_wire_bus_properties_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! @@ -24,7 +24,6 @@ class COLOR_SWATCH; #include #include #include -#include #include #include @@ -56,19 +55,19 @@ class DIALOG_WIRE_BUS_PROPERTIES_BASE : public DIALOG_SHIM wxStaticText* m_dotSizeUnits; wxStaticText* m_helpLabel1; wxStaticText* m_helpLabel2; - wxStaticLine* m_staticline; wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK; wxButton* m_sdbSizerApply; wxButton* m_sdbSizerCancel; - // Virtual event handlers, overide them in your derived class + // Virtual event handlers, override them in your derived class virtual void resetDefaults( wxCommandEvent& event ) { event.Skip(); } public: DIALOG_WIRE_BUS_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Wire & Bus Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_WIRE_BUS_PROPERTIES_BASE(); }; diff --git a/eeschema/dialogs/panel_eeschema_editing_options_base.cpp b/eeschema/dialogs/panel_eeschema_editing_options_base.cpp index a728f1c4ea..11f071075e 100644 --- a/eeschema/dialogs/panel_eeschema_editing_options_base.cpp +++ b/eeschema/dialogs/panel_eeschema_editing_options_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! @@ -282,6 +282,7 @@ PANEL_EESCHEMA_EDITING_OPTIONS_BASE::PANEL_EESCHEMA_EDITING_OPTIONS_BASE( wxWind this->SetSizer( bPanelSizer ); this->Layout(); + bPanelSizer->Fit( this ); } PANEL_EESCHEMA_EDITING_OPTIONS_BASE::~PANEL_EESCHEMA_EDITING_OPTIONS_BASE() diff --git a/eeschema/dialogs/panel_eeschema_editing_options_base.fbp b/eeschema/dialogs/panel_eeschema_editing_options_base.fbp index 5e829221f8..fd41874abd 100644 --- a/eeschema/dialogs/panel_eeschema_editing_options_base.fbp +++ b/eeschema/dialogs/panel_eeschema_editing_options_base.fbp @@ -45,7 +45,7 @@ PANEL_EESCHEMA_EDITING_OPTIONS_BASE - 652,466 + -1,-1 RESETTABLE_PANEL; widgets/resettable_panel.h; Not forward_declare 0 diff --git a/eeschema/dialogs/panel_eeschema_editing_options_base.h b/eeschema/dialogs/panel_eeschema_editing_options_base.h index d54df7622d..fb6393239f 100644 --- a/eeschema/dialogs/panel_eeschema_editing_options_base.h +++ b/eeschema/dialogs/panel_eeschema_editing_options_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! @@ -84,7 +84,7 @@ class PANEL_EESCHEMA_EDITING_OPTIONS_BASE : public RESETTABLE_PANEL public: - PANEL_EESCHEMA_EDITING_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 652,466 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); + PANEL_EESCHEMA_EDITING_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); ~PANEL_EESCHEMA_EDITING_OPTIONS_BASE();