diff --git a/pcbnew/dialogs/panel_setup_feature_constraints.cpp b/pcbnew/dialogs/panel_setup_feature_constraints.cpp index 6af3981911..91ef7765e8 100644 --- a/pcbnew/dialogs/panel_setup_feature_constraints.cpp +++ b/pcbnew/dialogs/panel_setup_feature_constraints.cpp @@ -1,7 +1,7 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2019 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2019-2020 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 @@ -28,12 +28,8 @@ #include #include // for PANEL_SETUP_FEATUR... #include - #include // for PAGED_DIALOG -#include // for UNIT_BINDER #include -#include - #include @@ -51,18 +47,6 @@ PANEL_SETUP_FEATURE_CONSTRAINTS::PANEL_SETUP_FEATURE_CONSTRAINTS( PAGED_DIALOG* { m_Frame = aFrame; m_BrdSettings = &m_Frame->GetBoard()->GetDesignSettings(); - - // Initialize bitmaps: - m_bitmapZoneFillOpt->SetBitmap( KiBitmap( show_zone_xpm ) ); - m_bitmapMinTrackWidth->SetBitmap( KiBitmap( width_track_xpm ) ); - m_bitmapMinViaDiameter->SetBitmap( KiBitmap( via_diameter_xpm ) ); - m_bitmapMinViaDrill->SetBitmap( KiBitmap( via_hole_diameter_xpm ) ); - m_bitmapMinuViaDiameter->SetBitmap( KiBitmap( via_diameter_xpm ) ); - m_bitmapMinuViaDrill->SetBitmap( KiBitmap( via_hole_diameter_xpm ) ); - m_bitmapMinHoleClearance->SetBitmap( KiBitmap( hole_to_hole_clearance_xpm ) ); - m_bitmapEdgeClearance->SetBitmap( KiBitmap( edge_to_copper_clearance_xpm ) ); - m_bitmapBlindBuried->SetBitmap( KiBitmap( via_buried_xpm ) ); - m_bitmap_uVia->SetBitmap( KiBitmap( via_microvia_xpm ) ); } @@ -120,6 +104,28 @@ bool PANEL_SETUP_FEATURE_CONSTRAINTS::TransferDataFromWindow() } +bool PANEL_SETUP_FEATURE_CONSTRAINTS::Show( bool aShow ) +{ + bool retVal = wxPanel::Show( aShow ); + + // These *should* work in the constructor, and indeed they do if this panel is the + // first displayed. However, on OSX 3.0.5 (at least), if another panel is displayed + // first then the icons will be blank unless they're set here. + m_bitmapZoneFillOpt->SetBitmap( KiBitmap( show_zone_xpm ) ); + m_bitmapMinTrackWidth->SetBitmap( KiBitmap( width_track_xpm ) ); + m_bitmapMinViaDiameter->SetBitmap( KiBitmap( via_diameter_xpm ) ); + m_bitmapMinViaDrill->SetBitmap( KiBitmap( via_hole_diameter_xpm ) ); + m_bitmapMinuViaDiameter->SetBitmap( KiBitmap( via_diameter_xpm ) ); + m_bitmapMinuViaDrill->SetBitmap( KiBitmap( via_hole_diameter_xpm ) ); + m_bitmapMinHoleClearance->SetBitmap( KiBitmap( hole_to_hole_clearance_xpm ) ); + m_bitmapEdgeClearance->SetBitmap( KiBitmap( edge_to_copper_clearance_xpm ) ); + m_bitmapBlindBuried->SetBitmap( KiBitmap( via_buried_xpm ) ); + m_bitmap_uVia->SetBitmap( KiBitmap( via_microvia_xpm ) ); + + return retVal; +} + + void PANEL_SETUP_FEATURE_CONSTRAINTS::ImportSettingsFrom( BOARD* aBoard ) { BOARD_DESIGN_SETTINGS* savedSettings = m_BrdSettings; diff --git a/pcbnew/dialogs/panel_setup_feature_constraints.h b/pcbnew/dialogs/panel_setup_feature_constraints.h index 85f5101499..246fc222c0 100644 --- a/pcbnew/dialogs/panel_setup_feature_constraints.h +++ b/pcbnew/dialogs/panel_setup_feature_constraints.h @@ -58,6 +58,7 @@ public: void ImportSettingsFrom( BOARD* aBoard ); private: + bool Show( bool aShow ) override; bool TransferDataToWindow() override; bool TransferDataFromWindow() override; diff --git a/pcbnew/dialogs/panel_setup_feature_constraints_base.cpp b/pcbnew/dialogs/panel_setup_feature_constraints_base.cpp index d05cb1c59c..dcbf162915 100644 --- a/pcbnew/dialogs/panel_setup_feature_constraints_base.cpp +++ b/pcbnew/dialogs/panel_setup_feature_constraints_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 10 2019) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -95,7 +95,7 @@ PANEL_SETUP_FEATURE_CONSTRAINTS_BASE::PANEL_SETUP_FEATURE_CONSTRAINTS_BASE( wxWi bSizer5 = new wxBoxSizer( wxHORIZONTAL ); m_bitmapZoneFillOpt = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - bSizer5->Add( m_bitmapZoneFillOpt, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); + bSizer5->Add( m_bitmapZoneFillOpt, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); wxBoxSizer* bSizerOutlinesOpts; bSizerOutlinesOpts = new wxBoxSizer( wxVERTICAL ); @@ -111,10 +111,10 @@ PANEL_SETUP_FEATURE_CONSTRAINTS_BASE::PANEL_SETUP_FEATURE_CONSTRAINTS_BASE( wxWi bSizer5->Add( bSizerOutlinesOpts, 1, wxEXPAND, 5 ); - m_bSizerPolygonFillOption->Add( bSizer5, 1, wxEXPAND|wxLEFT, 15 ); + m_bSizerPolygonFillOption->Add( bSizer5, 1, wxEXPAND, 15 ); - sbFeatureRules->Add( m_bSizerPolygonFillOption, 0, wxEXPAND|wxTOP, 5 ); + sbFeatureRules->Add( m_bSizerPolygonFillOption, 0, wxEXPAND|wxTOP, 10 ); bMainSizer->Add( sbFeatureRules, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); @@ -126,7 +126,7 @@ PANEL_SETUP_FEATURE_CONSTRAINTS_BASE::PANEL_SETUP_FEATURE_CONSTRAINTS_BASE( wxWi sbFeatureConstraints = new wxBoxSizer( wxVERTICAL ); wxFlexGridSizer* fgFeatureConstraints; - fgFeatureConstraints = new wxFlexGridSizer( 0, 4, 2, 0 ); + fgFeatureConstraints = new wxFlexGridSizer( 0, 4, 0, 0 ); fgFeatureConstraints->AddGrowableCol( 2 ); fgFeatureConstraints->SetFlexibleDirection( wxBOTH ); fgFeatureConstraints->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -148,7 +148,7 @@ PANEL_SETUP_FEATURE_CONSTRAINTS_BASE::PANEL_SETUP_FEATURE_CONSTRAINTS_BASE( wxWi fgFeatureConstraints->Add( m_TrackMinWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM, 5 ); - fgFeatureConstraints->Add( 0, 0, 1, wxEXPAND|wxTOP, 5 ); + fgFeatureConstraints->Add( 0, 0, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 ); fgFeatureConstraints->Add( 0, 0, 1, wxEXPAND|wxTOP, 5 ); @@ -188,7 +188,7 @@ PANEL_SETUP_FEATURE_CONSTRAINTS_BASE::PANEL_SETUP_FEATURE_CONSTRAINTS_BASE( wxWi fgFeatureConstraints->Add( m_ViaMinDrillUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); - fgFeatureConstraints->Add( 0, 0, 1, wxEXPAND|wxTOP, 5 ); + fgFeatureConstraints->Add( 0, 0, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 ); fgFeatureConstraints->Add( 0, 0, 1, wxEXPAND|wxTOP, 5 ); @@ -228,7 +228,7 @@ PANEL_SETUP_FEATURE_CONSTRAINTS_BASE::PANEL_SETUP_FEATURE_CONSTRAINTS_BASE( wxWi fgFeatureConstraints->Add( m_uviaMinDrillUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); - fgFeatureConstraints->Add( 0, 0, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); + fgFeatureConstraints->Add( 0, 0, 1, wxEXPAND|wxALL, 10 ); fgFeatureConstraints->Add( 0, 0, 1, wxEXPAND, 5 ); @@ -254,7 +254,7 @@ PANEL_SETUP_FEATURE_CONSTRAINTS_BASE::PANEL_SETUP_FEATURE_CONSTRAINTS_BASE( wxWi fgFeatureConstraints->Add( m_HoleToHoleUnits, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxTOP, 5 ); - fgFeatureConstraints->Add( 0, 0, 1, wxEXPAND|wxTOP, 5 ); + fgFeatureConstraints->Add( 0, 0, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 ); fgFeatureConstraints->Add( 0, 0, 1, wxEXPAND, 5 ); diff --git a/pcbnew/dialogs/panel_setup_feature_constraints_base.fbp b/pcbnew/dialogs/panel_setup_feature_constraints_base.fbp index ba5f599830..02e6b35f22 100644 --- a/pcbnew/dialogs/panel_setup_feature_constraints_base.fbp +++ b/pcbnew/dialogs/panel_setup_feature_constraints_base.fbp @@ -14,7 +14,6 @@ panel_setup_feature_constraints_base 1000 none - 1 panel_setup_feature_constraints_base @@ -26,7 +25,6 @@ 1 1 UI - 0 1 0 @@ -682,7 +680,7 @@ - 5 + 10 wxEXPAND|wxTOP 0 @@ -811,7 +809,7 @@ 15 - wxEXPAND|wxLEFT + wxEXPAND 1 @@ -820,7 +818,7 @@ none 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -1057,7 +1055,7 @@ wxFLEX_GROWMODE_SPECIFIED none 0 - 2 + 0 5 wxALL @@ -1304,7 +1302,7 @@ 5 - wxEXPAND|wxTOP + wxEXPAND|wxTOP|wxBOTTOM 1 0 @@ -1832,7 +1830,7 @@ 5 - wxEXPAND|wxTOP + wxEXPAND|wxTOP|wxBOTTOM 1 0 @@ -2360,7 +2358,7 @@ 10 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxALL 1 0 @@ -2644,7 +2642,7 @@ 5 - wxEXPAND|wxTOP + wxEXPAND|wxTOP|wxBOTTOM 1 0 diff --git a/pcbnew/dialogs/panel_setup_feature_constraints_base.h b/pcbnew/dialogs/panel_setup_feature_constraints_base.h index abe9520a75..6562be37b1 100644 --- a/pcbnew/dialogs/panel_setup_feature_constraints_base.h +++ b/pcbnew/dialogs/panel_setup_feature_constraints_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 10 2019) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcbnew/dialogs/panel_setup_netclasses.cpp b/pcbnew/dialogs/panel_setup_netclasses.cpp index bc0c62fd60..4610b47d7d 100644 --- a/pcbnew/dialogs/panel_setup_netclasses.cpp +++ b/pcbnew/dialogs/panel_setup_netclasses.cpp @@ -75,8 +75,7 @@ PANEL_SETUP_NETCLASSES::PANEL_SETUP_NETCLASSES( PAGED_DIALOG* aParent, PCB_EDIT_ m_originalColWidths = new int[ m_netclassGrid->GetNumberCols() ]; // Calculate a min best size to handle longest usual numeric values: - // (The 'M' large char is used to give a margin) - int min_best_width = m_netclassGrid->GetTextExtent( "555,555555 milsM" ).x; + int min_best_width = m_netclassGrid->GetTextExtent( "555,555555 mils" ).x; for( int i = 0; i < m_netclassGrid->GetNumberCols(); ++i ) { @@ -391,7 +390,7 @@ void PANEL_SETUP_NETCLASSES::AdjustNetclassGridColumns( int aWidth ) aWidth -= m_originalColWidths[ i ]; } - m_netclassGrid->SetColSize( 0, std::max( aWidth, m_originalColWidths[ 0 ] ) ); + m_netclassGrid->SetColSize( 0, std::max( aWidth - 2, m_originalColWidths[ 0 ] ) ); } @@ -492,10 +491,9 @@ void PANEL_SETUP_NETCLASSES::OnUpdateUI( wxUpdateUIEvent& event ) wxSize netclassSize = GetClientSize(); netclassSize.y -= m_membershipSize.y; - // Modify m_netclassesPane size only if needed, because calling Layout() - // has a annoying effect if a wxChoice is open, it is closed by this call. - // So it cannot blindly called inside each wxUpdateUIEvent event, - // at least on Windows + wxWidgets 3.0 (do not happens with 3.1.1). + // Modify m_netclassesPane size only if needed, because calling Layout() has the annoying + // effect of closing any open wxChoice dropdowns. So it cannot blindly called inside each + // wxUpdateUIEvent event, at least on Windows + wxWidgets 3.0 (not an issue with 3.1.1). if( netclassSize.y != m_netclassesPane->GetSize().y ) { m_netclassesPane->SetMinSize( netclassSize ); diff --git a/pcbnew/dialogs/panel_setup_netclasses_base.cpp b/pcbnew/dialogs/panel_setup_netclasses_base.cpp index 28c73e6d57..0a9b442239 100644 --- a/pcbnew/dialogs/panel_setup_netclasses_base.cpp +++ b/pcbnew/dialogs/panel_setup_netclasses_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version v3.8.0) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -64,7 +64,6 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi m_netclassGrid->SetRowLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTER ); // Label Appearance - m_netclassGrid->SetLabelFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); // Cell Defaults m_netclassGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); @@ -224,7 +223,6 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi m_membershipGrid->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); // Label Appearance - m_membershipGrid->SetLabelFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); // Cell Defaults m_membershipGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); diff --git a/pcbnew/dialogs/panel_setup_netclasses_base.fbp b/pcbnew/dialogs/panel_setup_netclasses_base.fbp index 98800c467b..91a7b6afba 100644 --- a/pcbnew/dialogs/panel_setup_netclasses_base.fbp +++ b/pcbnew/dialogs/panel_setup_netclasses_base.fbp @@ -180,7 +180,7 @@ 0 wxID_ANY - ,90,92,-1,70,0 + 0 0 @@ -1230,11 +1230,11 @@ - + 5 wxEXPAND|wxLEFT 1 - + bRight wxVERTICAL @@ -1292,7 +1292,7 @@ 0 wxID_ANY - ,90,92,-1,70,0 + 0 0 diff --git a/pcbnew/dialogs/panel_setup_netclasses_base.h b/pcbnew/dialogs/panel_setup_netclasses_base.h index bf5fea1271..9a110dd46b 100644 --- a/pcbnew/dialogs/panel_setup_netclasses_base.h +++ b/pcbnew/dialogs/panel_setup_netclasses_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version v3.8.0) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp index 6e95e275d7..b1f0315e35 100644 --- a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp +++ b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp @@ -1,8 +1,8 @@ - + - + C++ 1 source_name @@ -16,9 +16,9 @@ none 1 panel_setup_tracks_and_vias_base - + . - + 1 1 1 @@ -29,57 +29,57 @@ 0 wxAUI_MGR_DEFAULT - - + + 1 1 impl_virtual - - + + 0 wxID_ANY - - + + PANEL_SETUP_TRACKS_AND_VIAS_BASE - + -1,-1 ; forward_declare - - - + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bMainSizer wxVERTICAL none @@ -92,78 +92,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Pre-defined track and via dimensions: - + 0 - - + + 0 - + 1 m_label 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -171,7 +171,7 @@ wxEXPAND|wxLEFT 5 - + bSizerLower wxHORIZONTAL none @@ -182,12 +182,12 @@ wxID_ANY Tracks - + sbSizer4 wxVERTICAL 1 none - + 5 wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT @@ -197,30 +197,30 @@ 1 1 1 - - - - + + + + 0 0 - - - + + + 1 - - + + wxALIGN_LEFT - + wxALIGN_TOP 0 1 - wxALIGN_CENTRE + wxALIGN_CENTER 24 "Width" - wxALIGN_CENTRE + wxALIGN_CENTER 1 125 - + 1 0 Dock @@ -232,103 +232,103 @@ 0 1 1 - + 1 - - + + 1 0 0 wxID_ANY - - - + + + 0 0 - + 0 - - + + 0 - + 1 m_trackWidthsGrid 1 - - + + protected 1 - + Resizable - wxALIGN_CENTRE + wxALIGN_CENTER 0 "1" "2" "3" "4" "5" "6" "7" "8" - wxALIGN_CENTRE - + wxALIGN_CENTER + 8 1 - + WX_GRID; widgets/wx_grid.h; forward_declare 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -336,7 +336,7 @@ wxEXPAND|wxTOP 0 - + bSizer3 wxHORIZONTAL none @@ -349,88 +349,88 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - + wxID_ANY MyButton - + 0 - - + + 0 30,30 1 m_trackWidthsAddButton 1 - - + + protected 1 - + Resizable - + 1 - - + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnAddTrackWidthsClick - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -452,88 +452,88 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - + wxID_ANY MyButton - + 0 - - + + 0 30,30 1 m_trackWidthsRemoveButton 1 - - + + protected 1 - + Resizable - + 1 - - + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnRemoveTrackWidthsClick - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -547,12 +547,12 @@ wxID_ANY Vias - + sbSizer5 wxVERTICAL 1 none - + 5 wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT @@ -562,30 +562,30 @@ 1 1 1 - - - - + + + + 0 0 - - - + + + 1 - - + + wxALIGN_LEFT - + wxALIGN_TOP 0 1 - wxALIGN_CENTRE + wxALIGN_CENTER 24 "Size" "Drill" - wxALIGN_CENTRE + wxALIGN_CENTER 2 125,125 - + 1 0 Dock @@ -597,103 +597,103 @@ 0 1 1 - + 1 - - + + 1 0 0 wxID_ANY - - - + + + 0 0 - + 0 - - + + 0 - + 1 m_viaSizesGrid 1 - - + + protected 1 - + Resizable - wxALIGN_CENTRE + wxALIGN_CENTER 0 "1" "2" "3" "4" "5" "6" "7" "8" - wxALIGN_CENTRE - + wxALIGN_CENTER + 8 1 - + WX_GRID; widgets/wx_grid.h; forward_declare 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -701,7 +701,7 @@ wxEXPAND|wxTOP 0 - + bSizer4 wxHORIZONTAL none @@ -714,88 +714,88 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - + wxID_ANY MyButton - + 0 - - + + 0 30,30 1 m_viaSizesAddButton 1 - - + + protected 1 - + Resizable - + 1 - - + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnAddViaSizesClick - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -817,88 +817,88 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - + wxID_ANY MyButton - + 0 - - + + 0 30,30 1 m_viaSizesRemoveButton 1 - - + + protected 1 - + Resizable - + 1 - - + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnRemoveViaSizesClick - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -912,12 +912,12 @@ wxID_ANY Differential Pairs - + sbSizer6 wxVERTICAL 1 none - + 5 wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT @@ -927,30 +927,30 @@ 1 1 1 - - - - + + + + 0 0 - - - + + + 1 wxSYS_COLOUR_WINDOW - + wxALIGN_LEFT - + wxALIGN_TOP 0 1 - wxALIGN_CENTRE + wxALIGN_CENTER 24 "Width" "Gap" "Via Gap" - wxALIGN_CENTRE + wxALIGN_CENTER 3 125,125,125 - + 1 0 Dock @@ -962,103 +962,103 @@ 1 1 1 - + 1 - - + + 1 0 0 wxID_ANY - - - + + + 0 0 - + 0 - - + + 0 - + 1 m_diffPairsGrid 1 - - + + protected 1 - + Resizable - wxALIGN_CENTRE + wxALIGN_CENTER 0 "1" "2" "3" "4" "5" "6" "7" "8" - wxALIGN_CENTRE - + wxALIGN_CENTER + 8 1 - + WX_GRID; widgets/wx_grid.h; forward_declare 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1066,7 +1066,7 @@ wxEXPAND|wxTOP 0 - + bSizer5 wxHORIZONTAL none @@ -1079,88 +1079,88 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - + wxID_ANY MyButton - + 0 - - + + 0 30,30 1 m_diffPairsAddButton 1 - - + + protected 1 - + Resizable - + 1 - - + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnAddDiffPairsClick - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1182,88 +1182,88 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - + wxID_ANY MyButton - + 0 - - + + 0 30,30 1 m_diffPairsRemoveButton 1 - - + + protected 1 - + Resizable - + 1 - - + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnRemoveDiffPairsClick - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + +