From c49917c5a8cfc2774fc70a3ef4e5d01cea6b7d5d Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sun, 28 Oct 2018 18:42:16 +0100 Subject: [PATCH] Dialog edit component in lib: Fix a few minor wxWidgets alerts. --- .../dialog_edit_component_in_lib_base.cpp | 34 +- .../dialog_edit_component_in_lib_base.fbp | 428 ++++++++++++++++-- .../dialog_edit_component_in_lib_base.h | 4 +- 3 files changed, 410 insertions(+), 56 deletions(-) diff --git a/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp b/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp index 6815170679..ca9eb5eea1 100644 --- a/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp +++ b/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version Jul 11 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -141,7 +141,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx fgSizerFPID->Add( staticKeywordsLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); m_KeywordCtrl = new wxTextCtrl( m_PanelBasic, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerFPID->Add( m_KeywordCtrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + fgSizerFPID->Add( m_KeywordCtrl, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); bSizerMidBasicPanel->Add( fgSizerFPID, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 ); @@ -178,7 +178,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx bSizerUnitCount->Add( m_staticTextNbUnits, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_SelNumberOfUnits = new wxSpinCtrl( sbSizerSymbol->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 26, 1 ); - bSizerUnitCount->Add( m_SelNumberOfUnits, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + bSizerUnitCount->Add( m_SelNumberOfUnits, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 ); sbSizerSymbol->Add( bSizerUnitCount, 1, wxEXPAND, 5 ); @@ -231,7 +231,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx bSizerNameOffset->Add( m_nameOffsetLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 30 ); m_nameOffsetCtrl = new wxTextCtrl( sbSizerAnnotations->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizerNameOffset->Add( m_nameOffsetCtrl, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); + bSizerNameOffset->Add( m_nameOffsetCtrl, 1, wxLEFT|wxRIGHT, 5 ); m_nameOffsetUnits = new wxStaticText( sbSizerAnnotations->GetStaticBox(), wxID_ANY, _("units"), wxDefaultPosition, wxDefaultSize, 0 ); m_nameOffsetUnits->Wrap( -1 ); @@ -352,22 +352,22 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx wxStaticText* staticAliasNameLabel; staticAliasNameLabel = new wxStaticText( m_PanelAlias, wxID_ANY, _("Alias name:"), wxDefaultPosition, wxDefaultSize, 0 ); staticAliasNameLabel->Wrap( -1 ); - fgSizerFPID1->Add( staticAliasNameLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); + fgSizerFPID1->Add( staticAliasNameLabel, 0, wxLEFT|wxRIGHT, 5 ); m_AliasNameCtrl = new wxTextCtrl( m_PanelAlias, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerFPID1->Add( m_AliasNameCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizerFPID1->Add( m_AliasNameCtrl, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); wxStaticText* staticAliasDescLabel; staticAliasDescLabel = new wxStaticText( m_PanelAlias, wxID_ANY, _("Alias description:"), wxDefaultPosition, wxDefaultSize, 0 ); staticAliasDescLabel->Wrap( -1 ); - fgSizerFPID1->Add( staticAliasDescLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); + fgSizerFPID1->Add( staticAliasDescLabel, 0, wxLEFT|wxRIGHT, 5 ); m_AliasDescCtrl = new wxTextCtrl( m_PanelAlias, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerFPID1->Add( m_AliasDescCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerFPID1->Add( m_AliasDescCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); staticAliasKeywordsLabel = new wxStaticText( m_PanelAlias, wxID_ANY, _("Alias keywords:"), wxDefaultPosition, wxDefaultSize, 0 ); staticAliasKeywordsLabel->Wrap( -1 ); - fgSizerFPID1->Add( staticAliasKeywordsLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); + fgSizerFPID1->Add( staticAliasKeywordsLabel, 0, wxLEFT|wxRIGHT, 5 ); m_AliasKeywordsCtrl = new wxTextCtrl( m_PanelAlias, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerFPID1->Add( m_AliasKeywordsCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); @@ -376,7 +376,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx bRightBoxSizerPanelAlias->Add( fgSizerFPID1, 1, wxEXPAND, 5 ); - bSizerMainPanelAlias->Add( bRightBoxSizerPanelAlias, 7, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT, 20 ); + bSizerMainPanelAlias->Add( bRightBoxSizerPanelAlias, 7, wxEXPAND|wxRIGHT|wxTOP, 20 ); m_PanelAlias->SetSizer( bSizerMainPanelAlias ); @@ -402,20 +402,20 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx wxBoxSizer* bFpFilterRightBoxSizer; bFpFilterRightBoxSizer = new wxBoxSizer( wxHORIZONTAL ); - m_addFilterButton = new wxBitmapButton( m_PanelFootprintFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW ); - bFpFilterRightBoxSizer->Add( m_addFilterButton, 0, wxBOTTOM|wxLEFT, 5 ); + m_addFilterButton = new wxBitmapButton( m_PanelFootprintFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 ); + bFpFilterRightBoxSizer->Add( m_addFilterButton, 0, wxTOP|wxBOTTOM|wxLEFT, 5 ); - m_editFilterButton = new wxBitmapButton( m_PanelFootprintFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW ); - bFpFilterRightBoxSizer->Add( m_editFilterButton, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + m_editFilterButton = new wxBitmapButton( m_PanelFootprintFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 ); + bFpFilterRightBoxSizer->Add( m_editFilterButton, 0, wxALL, 5 ); bFpFilterRightBoxSizer->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - m_deleteFilterButton = new wxBitmapButton( m_PanelFootprintFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW ); - bFpFilterRightBoxSizer->Add( m_deleteFilterButton, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + m_deleteFilterButton = new wxBitmapButton( m_PanelFootprintFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 ); + bFpFilterRightBoxSizer->Add( m_deleteFilterButton, 0, wxALL, 5 ); - bFpFilterLeftBoxSizer->Add( bFpFilterRightBoxSizer, 0, wxALIGN_CENTER_VERTICAL, 5 ); + bFpFilterLeftBoxSizer->Add( bFpFilterRightBoxSizer, 0, 0, 5 ); bPanelFpFilterBoxSizer->Add( bFpFilterLeftBoxSizer, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); diff --git a/eeschema/dialogs/dialog_edit_component_in_lib_base.fbp b/eeschema/dialogs/dialog_edit_component_in_lib_base.fbp index 2d5aab319b..590d37d0a9 100644 --- a/eeschema/dialogs/dialog_edit_component_in_lib_base.fbp +++ b/eeschema/dialogs/dialog_edit_component_in_lib_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ dialog_edit_component_in_lib_base 1000 none + 1 DIALOG_EDIT_COMPONENT_IN_LIBRARY_FBP @@ -54,13 +55,20 @@ - + + + + + + + + @@ -75,17 +83,23 @@ + + + + + + OnUpdateUI @@ -159,7 +173,14 @@ wxTAB_TRAVERSAL + + + + + + + @@ -239,7 +260,14 @@ wxTAB_TRAVERSAL + + + + + + + @@ -366,7 +394,14 @@ + + + + + + + @@ -454,6 +489,7 @@ 1 1 + 0 0 @@ -467,9 +503,10 @@ 0 0 - wxID_ANY Add Field + + 0 0 @@ -484,8 +521,9 @@ protected 1 + + Resizable - 1 @@ -499,8 +537,15 @@ + + + + + + OnAddField + @@ -547,6 +592,7 @@ 1 1 + 0 0 @@ -560,9 +606,10 @@ 0 0 - wxID_ANY Move Up + + 0 0 @@ -577,8 +624,9 @@ protected 1 + + Resizable - 1 @@ -592,8 +640,15 @@ + + + + + + OnMoveUp + @@ -640,6 +695,7 @@ 1 1 + 0 0 @@ -653,9 +709,10 @@ 0 0 - wxID_ANY Move Down + + 0 0 @@ -670,8 +727,9 @@ protected 1 + + Resizable - 1 @@ -685,8 +743,15 @@ + + + + + + OnMoveDown + @@ -743,6 +808,7 @@ 1 1 + 0 0 @@ -756,9 +822,10 @@ 0 0 - wxID_ANY Delete Field + + 0 0 @@ -773,8 +840,9 @@ protected 1 + + Resizable - 1 @@ -788,8 +856,15 @@ + + + + + + OnDeleteField + @@ -876,6 +951,7 @@ 0 wxID_ANY Symbol name: + 0 0 @@ -901,7 +977,14 @@ -1 + + + + + + + @@ -988,7 +1071,14 @@ + + + + + + + @@ -1050,6 +1140,7 @@ 0 wxID_ANY Description: + 0 0 @@ -1075,7 +1166,14 @@ -1 + + + + + + + @@ -1162,7 +1260,14 @@ + + + + + + + @@ -1224,6 +1329,7 @@ 0 wxID_ANY Keywords: + 0 0 @@ -1249,7 +1355,14 @@ -1 + + + + + + + @@ -1276,7 +1389,7 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT + wxRIGHT|wxLEFT|wxEXPAND 0 1 @@ -1336,7 +1449,14 @@ + + + + + + + @@ -1462,7 +1582,14 @@ + + + + + + + @@ -1550,7 +1677,14 @@ + + + + + + + @@ -1618,6 +1752,7 @@ 0 wxID_ANY Number of Units: + 0 0 @@ -1643,7 +1778,14 @@ -1 + + + + + + + @@ -1670,8 +1812,8 @@ 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL - 1 + wxBOTTOM|wxLEFT|wxRIGHT|wxALIGN_CENTER_VERTICAL + 0 1 1 @@ -1728,7 +1870,14 @@ + + + + + + + @@ -1820,7 +1969,14 @@ + + + + + + + @@ -1934,7 +2090,14 @@ + + + + + + + @@ -2022,7 +2185,14 @@ + + + + + + + @@ -2120,7 +2290,14 @@ + + + + + + + @@ -2188,6 +2365,7 @@ 0 wxID_ANY Position offset: + 0 0 @@ -2213,7 +2391,14 @@ -1 + + + + + + + @@ -2240,7 +2425,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + wxLEFT|wxRIGHT 1 1 @@ -2300,7 +2485,14 @@ + + + + + + + @@ -2362,6 +2554,7 @@ 0 wxID_ANY units + 0 0 @@ -2387,7 +2580,14 @@ -1 + + + + + + + @@ -2488,7 +2688,14 @@ wxTAB_TRAVERSAL + + + + + + + @@ -2558,6 +2765,7 @@ 0 wxID_ANY Aliases: + 0 0 @@ -2583,7 +2791,14 @@ -1 + + + + + + + @@ -2669,7 +2884,14 @@ + + + + + + + @@ -2727,6 +2949,7 @@ 1 1 + 0 0 @@ -2740,9 +2963,10 @@ 0 0 - wxID_ANY Add Alias + + 0 0 @@ -2757,8 +2981,9 @@ protected 1 + + Resizable - 1 @@ -2772,8 +2997,15 @@ + + + + + + OnAddAlias + @@ -2830,6 +3062,7 @@ 1 1 + 0 0 @@ -2843,9 +3076,10 @@ 0 0 - wxID_ANY Delete Alias + + 0 0 @@ -2860,8 +3094,9 @@ protected 1 + + Resizable - 1 @@ -2875,8 +3110,15 @@ + + + + + + OnDeleteAlias + @@ -2907,7 +3149,7 @@ 20 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT + wxEXPAND|wxRIGHT|wxTOP 7 @@ -2947,6 +3189,7 @@ 0 wxID_ANY Alias field substitutions: + 0 0 @@ -2972,7 +3215,14 @@ -1 + + + + + + + @@ -3083,7 +3333,14 @@ + + + + + + + @@ -3168,7 +3425,7 @@ 0 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + wxLEFT|wxRIGHT 0 1 @@ -3199,6 +3456,7 @@ 0 wxID_ANY Alias name: + 0 0 @@ -3224,7 +3482,14 @@ -1 + + + + + + + @@ -3251,7 +3516,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 1 @@ -3311,7 +3576,14 @@ + + + + + + + @@ -3342,7 +3614,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + wxLEFT|wxRIGHT 0 1 @@ -3373,6 +3645,7 @@ 0 wxID_ANY Alias description: + 0 0 @@ -3398,7 +3671,14 @@ -1 + + + + + + + @@ -3425,7 +3705,7 @@ 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -3485,7 +3765,14 @@ + + + + + + + @@ -3516,7 +3803,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + wxLEFT|wxRIGHT 0 1 @@ -3547,6 +3834,7 @@ 0 wxID_ANY Alias keywords: + 0 0 @@ -3572,7 +3860,14 @@ -1 + + + + + + + @@ -3659,7 +3954,14 @@ + + + + + + + @@ -3750,7 +4052,14 @@ wxTAB_TRAVERSAL + + + + + + + @@ -3820,6 +4129,7 @@ 0 wxID_ANY Footprint filters: + 0 0 @@ -3845,7 +4155,14 @@ -1 + + + + + + + @@ -3931,7 +4248,14 @@ + + + + + + + @@ -3960,7 +4284,7 @@ 5 - wxALIGN_CENTER_VERTICAL + 0 @@ -3969,7 +4293,7 @@ none 5 - wxBOTTOM|wxLEFT + wxTOP|wxBOTTOM|wxLEFT 0 1 @@ -3989,6 +4313,7 @@ 1 1 + 0 0 @@ -4002,9 +4327,10 @@ 0 0 - wxID_ANY Add Filter + + 0 0 @@ -4019,11 +4345,12 @@ protected 1 + + Resizable - 1 30,30 - wxBU_AUTODRAW + ; forward_declare 0 @@ -4034,8 +4361,15 @@ + + + + + + OnAddFootprintFilter + @@ -4062,7 +4396,7 @@ 5 - wxBOTTOM|wxRIGHT|wxLEFT + wxALL 0 1 @@ -4082,6 +4416,7 @@ 1 1 + 0 0 @@ -4095,9 +4430,10 @@ 0 0 - wxID_ANY Edit Filter + + 0 0 @@ -4112,11 +4448,12 @@ protected 1 + + Resizable - 1 30,30 - wxBU_AUTODRAW + ; forward_declare 0 @@ -4127,8 +4464,15 @@ + + + + + + OnEditFootprintFilter + @@ -4165,7 +4509,7 @@ 5 - wxBOTTOM|wxRIGHT|wxLEFT + wxALL 0 1 @@ -4185,6 +4529,7 @@ 1 1 + 0 0 @@ -4198,9 +4543,10 @@ 0 0 - wxID_ANY Delete Filter + + 0 0 @@ -4215,11 +4561,12 @@ protected 1 + + Resizable - 1 30,30 - wxBU_AUTODRAW + ; forward_declare 0 @@ -4230,8 +4577,15 @@ + + + + + + OnDeleteFootprintFilter + diff --git a/eeschema/dialogs/dialog_edit_component_in_lib_base.h b/eeschema/dialogs/dialog_edit_component_in_lib_base.h index 6b3c4d4707..25d27f25e5 100644 --- a/eeschema/dialogs/dialog_edit_component_in_lib_base.h +++ b/eeschema/dialogs/dialog_edit_component_in_lib_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version Jul 11 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -20,10 +20,10 @@ class WX_GRID; #include #include #include +#include #include #include #include -#include #include #include #include