diff --git a/common/dialogs/dialog_assign_netclass_base.cpp b/common/dialogs/dialog_assign_netclass_base.cpp index 2c0e422d94..4b90fe83b8 100644 --- a/common/dialogs/dialog_assign_netclass_base.cpp +++ b/common/dialogs/dialog_assign_netclass_base.cpp @@ -52,17 +52,8 @@ DIALOG_ASSIGN_NETCLASS_BASE::DIALOG_ASSIGN_NETCLASS_BASE( wxWindow* parent, wxWi m_info->Wrap( -1 ); bLowerSizer->Add( m_info, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bLowerSizer->Add( m_staticline1, 0, wxEXPAND|wxTOP, 10 ); - - bMainSizer->Add( bLowerSizer, 1, wxEXPAND|wxRIGHT|wxLEFT, 10 ); - - wxBoxSizer* bSizerButtons; - bSizerButtons = new wxBoxSizer( wxHORIZONTAL ); - - - bSizerButtons->Add( 20, 0, 1, wxEXPAND, 5 ); + bMainSizer->Add( bLowerSizer, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 10 ); m_sdbSizerStdButtons = new wxStdDialogButtonSizer(); m_sdbSizerStdButtonsOK = new wxButton( this, wxID_OK ); @@ -71,10 +62,7 @@ DIALOG_ASSIGN_NETCLASS_BASE::DIALOG_ASSIGN_NETCLASS_BASE( wxWindow* parent, wxWi m_sdbSizerStdButtons->AddButton( m_sdbSizerStdButtonsCancel ); m_sdbSizerStdButtons->Realize(); - bSizerButtons->Add( m_sdbSizerStdButtons, 0, wxALL, 5 ); - - - bMainSizer->Add( bSizerButtons, 0, wxEXPAND|wxALL, 5 ); + bMainSizer->Add( m_sdbSizerStdButtons, 0, wxALL|wxEXPAND, 5 ); this->SetSizer( bMainSizer ); diff --git a/common/dialogs/dialog_assign_netclass_base.fbp b/common/dialogs/dialog_assign_netclass_base.fbp index 772b07bf05..2533d8b0b9 100644 --- a/common/dialogs/dialog_assign_netclass_base.fbp +++ b/common/dialogs/dialog_assign_netclass_base.fbp @@ -326,7 +326,7 @@ 10 - wxEXPAND|wxRIGHT|wxLEFT + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 1 @@ -452,103 +452,24 @@ -1 - - 10 - wxEXPAND|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|wxALL + wxALL|wxEXPAND 0 - + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 - bSizerButtons - wxHORIZONTAL - none - - 5 - wxEXPAND - 1 - - 0 - protected - 20 - - - - 5 - wxALL - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizerStdButtons - protected - - + m_sdbSizerStdButtons + protected diff --git a/common/dialogs/dialog_assign_netclass_base.h b/common/dialogs/dialog_assign_netclass_base.h index d2dcb50d5b..ad630db88b 100644 --- a/common/dialogs/dialog_assign_netclass_base.h +++ b/common/dialogs/dialog_assign_netclass_base.h @@ -22,7 +22,6 @@ class WX_HTML_REPORT_BOX; #include #include #include -#include #include #include @@ -43,7 +42,6 @@ class DIALOG_ASSIGN_NETCLASS_BASE : public DIALOG_SHIM wxComboBox* m_netclassCtrl; WX_HTML_REPORT_BOX* m_matchingNets; wxStaticText* m_info; - wxStaticLine* m_staticline1; wxStdDialogButtonSizer* m_sdbSizerStdButtons; wxButton* m_sdbSizerStdButtonsOK; wxButton* m_sdbSizerStdButtonsCancel; diff --git a/common/dialogs/dialog_color_picker_base.cpp b/common/dialogs/dialog_color_picker_base.cpp index 016cfaa681..b40402c780 100644 --- a/common/dialogs/dialog_color_picker_base.cpp +++ b/common/dialogs/dialog_color_picker_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! @@ -116,7 +116,7 @@ DIALOG_COLOR_PICKER_BASE::DIALOG_COLOR_PICKER_BASE( wxWindow* parent, wxWindowID bSizerBright->Add( m_staticTextBright, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); m_sliderBrightness = new wxSlider( sbSizerViewHSV->GetStaticBox(), wxID_ANY, 255, 0, 255, wxDefaultPosition, wxDefaultSize, wxSL_INVERSE|wxSL_LABELS|wxSL_LEFT|wxSL_VERTICAL ); - bSizerBright->Add( m_sliderBrightness, 1, wxTOP|wxRIGHT|wxALIGN_CENTER_HORIZONTAL, 5 ); + bSizerBright->Add( m_sliderBrightness, 1, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxTOP, 5 ); sbSizerViewHSV->Add( bSizerBright, 0, wxEXPAND, 5 ); @@ -143,7 +143,7 @@ DIALOG_COLOR_PICKER_BASE::DIALOG_COLOR_PICKER_BASE( wxWindow* parent, wxWindowID m_fgridColor->AddGrowableCol( 9 ); m_fgridColor->SetFlexibleDirection( wxBOTH ); m_fgridColor->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_SizerDefinedColors->Add( m_fgridColor, 1, wxALL|wxEXPAND, 10 ); @@ -176,9 +176,6 @@ DIALOG_COLOR_PICKER_BASE::DIALOG_COLOR_PICKER_BASE( wxWindow* parent, wxWindowID bSizerMain->Add( bSizerUpperMain, 0, wxEXPAND, 5 ); - m_staticline = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bSizerMain->Add( m_staticline, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - wxBoxSizer* bButtonsSizer; bButtonsSizer = new wxBoxSizer( wxHORIZONTAL ); diff --git a/common/dialogs/dialog_color_picker_base.fbp b/common/dialogs/dialog_color_picker_base.fbp index 89d354f381..1922504d55 100644 --- a/common/dialogs/dialog_color_picker_base.fbp +++ b/common/dialogs/dialog_color_picker_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ dialog_color_picker_base 1000 none + 1 DIALOG_COLOR_PICKER_BASE @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -50,6 +52,7 @@ DIALOG_SHIM; dialog_shim.h Color Picker + 0 @@ -1078,7 +1081,7 @@ 5 - wxTOP|wxRIGHT|wxALIGN_CENTER_HORIZONTAL + wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxTOP 1 1 @@ -1394,64 +1397,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 - - 0 - - - - - - 10 wxEXPAND|wxLEFT @@ -1736,6 +1681,7 @@ + 0 diff --git a/common/dialogs/dialog_color_picker_base.h b/common/dialogs/dialog_color_picker_base.h index 2e02b54c88..1120bab611 100644 --- a/common/dialogs/dialog_color_picker_base.h +++ b/common/dialogs/dialog_color_picker_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 @@ #include #include #include -#include #include #include #include @@ -65,7 +64,6 @@ class DIALOG_COLOR_PICKER_BASE : public DIALOG_SHIM wxBoxSizer* m_SizerTransparency; wxStaticText* m_opacityLabel; wxSlider* m_sliderTransparency; - wxStaticLine* m_staticline; wxStaticText* m_staticTextOldColor; wxStaticBitmap* m_OldColorRect; wxStaticBitmap* m_NewColorRect; @@ -94,6 +92,7 @@ class DIALOG_COLOR_PICKER_BASE : public DIALOG_SHIM public: DIALOG_COLOR_PICKER_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Color Picker"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_COLOR_PICKER_BASE(); }; diff --git a/common/dialogs/dialog_global_lib_table_config_base.cpp b/common/dialogs/dialog_global_lib_table_config_base.cpp index 8513e4b1dc..d1e61d4e85 100644 --- a/common/dialogs/dialog_global_lib_table_config_base.cpp +++ b/common/dialogs/dialog_global_lib_table_config_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Jul 27 2020) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -53,15 +53,12 @@ DIALOG_GLOBAL_LIB_TABLE_CONFIG_BASE::DIALOG_GLOBAL_LIB_TABLE_CONFIG_BASE( wxWind bSizer2->Add( m_filePicker1, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); - m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bSizer2->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 ); - m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); m_sdbSizer1->Realize(); - bSizer2->Add( m_sdbSizer1, 1, wxEXPAND, 5 ); + bSizer2->Add( m_sdbSizer1, 1, wxEXPAND|wxTOP, 5 ); bSizer1->Add( bSizer2, 1, wxALL|wxEXPAND, 5 ); diff --git a/common/dialogs/dialog_global_lib_table_config_base.fbp b/common/dialogs/dialog_global_lib_table_config_base.fbp index 8b056924e8..a52528c2b7 100644 --- a/common/dialogs/dialog_global_lib_table_config_base.fbp +++ b/common/dialogs/dialog_global_lib_table_config_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ dialog_global_lib_table_config_base 1000 none + 1 DIALOG_GLOBAL_LIB_TABLE_CONFIG_BASE @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -50,6 +52,7 @@ DIALOG_SHIM; dialog_shim.h Configure Global Library Table + 0 @@ -58,11 +61,11 @@ bSizer1 wxHORIZONTAL none - + 5 wxALL|wxEXPAND 1 - + bSizer2 wxVERTICAL @@ -470,65 +473,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_staticline1 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - - 0 - - - - - - - - 5 - wxEXPAND + wxEXPAND|wxTOP 1 0 diff --git a/common/dialogs/dialog_global_lib_table_config_base.h b/common/dialogs/dialog_global_lib_table_config_base.h index 0bae79a381..c776cf09e8 100644 --- a/common/dialogs/dialog_global_lib_table_config_base.h +++ b/common/dialogs/dialog_global_lib_table_config_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Jul 27 2020) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -42,7 +41,6 @@ class DIALOG_GLOBAL_LIB_TABLE_CONFIG_BASE : public DIALOG_SHIM wxRadioButton* m_emptyRb; wxStaticText* m_staticText2; wxFilePickerCtrl* m_filePicker1; - wxStaticLine* m_staticline1; wxStdDialogButtonSizer* m_sdbSizer1; wxButton* m_sdbSizer1OK; @@ -54,6 +52,7 @@ class DIALOG_GLOBAL_LIB_TABLE_CONFIG_BASE : public DIALOG_SHIM public: DIALOG_GLOBAL_LIB_TABLE_CONFIG_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Configure Global Library Table"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxCAPTION|wxRESIZE_BORDER ); + ~DIALOG_GLOBAL_LIB_TABLE_CONFIG_BASE(); }; diff --git a/common/dialogs/dialog_grid_settings_base.cpp b/common/dialogs/dialog_grid_settings_base.cpp index 5ac2f33d51..b7ca6d7b95 100644 --- a/common/dialogs/dialog_grid_settings_base.cpp +++ b/common/dialogs/dialog_grid_settings_base.cpp @@ -164,23 +164,17 @@ DIALOG_GRID_SETTINGS_BASE::DIALOG_GRID_SETTINGS_BASE( wxWindow* parent, wxWindow bSizerMain->Add( sbFastSwitchSizer, 0, wxEXPAND|wxALL, 10 ); - m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bSizerMain->Add( m_staticline1, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - wxBoxSizer* bButtonSizer; bButtonSizer = new wxBoxSizer( wxHORIZONTAL ); m_buttonResetOrigin = new wxButton( this, wxID_ANY, _("Reset Grid Origin"), wxDefaultPosition, wxDefaultSize, 0 ); - bButtonSizer->Add( m_buttonResetOrigin, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + bButtonSizer->Add( m_buttonResetOrigin, 0, wxALL, 5 ); m_buttonResetSizes = new wxButton( this, wxID_ANY, _("Reset Grid Sizes"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonResetSizes->Hide(); m_buttonResetSizes->SetToolTip( _("Resets the list of grid sizes to default values") ); - bButtonSizer->Add( m_buttonResetSizes, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - - bButtonSizer->Add( 0, 0, 1, wxEXPAND, 5 ); + bButtonSizer->Add( m_buttonResetSizes, 0, wxALL, 5 ); m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); @@ -189,7 +183,7 @@ DIALOG_GRID_SETTINGS_BASE::DIALOG_GRID_SETTINGS_BASE( wxWindow* parent, wxWindow m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); - bButtonSizer->Add( m_sdbSizer, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + bButtonSizer->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 5 ); bSizerMain->Add( bButtonSizer, 0, wxEXPAND|wxLEFT, 10 ); diff --git a/common/dialogs/dialog_grid_settings_base.fbp b/common/dialogs/dialog_grid_settings_base.fbp index 8b0ae5bfd2..2a8c4e3e8e 100644 --- a/common/dialogs/dialog_grid_settings_base.fbp +++ b/common/dialogs/dialog_grid_settings_base.fbp @@ -1522,64 +1522,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_staticline1 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - ; ; forward_declare - 0 - - - - - - 10 wxEXPAND|wxLEFT @@ -1591,7 +1533,7 @@ none 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxALL 0 1 @@ -1665,7 +1607,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL + wxALL 0 1 @@ -1738,17 +1680,7 @@ 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL + wxALL|wxEXPAND 0 0 diff --git a/common/dialogs/dialog_grid_settings_base.h b/common/dialogs/dialog_grid_settings_base.h index 058bb1b9af..166d1fab1a 100644 --- a/common/dialogs/dialog_grid_settings_base.h +++ b/common/dialogs/dialog_grid_settings_base.h @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -61,7 +60,6 @@ class DIALOG_GRID_SETTINGS_BASE : public DIALOG_SHIM wxStaticText* m_staticTextGrid2; wxChoice* m_grid2Ctrl; wxStaticText* m_grid2HotKey; - wxStaticLine* m_staticline1; wxButton* m_buttonResetOrigin; wxButton* m_buttonResetSizes; wxStdDialogButtonSizer* m_sdbSizer; diff --git a/common/dialogs/dialog_migrate_settings_base.cpp b/common/dialogs/dialog_migrate_settings_base.cpp index 7537dcd2a4..f03b12d8a2 100644 --- a/common/dialogs/dialog_migrate_settings_base.cpp +++ b/common/dialogs/dialog_migrate_settings_base.cpp @@ -22,7 +22,7 @@ DIALOG_MIGRATE_SETTINGS_BASE::DIALOG_MIGRATE_SETTINGS_BASE( wxWindow* parent, wx m_lblWelcome = new wxStaticText( this, wxID_ANY, _("Welcome to KiCad %s!"), wxDefaultPosition, wxDefaultSize, 0 ); m_lblWelcome->Wrap( -1 ); - m_lblWelcome->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); + m_lblWelcome->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizer6->Add( m_lblWelcome, 0, wxALL|wxEXPAND, 5 ); @@ -74,9 +74,6 @@ DIALOG_MIGRATE_SETTINGS_BASE::DIALOG_MIGRATE_SETTINGS_BASE( wxWindow* parent, wx m_sizer->Add( bSizer6, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 10 ); - m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - m_sizer->Add( m_staticline1, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); - m_standardButtons = new wxStdDialogButtonSizer(); m_standardButtonsOK = new wxButton( this, wxID_OK ); m_standardButtons->AddButton( m_standardButtonsOK ); diff --git a/common/dialogs/dialog_migrate_settings_base.fbp b/common/dialogs/dialog_migrate_settings_base.fbp index 331029757c..a131c7b2fb 100644 --- a/common/dialogs/dialog_migrate_settings_base.fbp +++ b/common/dialogs/dialog_migrate_settings_base.fbp @@ -622,64 +622,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_staticline1 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - ; ; forward_declare - 0 - - - - - - 5 wxEXPAND|wxALL diff --git a/common/dialogs/dialog_migrate_settings_base.h b/common/dialogs/dialog_migrate_settings_base.h index 75087aee82..31eac85d82 100644 --- a/common/dialogs/dialog_migrate_settings_base.h +++ b/common/dialogs/dialog_migrate_settings_base.h @@ -28,7 +28,6 @@ class STD_BITMAP_BUTTON; #include #include #include -#include #include /////////////////////////////////////////////////////////////////////////// @@ -51,7 +50,6 @@ class DIALOG_MIGRATE_SETTINGS_BASE : public DIALOG_SHIM wxStaticText* m_lblPathError; wxCheckBox* m_cbCopyLibraryTables; wxRadioButton* m_btnUseDefaults; - wxStaticLine* m_staticline1; wxStdDialogButtonSizer* m_standardButtons; wxButton* m_standardButtonsOK; wxButton* m_standardButtonsCancel; diff --git a/common/dialogs/dialog_page_settings_base.cpp b/common/dialogs/dialog_page_settings_base.cpp index ff68e6497d..e794de0f1c 100644 --- a/common/dialogs/dialog_page_settings_base.cpp +++ b/common/dialogs/dialog_page_settings_base.cpp @@ -154,16 +154,16 @@ DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWind m_staticText30 = new wxStaticText( this, wxID_ANY, _("File:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText30->Wrap( -1 ); - bSizerfileSelection->Add( m_staticText30, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); + bSizerfileSelection->Add( m_staticText30, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP, 5 ); m_textCtrlFilePicker = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizerfileSelection->Add( m_textCtrlFilePicker, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); + bSizerfileSelection->Add( m_textCtrlFilePicker, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP, 5 ); m_browseButton = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - bSizerfileSelection->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); + bSizerfileSelection->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxTOP, 5 ); - bSizerFilename->Add( bSizerfileSelection, 1, wxEXPAND, 5 ); + bSizerFilename->Add( bSizerfileSelection, 1, wxBOTTOM|wxEXPAND, 5 ); bSizerRight->Add( bSizerFilename, 0, wxEXPAND|wxALL, 5 ); @@ -211,16 +211,16 @@ DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWind m_TextDate = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_TextDate->SetMinSize( wxSize( 100,-1 ) ); - bSizerDate->Add( m_TextDate, 3, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + bSizerDate->Add( m_TextDate, 3, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_ApplyDate = new wxButton( this, wxID_ANY, _("<<<"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); - bSizerDate->Add( m_ApplyDate, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + bSizerDate->Add( m_ApplyDate, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_PickDate = new wxDatePickerCtrl( this, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_DEFAULT ); bSizerDate->Add( m_PickDate, 2, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); - fgSizer2->Add( bSizerDate, 0, wxEXPAND, 5 ); + fgSizer2->Add( bSizerDate, 0, wxBOTTOM|wxEXPAND|wxTOP, 5 ); m_DateExport = new wxCheckBox( this, wxID_ANY, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizer2->Add( m_DateExport, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -378,9 +378,6 @@ DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWind bMainSizer->Add( bUpperSizerH, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - m_staticline5 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bMainSizer->Add( m_staticline5, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); @@ -388,7 +385,7 @@ DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWind m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); - bMainSizer->Add( m_sdbSizer, 0, wxALIGN_RIGHT|wxALL, 5 ); + bMainSizer->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 5 ); this->SetSizer( bMainSizer ); diff --git a/common/dialogs/dialog_page_settings_base.fbp b/common/dialogs/dialog_page_settings_base.fbp index 87d686dbe7..2c9c282c13 100644 --- a/common/dialogs/dialog_page_settings_base.fbp +++ b/common/dialogs/dialog_page_settings_base.fbp @@ -1325,7 +1325,7 @@ none 5 - wxEXPAND + wxBOTTOM|wxEXPAND 1 @@ -1334,7 +1334,7 @@ none 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT + wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP 0 1 @@ -1395,7 +1395,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT + wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP 1 1 @@ -1459,7 +1459,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxTOP 0 1 @@ -1886,7 +1886,7 @@ 5 - wxEXPAND + wxBOTTOM|wxEXPAND|wxTOP 0 @@ -1895,7 +1895,7 @@ none 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxLEFT 3 1 @@ -1960,7 +1960,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxLEFT 0 1 @@ -4447,67 +4447,9 @@ - - 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_staticline5 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - ; ; forward_declare - 0 - - - - - - 5 - wxALIGN_RIGHT|wxALL + wxALL|wxEXPAND 0 0 diff --git a/common/dialogs/dialog_page_settings_base.h b/common/dialogs/dialog_page_settings_base.h index bc42aedb21..6dedd229aa 100644 --- a/common/dialogs/dialog_page_settings_base.h +++ b/common/dialogs/dialog_page_settings_base.h @@ -113,7 +113,6 @@ class DIALOG_PAGES_SETTINGS_BASE : public DIALOG_SHIM wxStaticText* m_staticTextComment9; wxTextCtrl* m_TextComment9; wxCheckBox* m_Comment9Export; - wxStaticLine* m_staticline5; wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK; wxButton* m_sdbSizerCancel; diff --git a/common/dialogs/dialog_paste_special_base.cpp b/common/dialogs/dialog_paste_special_base.cpp index 9346093658..a747a3976a 100644 --- a/common/dialogs/dialog_paste_special_base.cpp +++ b/common/dialogs/dialog_paste_special_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! @@ -28,9 +28,6 @@ DIALOG_PASTE_SPECIAL_BASE::DIALOG_PASTE_SPECIAL_BASE( wxWindow* parent, wxWindow m_mainSizer->Add( optionsSizer, 1, wxALL|wxEXPAND, 10 ); - m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - m_mainSizer->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/common/dialogs/dialog_paste_special_base.fbp b/common/dialogs/dialog_paste_special_base.fbp index d2afccf881..4b52515854 100644 --- a/common/dialogs/dialog_paste_special_base.fbp +++ b/common/dialogs/dialog_paste_special_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ dialog_paste_special_base 1000 none + 1 dialog_paste_special @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -50,6 +52,7 @@ DIALOG_SHIM; dialog_shim.h Paste Special + 0 @@ -135,64 +138,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 - - - - - - 6 wxALL|wxEXPAND diff --git a/common/dialogs/dialog_paste_special_base.h b/common/dialogs/dialog_paste_special_base.h index ed7414ee8e..b3ff58d61c 100644 --- a/common/dialogs/dialog_paste_special_base.h +++ b/common/dialogs/dialog_paste_special_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! @@ -18,7 +18,6 @@ #include #include #include -#include #include #include @@ -34,7 +33,6 @@ class DIALOG_PASTE_SPECIAL_BASE : public DIALOG_SHIM protected: wxRadioBox* m_pasteOptions; - wxStaticLine* m_staticline1; wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK; wxButton* m_sdbSizerCancel; @@ -46,6 +44,7 @@ class DIALOG_PASTE_SPECIAL_BASE : public DIALOG_SHIM public: DIALOG_PASTE_SPECIAL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Paste Special"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_PASTE_SPECIAL_BASE(); }; diff --git a/common/dialogs/dialog_print_generic_base.cpp b/common/dialogs/dialog_print_generic_base.cpp index 8288235a5e..8380348f39 100644 --- a/common/dialogs/dialog_print_generic_base.cpp +++ b/common/dialogs/dialog_print_generic_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! @@ -102,9 +102,6 @@ DIALOG_PRINT_GENERIC_BASE::DIALOG_PRINT_GENERIC_BASE( wxWindow* parent, wxWindow bMainSizer->Add( bSizer6, 0, wxEXPAND|wxLEFT, 10 ); - m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bMainSizer->Add( m_staticline1, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 ); - wxBoxSizer* bButtonsSizer; bButtonsSizer = new wxBoxSizer( wxHORIZONTAL ); diff --git a/common/dialogs/dialog_print_generic_base.fbp b/common/dialogs/dialog_print_generic_base.fbp index c314f5d25a..8303b5df2d 100644 --- a/common/dialogs/dialog_print_generic_base.fbp +++ b/common/dialogs/dialog_print_generic_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ dialog_print_generic_base 1000 none + 1 DIALOG_PRINT_GENERIC @@ -25,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -50,6 +52,7 @@ DIALOG_SHIM; dialog_shim.h Print + 0 @@ -684,64 +687,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 - - - - - - 10 wxEXPAND|wxLEFT @@ -764,6 +709,7 @@ + 0 diff --git a/common/dialogs/dialog_print_generic_base.h b/common/dialogs/dialog_print_generic_base.h index 8e56f7c255..38be135535 100644 --- a/common/dialogs/dialog_print_generic_base.h +++ b/common/dialogs/dialog_print_generic_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,11 +24,10 @@ #include #include #include -#include +#include #include #include #include -#include #include /////////////////////////////////////////////////////////////////////////// @@ -58,7 +57,6 @@ class DIALOG_PRINT_GENERIC_BASE : public DIALOG_SHIM wxRadioButton* m_scaleCustom; wxTextCtrl* m_scaleCustomText; wxStaticText* m_infoText; - wxStaticLine* m_staticline1; wxButton* m_buttonOption; wxStdDialogButtonSizer* m_sdbSizer1; wxButton* m_sdbSizer1OK; @@ -77,6 +75,7 @@ class DIALOG_PRINT_GENERIC_BASE : public DIALOG_SHIM public: DIALOG_PRINT_GENERIC_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_GENERIC_BASE(); }; diff --git a/cvpcb/cvpcb_mainframe.cpp b/cvpcb/cvpcb_mainframe.cpp index 19718b6dee..8f7f1733c4 100644 --- a/cvpcb/cvpcb_mainframe.cpp +++ b/cvpcb/cvpcb_mainframe.cpp @@ -137,9 +137,6 @@ CVPCB_MAINFRAME::CVPCB_MAINFRAME( KIWAY* aKiway, wxWindow* aParent ) : panelSizer->Add( fgSizerStatus, 1, wxEXPAND|wxLEFT, 2 ); - wxStaticLine* staticline1 = new wxStaticLine( bottomPanel ); - panelSizer->Add( staticline1, 0, wxEXPAND, 5 ); - m_statusLine1->SetFont( KIUI::GetStatusFont( this ) ); m_statusLine2->SetFont( KIUI::GetStatusFont( this ) ); m_statusLine3->SetFont( KIUI::GetStatusFont( this ) ); diff --git a/cvpcb/dialogs/dialog_config_equfiles_base.cpp b/cvpcb/dialogs/dialog_config_equfiles_base.cpp index c4b0693704..6573df6de4 100644 --- a/cvpcb/dialogs/dialog_config_equfiles_base.cpp +++ b/cvpcb/dialogs/dialog_config_equfiles_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -76,9 +76,9 @@ DIALOG_CONFIG_EQUFILES_BASE::DIALOG_CONFIG_EQUFILES_BASE( wxWindow* parent, wxWi // Columns m_gridEnvVars->EnableDragColMove( false ); m_gridEnvVars->EnableDragColSize( true ); - m_gridEnvVars->SetColLabelSize( 25 ); m_gridEnvVars->SetColLabelValue( 0, _("Name") ); m_gridEnvVars->SetColLabelValue( 1, _("Value") ); + m_gridEnvVars->SetColLabelSize( 25 ); m_gridEnvVars->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); // Rows @@ -105,9 +105,6 @@ DIALOG_CONFIG_EQUFILES_BASE::DIALOG_CONFIG_EQUFILES_BASE( wxWindow* parent, wxWi bMainSizer->Add( bSizerLower, 0, wxEXPAND, 5 ); - m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bMainSizer->Add( m_staticline2, 0, wxEXPAND|wxALL, 5 ); - m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); @@ -115,7 +112,7 @@ DIALOG_CONFIG_EQUFILES_BASE::DIALOG_CONFIG_EQUFILES_BASE( wxWindow* parent, wxWi m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); - bMainSizer->Add( m_sdbSizer, 0, wxALL|wxALIGN_RIGHT, 5 ); + bMainSizer->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 5 ); this->SetSizer( bMainSizer ); diff --git a/cvpcb/dialogs/dialog_config_equfiles_base.fbp b/cvpcb/dialogs/dialog_config_equfiles_base.fbp index 4dc118f269..7b7b95dc72 100644 --- a/cvpcb/dialogs/dialog_config_equfiles_base.fbp +++ b/cvpcb/dialogs/dialog_config_equfiles_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -52,6 +52,7 @@ DIALOG_SHIM; dialog_shim.h + 0 @@ -769,65 +770,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 - - 0 - - - - - - - - 5 - wxALL|wxALIGN_RIGHT + wxALL|wxEXPAND 0 0 diff --git a/cvpcb/dialogs/dialog_config_equfiles_base.h b/cvpcb/dialogs/dialog_config_equfiles_base.h index f4cebfa6cc..e635cb8211 100644 --- a/cvpcb/dialogs/dialog_config_equfiles_base.h +++ b/cvpcb/dialogs/dialog_config_equfiles_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -26,7 +26,6 @@ #include #include #include -#include #include /////////////////////////////////////////////////////////////////////////// @@ -56,12 +55,11 @@ class DIALOG_CONFIG_EQUFILES_BASE : public DIALOG_SHIM wxStaticText* m_staticText2; wxGrid* m_gridEnvVars; wxRadioBox* m_rbPathOptionChoice; - 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 OnCloseWindow( wxCloseEvent& event ) { event.Skip(); } virtual void OnAddFiles( wxCommandEvent& event ) { event.Skip(); } virtual void OnRemoveFiles( wxCommandEvent& event ) { event.Skip(); } @@ -74,6 +72,7 @@ class DIALOG_CONFIG_EQUFILES_BASE : public DIALOG_SHIM public: DIALOG_CONFIG_EQUFILES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_CONFIG_EQUFILES_BASE(); }; diff --git a/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp b/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp index 01b4ff700b..7b4dfe8032 100644 --- a/gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp +++ b/gerbview/dialogs/dialog_layers_select_to_pcb_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! @@ -125,9 +125,6 @@ LAYERS_MAP_DIALOG_BASE::LAYERS_MAP_DIALOG_BASE( wxWindow* parent, wxWindowID id, bSizerMain->Add( sbUpperSizer, 1, wxEXPAND|wxALL, 5 ); - m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bSizerMain->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 ); diff --git a/gerbview/dialogs/dialog_layers_select_to_pcb_base.fbp b/gerbview/dialogs/dialog_layers_select_to_pcb_base.fbp index f5b4d30274..32ed5d3f2c 100644 --- a/gerbview/dialogs/dialog_layers_select_to_pcb_base.fbp +++ b/gerbview/dialogs/dialog_layers_select_to_pcb_base.fbp @@ -651,64 +651,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 - - 0 - - - - - - 5 wxALL|wxEXPAND diff --git a/gerbview/dialogs/dialog_layers_select_to_pcb_base.h b/gerbview/dialogs/dialog_layers_select_to_pcb_base.h index 05455d8ece..23702e5994 100644 --- a/gerbview/dialogs/dialog_layers_select_to_pcb_base.h +++ b/gerbview/dialogs/dialog_layers_select_to_pcb_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! @@ -62,7 +62,6 @@ class LAYERS_MAP_DIALOG_BASE : public DIALOG_SHIM wxButton* m_buttonStore; wxButton* m_buttonRetrieve; wxButton* m_buttonReset; - wxStaticLine* m_staticline1; wxStdDialogButtonSizer* m_sdbSizerButtons; wxButton* m_sdbSizerButtonsOK; wxButton* m_sdbSizerButtonsCancel; diff --git a/kicad/dialogs/dialog_template_selector_base.cpp b/kicad/dialogs/dialog_template_selector_base.cpp index 51db24743d..197862c701 100644 --- a/kicad/dialogs/dialog_template_selector_base.cpp +++ b/kicad/dialogs/dialog_template_selector_base.cpp @@ -48,9 +48,6 @@ DIALOG_TEMPLATE_SELECTOR_BASE::DIALOG_TEMPLATE_SELECTOR_BASE( wxWindow* parent, bmainSizer->Add( m_htmlWin, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 12 ); - m_staticline = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bmainSizer->Add( m_staticline, 0, wxEXPAND | wxALL, 5 ); - m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); diff --git a/kicad/dialogs/dialog_template_selector_base.fbp b/kicad/dialogs/dialog_template_selector_base.fbp index 5a851b042a..e6659c5708 100644 --- a/kicad/dialogs/dialog_template_selector_base.fbp +++ b/kicad/dialogs/dialog_template_selector_base.fbp @@ -464,64 +464,6 @@ OnHtmlLinkActivated - - 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_staticline - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - - 0 - - - - - - 5 wxALL|wxEXPAND @@ -583,7 +525,7 @@ 5 wxEXPAND|wxLEFT 1 - + 1 1 1 diff --git a/kicad/dialogs/dialog_template_selector_base.h b/kicad/dialogs/dialog_template_selector_base.h index 1655f79a08..51cb5488e6 100644 --- a/kicad/dialogs/dialog_template_selector_base.h +++ b/kicad/dialogs/dialog_template_selector_base.h @@ -29,7 +29,6 @@ class STD_BITMAP_BUTTON; #include #include #include -#include #include #include #include @@ -52,7 +51,6 @@ class DIALOG_TEMPLATE_SELECTOR_BASE : public DIALOG_SHIM STD_BITMAP_BUTTON* m_reloadButton; wxNotebook* m_notebook; HTML_WINDOW* m_htmlWin; - wxStaticLine* m_staticline; wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK; wxButton* m_sdbSizerCancel; diff --git a/pagelayout_editor/dialogs/dialog_design_inspector_base.cpp b/pagelayout_editor/dialogs/dialog_design_inspector_base.cpp index f5c77d5f60..e16824ccda 100644 --- a/pagelayout_editor/dialogs/dialog_design_inspector_base.cpp +++ b/pagelayout_editor/dialogs/dialog_design_inspector_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 1 2018) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -32,12 +32,12 @@ DIALOG_INSPECTOR_BASE::DIALOG_INSPECTOR_BASE( wxWindow* parent, wxWindowID id, c // Columns m_gridListItems->EnableDragColMove( false ); m_gridListItems->EnableDragColSize( true ); - m_gridListItems->SetColLabelSize( 30 ); m_gridListItems->SetColLabelValue( 0, _("-") ); m_gridListItems->SetColLabelValue( 1, _("Type") ); m_gridListItems->SetColLabelValue( 2, _("Count") ); m_gridListItems->SetColLabelValue( 3, _("Comment") ); m_gridListItems->SetColLabelValue( 4, _("Text") ); + m_gridListItems->SetColLabelSize( 30 ); m_gridListItems->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); // Rows @@ -62,11 +62,12 @@ DIALOG_INSPECTOR_BASE::DIALOG_INSPECTOR_BASE( wxWindow* parent, wxWindowID id, c m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); - bSizerMain->Add( m_sdbSizer, 0, wxALIGN_RIGHT|wxALL, 5 ); + bSizerMain->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 5 ); this->SetSizer( bSizerMain ); this->Layout(); + bSizerMain->Fit( this ); this->Centre( wxBOTH ); diff --git a/pagelayout_editor/dialogs/dialog_design_inspector_base.fbp b/pagelayout_editor/dialogs/dialog_design_inspector_base.fbp index feafae7cdf..11c40ff3d7 100644 --- a/pagelayout_editor/dialogs/dialog_design_inspector_base.fbp +++ b/pagelayout_editor/dialogs/dialog_design_inspector_base.fbp @@ -1,6 +1,6 @@ - + ; C++ @@ -14,6 +14,7 @@ dialog_design_inspector_base 1000 none + 1 design_inspector @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -45,11 +47,12 @@ DIALOG_INSPECTOR_BASE - 423,293 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h; forward_declare + 0 @@ -212,7 +215,7 @@ 5 - wxALIGN_RIGHT|wxALL + wxALL|wxEXPAND 0 0 diff --git a/pagelayout_editor/dialogs/dialog_design_inspector_base.h b/pagelayout_editor/dialogs/dialog_design_inspector_base.h index d98a438517..649277fac4 100644 --- a/pagelayout_editor/dialogs/dialog_design_inspector_base.h +++ b/pagelayout_editor/dialogs/dialog_design_inspector_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 1 2018) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -38,13 +38,14 @@ class DIALOG_INSPECTOR_BASE : public DIALOG_SHIM wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerCancel; - // Virtual event handlers, overide them in your derived class + // Virtual event handlers, override them in your derived class virtual void onCellClicked( wxGridEvent& event ) { event.Skip(); } public: - DIALOG_INSPECTOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 423,293 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_INSPECTOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_INSPECTOR_BASE(); }; diff --git a/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp b/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp index 1d2ab26c8a..3cce880734 100644 --- a/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp +++ b/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 11 2018) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -12,170 +12,164 @@ DIALOG_NEW_DATAITEM_BASE::DIALOG_NEW_DATAITEM_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - + wxBoxSizer* bSizerMain; bSizerMain = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bSizerUpper; bSizerUpper = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bSizerPos; bSizerPos = new wxBoxSizer( wxHORIZONTAL ); - + wxFlexGridSizer* bSizerPosXY; bSizerPosXY = new wxFlexGridSizer( 0, 2, 0, 0 ); bSizerPosXY->SetFlexibleDirection( wxBOTH ); bSizerPosXY->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_staticTextPosY = new wxStaticText( this, wxID_ANY, _("Y start:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextPosY->Wrap( -1 ); bSizerPosXY->Add( m_staticTextPosY, 0, wxRIGHT|wxLEFT, 5 ); - - + + bSizerPosXY->Add( 0, 0, 0, 0, 5 ); - + m_textCtrlPosY = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizerPosXY->Add( m_textCtrlPosY, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_units1 = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_units1->Wrap( -1 ); bSizerPosXY->Add( m_units1, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 1 ); - + m_staticTextPosX = new wxStaticText( this, wxID_ANY, _("X start:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextPosX->Wrap( -1 ); bSizerPosXY->Add( m_staticTextPosX, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - + + bSizerPosXY->Add( 0, 0, 0, 0, 0 ); - + m_textCtrlPosX = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizerPosXY->Add( m_textCtrlPosX, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_units11 = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_units11->Wrap( -1 ); bSizerPosXY->Add( m_units11, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 1 ); - - + + bSizerPos->Add( bSizerPosXY, 1, wxEXPAND, 5 ); - + wxBoxSizer* bSizer6; bSizer6 = new wxBoxSizer( wxVERTICAL ); - + m_staticTextOrgPos = new wxStaticText( this, wxID_ANY, _("Origin"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextOrgPos->Wrap( -1 ); bSizer6->Add( m_staticTextOrgPos, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + wxString m_choiceCornerPosChoices[] = { _("Upper Right"), _("Upper Left"), _("Lower Right"), _("Lower Left") }; int m_choiceCornerPosNChoices = sizeof( m_choiceCornerPosChoices ) / sizeof( wxString ); m_choiceCornerPos = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceCornerPosNChoices, m_choiceCornerPosChoices, 0 ); m_choiceCornerPos->SetSelection( 2 ); bSizer6->Add( m_choiceCornerPos, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - + + bSizerPos->Add( bSizer6, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - + + bSizerUpper->Add( bSizerPos, 1, wxEXPAND, 5 ); - + m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bSizerUpper->Add( m_staticline2, 0, wxEXPAND | wxALL, 5 ); - + m_SizerEndPosition = new wxBoxSizer( wxHORIZONTAL ); - + wxFlexGridSizer* fgSizer3; fgSizer3 = new wxFlexGridSizer( 0, 2, 0, 0 ); fgSizer3->SetFlexibleDirection( wxBOTH ); fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_staticTextEndX = new wxStaticText( this, wxID_ANY, _("X end:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextEndX->Wrap( -1 ); fgSizer3->Add( m_staticTextEndX, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - + + fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 ); - + m_textCtrlEndX = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer3->Add( m_textCtrlEndX, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_units3 = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_units3->Wrap( -1 ); fgSizer3->Add( m_units3, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); - + m_staticTextEndY = new wxStaticText( this, wxID_ANY, _("Y end:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextEndY->Wrap( -1 ); fgSizer3->Add( m_staticTextEndY, 0, wxRIGHT|wxLEFT, 5 ); - - + + fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 ); - + m_textCtrlEndY = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer3->Add( m_textCtrlEndY, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_units4 = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_units4->Wrap( -1 ); fgSizer3->Add( m_units4, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); - - + + m_SizerEndPosition->Add( fgSizer3, 1, wxEXPAND, 5 ); - + wxBoxSizer* bSizer61; bSizer61 = new wxBoxSizer( wxVERTICAL ); - + m_staticTextOrgPos1 = new wxStaticText( this, wxID_ANY, _("Origin"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextOrgPos1->Wrap( -1 ); bSizer61->Add( m_staticTextOrgPos1, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + wxString m_choiceCornerEndChoices[] = { _("Upper Right"), _("Upper Left"), _("Lower Right"), _("Lower Left") }; int m_choiceCornerEndNChoices = sizeof( m_choiceCornerEndChoices ) / sizeof( wxString ); m_choiceCornerEnd = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceCornerEndNChoices, m_choiceCornerEndChoices, 0 ); m_choiceCornerEnd->SetSelection( 2 ); bSizer61->Add( m_choiceCornerEnd, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - + + m_SizerEndPosition->Add( bSizer61, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - + + bSizerUpper->Add( m_SizerEndPosition, 1, wxEXPAND, 5 ); - - m_staticlineEndXY = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bSizerUpper->Add( m_staticlineEndXY, 0, wxEXPAND | wxALL, 5 ); - + m_SizerText = new wxBoxSizer( wxVERTICAL ); - + m_staticTextTitle = new wxStaticText( this, wxID_ANY, _("Text"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextTitle->Wrap( -1 ); m_SizerText->Add( m_staticTextTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE ); m_textCtrlText->SetMinSize( wxSize( 300,-1 ) ); - + m_SizerText->Add( m_textCtrlText, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - m_staticline3 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - m_SizerText->Add( m_staticline3, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - + + bSizerUpper->Add( m_SizerText, 1, wxEXPAND, 5 ); - - + + bSizerMain->Add( bSizerUpper, 1, wxEXPAND, 5 ); - + m_sdbSizerButtons = new wxStdDialogButtonSizer(); m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK ); m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel ); m_sdbSizerButtons->Realize(); - + bSizerMain->Add( m_sdbSizerButtons, 0, wxEXPAND|wxALL, 5 ); - - + + this->SetSizer( bSizerMain ); this->Layout(); bSizerMain->Fit( this ); - + this->Centre( wxBOTH ); - + // Connect Events m_sdbSizerButtonsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_NEW_DATAITEM_BASE::OnOKClick ), NULL, this ); } @@ -184,5 +178,5 @@ DIALOG_NEW_DATAITEM_BASE::~DIALOG_NEW_DATAITEM_BASE() { // Disconnect Events m_sdbSizerButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_NEW_DATAITEM_BASE::OnOKClick ), NULL, this ); - + } diff --git a/pagelayout_editor/dialogs/dialog_new_dataitem_base.fbp b/pagelayout_editor/dialogs/dialog_new_dataitem_base.fbp index 0b194111d3..a11ee261a9 100644 --- a/pagelayout_editor/dialogs/dialog_new_dataitem_base.fbp +++ b/pagelayout_editor/dialogs/dialog_new_dataitem_base.fbp @@ -1,8 +1,8 @@ - + - + C++ 1 source_name @@ -14,96 +14,50 @@ dialog_new_dataitem_base 1000 none - + + 1 dialog_new_dataitem_base - + . - + 1 1 1 1 UI + 0 0 0 0 wxAUI_MGR_DEFAULT - + wxBOTH - + 1 1 impl_virtual - - - + + + 0 wxID_ANY - - + + DIALOG_NEW_DATAITEM_BASE - + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h New Item - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 0 + + + - + bSizerMain wxVERTICAL none @@ -112,7 +66,7 @@ wxEXPAND 1 - + bSizerUpper wxVERTICAL none @@ -121,7 +75,7 @@ wxEXPAND 1 - + bSizerPos wxHORIZONTAL none @@ -132,10 +86,10 @@ 2 wxBOTH - - + + 0 - + bSizerPosXY wxFLEX_GROWMODE_SPECIFIED none @@ -150,91 +104,61 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Y start: 0 - + 0 - - + + 0 - + 1 m_staticTextPosY 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - + 0 0 @@ -251,93 +175,59 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + 0 - + 0 - + 1 m_textCtrlPosY 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -349,86 +239,56 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY mm 0 - + 0 - - + + 0 - + 1 m_units1 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -440,91 +300,61 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY X start: 0 - + 0 - - + + 0 - + 1 m_staticTextPosX 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - + 0 0 @@ -541,93 +371,59 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + 0 - + 0 - + 1 m_textCtrlPosX 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -639,86 +435,56 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY mm 0 - + 0 - - + + 0 - + 1 m_units11 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -728,7 +494,7 @@ wxALIGN_CENTER_VERTICAL 0 - + bSizer6 wxVERTICAL none @@ -741,86 +507,56 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Origin 0 - + 0 - - + + 0 - + 1 m_staticTextOrgPos 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -832,90 +568,59 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 "Upper Right" "Upper Left" "Lower Right" "Lower Left" 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_choiceCornerPos 1 - - + + protected 1 - + Resizable 2 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -931,83 +636,53 @@ 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 - + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -1015,7 +690,7 @@ wxEXPAND 1 - + m_SizerEndPosition wxHORIZONTAL protected @@ -1026,10 +701,10 @@ 2 wxBOTH - - + + 0 - + fgSizer3 wxFLEX_GROWMODE_SPECIFIED none @@ -1044,86 +719,56 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY X end: 0 - + 0 - - + + 0 - + 1 m_staticTextEndX 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1145,93 +790,59 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + 0 - + 0 - + 1 m_textCtrlEndX 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -1243,86 +854,56 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY mm 0 - + 0 - - + + 0 - + 1 m_units3 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1334,86 +915,56 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Y end: 0 - + 0 - - + + 0 - + 1 m_staticTextEndY 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1435,93 +986,59 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + 0 - + 0 - + 1 m_textCtrlEndY 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -1533,86 +1050,56 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY mm 0 - + 0 - - + + 0 - + 1 m_units4 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1622,7 +1109,7 @@ wxALIGN_CENTER_VERTICAL 0 - + bSizer61 wxVERTICAL none @@ -1635,86 +1122,56 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Origin 0 - + 0 - - + + 0 - + 1 m_staticTextOrgPos1 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1726,190 +1183,71 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 "Upper Right" "Upper Left" "Lower Right" "Lower Left" 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_choiceCornerEnd 1 - - + + protected 1 - + Resizable 2 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - 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_staticlineEndXY - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 wxEXPAND 1 - - + + m_SizerText wxVERTICAL protected @@ -1922,86 +1260,56 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Text 0 - + 0 - - + + 0 - + 1 m_staticTextTitle 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2013,181 +1321,59 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + 0 - + 0 300,-1 1 m_textCtrlText 1 - - + + protected 1 - + Resizable 1 - + wxTE_MULTILINE - + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxBOTTOM|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_staticline3 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -2207,17 +1393,10 @@ 1 0 0 - + m_sdbSizerButtons protected - - - - - OnOKClick - - diff --git a/pagelayout_editor/dialogs/dialog_new_dataitem_base.h b/pagelayout_editor/dialogs/dialog_new_dataitem_base.h index 1886b1dcf5..5dcff42a47 100644 --- a/pagelayout_editor/dialogs/dialog_new_dataitem_base.h +++ b/pagelayout_editor/dialogs/dialog_new_dataitem_base.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 11 2018) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __DIALOG_NEW_DATAITEM_BASE_H__ -#define __DIALOG_NEW_DATAITEM_BASE_H__ +#pragma once #include #include @@ -34,7 +33,7 @@ class DIALOG_NEW_DATAITEM_BASE : public DIALOG_SHIM { private: - + protected: wxStaticText* m_staticTextPosY; wxTextCtrl* m_textCtrlPosY; @@ -54,24 +53,22 @@ class DIALOG_NEW_DATAITEM_BASE : public DIALOG_SHIM wxStaticText* m_units4; wxStaticText* m_staticTextOrgPos1; wxChoice* m_choiceCornerEnd; - wxStaticLine* m_staticlineEndXY; wxBoxSizer* m_SizerText; wxStaticText* m_staticTextTitle; wxTextCtrl* m_textCtrlText; - wxStaticLine* m_staticline3; 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 OnOKClick( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - DIALOG_NEW_DATAITEM_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("New Item"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + + DIALOG_NEW_DATAITEM_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("New Item"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_NEW_DATAITEM_BASE(); - + }; -#endif //__DIALOG_NEW_DATAITEM_BASE_H__ diff --git a/pcb_calculator/dialogs/dialog_regulator_form_base.cpp b/pcb_calculator/dialogs/dialog_regulator_form_base.cpp index 5ffa432e4e..de97288cad 100644 --- a/pcb_calculator/dialogs/dialog_regulator_form_base.cpp +++ b/pcb_calculator/dialogs/dialog_regulator_form_base.cpp @@ -75,9 +75,6 @@ DIALOG_REGULATOR_FORM_BASE::DIALOG_REGULATOR_FORM_BASE( wxWindow* parent, wxWind bSizerMain->Add( 0, 0, 1, wxEXPAND, 5 ); - m_staticline = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bSizerMain->Add( m_staticline, 0, wxEXPAND, 5 ); - m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); diff --git a/pcb_calculator/dialogs/dialog_regulator_form_base.fbp b/pcb_calculator/dialogs/dialog_regulator_form_base.fbp index e9e93e75fa..862baaf907 100644 --- a/pcb_calculator/dialogs/dialog_regulator_form_base.fbp +++ b/pcb_calculator/dialogs/dialog_regulator_form_base.fbp @@ -732,64 +732,6 @@ 0 - - 5 - wxEXPAND - 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|wxEXPAND diff --git a/pcb_calculator/dialogs/dialog_regulator_form_base.h b/pcb_calculator/dialogs/dialog_regulator_form_base.h index 12099c903b..8f31d0d835 100644 --- a/pcb_calculator/dialogs/dialog_regulator_form_base.h +++ b/pcb_calculator/dialogs/dialog_regulator_form_base.h @@ -20,7 +20,6 @@ #include #include #include -#include #include #include @@ -45,7 +44,6 @@ class DIALOG_REGULATOR_FORM_BASE : public DIALOG_SHIM wxStaticText* m_RegulIadjTitle; wxTextCtrl* m_RegulIadjValue; wxStaticText* m_IadjUnitLabel; - wxStaticLine* m_staticline; wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK; wxButton* m_sdbSizerCancel; diff --git a/pcbnew/footprint_wizard_frame.cpp b/pcbnew/footprint_wizard_frame.cpp index d258eb532c..ac77e4d1d0 100644 --- a/pcbnew/footprint_wizard_frame.cpp +++ b/pcbnew/footprint_wizard_frame.cpp @@ -38,6 +38,7 @@ #include #include "footprint_wizard_frame.h" #include +#include #include #include #include