From 322ce84fb33281a86563457f8ed7e8b07737bd60 Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Sat, 17 Feb 2018 19:53:19 -0500 Subject: [PATCH] Pcbnew: fix minor layout issues with track and via properties dialog. Fixes lp:1750196 https://bugs.launchpad.net/kicad/+bug/1750196 --- .../dialog_track_via_properties_base.cpp | 86 +- .../dialog_track_via_properties_base.fbp | 1203 +++++++---------- .../dialog_track_via_properties_base.h | 17 +- 3 files changed, 498 insertions(+), 808 deletions(-) diff --git a/pcbnew/dialogs/dialog_track_via_properties_base.cpp b/pcbnew/dialogs/dialog_track_via_properties_base.cpp index 8cd369e05a..c9c458921a 100644 --- a/pcbnew/dialogs/dialog_track_via_properties_base.cpp +++ b/pcbnew/dialogs/dialog_track_via_properties_base.cpp @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Aug 4 2017) +// C++ code generated with wxFormBuilder (version Nov 22 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #include "pcb_layer_box_selector.h" @@ -21,35 +21,15 @@ DIALOG_TRACK_VIA_PROPERTIES_BASE::DIALOG_TRACK_VIA_PROPERTIES_BASE( wxWindow* pa m_sbCommonSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Common") ), wxHORIZONTAL ); - wxFlexGridSizer* fgSizer6; - fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer6->AddGrowableCol( 1 ); - fgSizer6->SetFlexibleDirection( wxBOTH ); - fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText24 = new wxStaticText( m_sbCommonSizer->GetStaticBox(), wxID_ANY, _("Net:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText24->Wrap( -1 ); - fgSizer6->Add( m_staticText24, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + m_sbCommonSizer->Add( m_staticText24, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_NetComboBox = new WIDGET_NET_SELECTOR( m_sbCommonSizer->GetStaticBox(), wxID_ANY, _("Combo!"), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN|wxCB_READONLY ); - fgSizer6->Add( m_NetComboBox, 1, wxALL|wxEXPAND, 5 ); - - - m_sbCommonSizer->Add( fgSizer6, 1, wxEXPAND, 5 ); - - m_staticline3 = new wxStaticLine( m_sbCommonSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL ); - m_sbCommonSizer->Add( m_staticline3, 0, wxEXPAND | wxALL, 5 ); - - wxFlexGridSizer* fgSizer5; - fgSizer5 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer5->SetFlexibleDirection( wxBOTH ); - fgSizer5->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + m_sbCommonSizer->Add( m_NetComboBox, 1, wxALL|wxEXPAND, 5 ); m_lockedCbox = new wxCheckBox( m_sbCommonSizer->GetStaticBox(), wxID_ANY, _("Locked"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE ); - fgSizer5->Add( m_lockedCbox, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - - m_sbCommonSizer->Add( fgSizer5, 1, wxEXPAND|wxALIGN_BOTTOM, 5 ); + m_sbCommonSizer->Add( m_lockedCbox, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); m_MainSizer->Add( m_sbCommonSizer, 0, wxEXPAND|wxALL, 5 ); @@ -108,11 +88,8 @@ DIALOG_TRACK_VIA_PROPERTIES_BASE::DIALOG_TRACK_VIA_PROPERTIES_BASE( wxWindow* pa m_sbTrackSizer->Add( fgTrackLeftGridSizer, 1, wxEXPAND, 5 ); - m_trackStaticLine = new wxStaticLine( m_sbTrackSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL ); - m_sbTrackSizer->Add( m_trackStaticLine, 0, wxEXPAND | wxALL, 5 ); - wxFlexGridSizer* fgTrackRightSizer; - fgTrackRightSizer = new wxFlexGridSizer( 0, 3, 5, 5 ); + fgTrackRightSizer = new wxFlexGridSizer( 4, 3, 5, 5 ); fgTrackRightSizer->SetFlexibleDirection( wxBOTH ); fgTrackRightSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -155,7 +132,7 @@ DIALOG_TRACK_VIA_PROPERTIES_BASE::DIALOG_TRACK_VIA_PROPERTIES_BASE( wxWindow* pa m_sbViaSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Vias") ), wxHORIZONTAL ); wxFlexGridSizer* fgViaLeftSizer; - fgViaLeftSizer = new wxFlexGridSizer( 2, 3, 5, 5 ); + fgViaLeftSizer = new wxFlexGridSizer( 4, 3, 5, 5 ); fgViaLeftSizer->SetFlexibleDirection( wxBOTH ); fgViaLeftSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -181,14 +158,33 @@ DIALOG_TRACK_VIA_PROPERTIES_BASE::DIALOG_TRACK_VIA_PROPERTIES_BASE( wxWindow* pa m_ViaYUnit->Wrap( -1 ); fgViaLeftSizer->Add( m_ViaYUnit, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + m_ViaDiameterLabel = new wxStaticText( m_sbViaSizer->GetStaticBox(), wxID_ANY, _("Diameter:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_ViaDiameterLabel->Wrap( -1 ); + fgViaLeftSizer->Add( m_ViaDiameterLabel, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); + + m_ViaDiameterCtrl = new TEXT_CTRL_EVAL( m_sbViaSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgViaLeftSizer->Add( m_ViaDiameterCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + + m_ViaDiameterUnit = new wxStaticText( m_sbViaSizer->GetStaticBox(), wxID_ANY, _("Unit"), wxDefaultPosition, wxDefaultSize, 0 ); + m_ViaDiameterUnit->Wrap( -1 ); + fgViaLeftSizer->Add( m_ViaDiameterUnit, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + m_ViaDrillLabel = new wxStaticText( m_sbViaSizer->GetStaticBox(), wxID_ANY, _("Drill:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_ViaDrillLabel->Wrap( -1 ); + fgViaLeftSizer->Add( m_ViaDrillLabel, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); + + m_ViaDrillCtrl = new TEXT_CTRL_EVAL( m_sbViaSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgViaLeftSizer->Add( m_ViaDrillCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + + m_ViaDrillUnit = new wxStaticText( m_sbViaSizer->GetStaticBox(), wxID_ANY, _("Unit"), wxDefaultPosition, wxDefaultSize, 0 ); + m_ViaDrillUnit->Wrap( -1 ); + fgViaLeftSizer->Add( m_ViaDrillUnit, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + m_sbViaSizer->Add( fgViaLeftSizer, 1, wxEXPAND|wxALL, 5 ); - m_viaStaticLine = new wxStaticLine( m_sbViaSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL ); - m_sbViaSizer->Add( m_viaStaticLine, 0, wxEXPAND | wxALL, 5 ); - wxFlexGridSizer* fgViaRightSizer; - fgViaRightSizer = new wxFlexGridSizer( 0, 3, 5, 5 ); + fgViaRightSizer = new wxFlexGridSizer( 5, 3, 5, 5 ); fgViaRightSizer->SetFlexibleDirection( wxBOTH ); fgViaRightSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -205,28 +201,6 @@ DIALOG_TRACK_VIA_PROPERTIES_BASE::DIALOG_TRACK_VIA_PROPERTIES_BASE( wxWindow* pa m_DesignRuleViasUnit->Wrap( -1 ); fgViaRightSizer->Add( m_DesignRuleViasUnit, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - m_ViaDiameterLabel = new wxStaticText( m_sbViaSizer->GetStaticBox(), wxID_ANY, _("Diameter:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_ViaDiameterLabel->Wrap( -1 ); - fgViaRightSizer->Add( m_ViaDiameterLabel, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_ViaDiameterCtrl = new TEXT_CTRL_EVAL( m_sbViaSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgViaRightSizer->Add( m_ViaDiameterCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); - - m_ViaDiameterUnit = new wxStaticText( m_sbViaSizer->GetStaticBox(), wxID_ANY, _("Unit"), wxDefaultPosition, wxDefaultSize, 0 ); - m_ViaDiameterUnit->Wrap( -1 ); - fgViaRightSizer->Add( m_ViaDiameterUnit, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_ViaDrillLabel = new wxStaticText( m_sbViaSizer->GetStaticBox(), wxID_ANY, _("Drill:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_ViaDrillLabel->Wrap( -1 ); - fgViaRightSizer->Add( m_ViaDrillLabel, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_ViaDrillCtrl = new TEXT_CTRL_EVAL( m_sbViaSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgViaRightSizer->Add( m_ViaDrillCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); - - m_ViaDrillUnit = new wxStaticText( m_sbViaSizer->GetStaticBox(), wxID_ANY, _("Unit"), wxDefaultPosition, wxDefaultSize, 0 ); - m_ViaDrillUnit->Wrap( -1 ); - fgViaRightSizer->Add( m_ViaDrillUnit, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - m_ViaTypeLabel = new wxStaticText( m_sbViaSizer->GetStaticBox(), wxID_ANY, _("Via type:"), wxDefaultPosition, wxDefaultSize, 0 ); m_ViaTypeLabel->Wrap( -1 ); fgViaRightSizer->Add( m_ViaTypeLabel, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); diff --git a/pcbnew/dialogs/dialog_track_via_properties_base.fbp b/pcbnew/dialogs/dialog_track_via_properties_base.fbp index e1595e6e60..f0ac67bd6f 100644 --- a/pcbnew/dialogs/dialog_track_via_properties_base.fbp +++ b/pcbnew/dialogs/dialog_track_via_properties_base.fbp @@ -108,203 +108,9 @@ 5 - wxEXPAND - 1 - - 2 - wxBOTH - 1 - - 0 - - fgSizer6 - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 0 - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Net: - - 0 - - - 0 - - 1 - m_staticText24 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_NetComboBox - 1 - - - protected - 1 - - Resizable - -1 - 1 - - wxCB_DROPDOWN|wxCB_READONLY - WIDGET_NET_SELECTOR; widgets/widget_net_selector.h - 0 - - - wxFILTER_NONE - wxDefaultValidator - - Combo! - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND | wxALL + wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 1 1 @@ -332,6 +138,7 @@ 0 0 wxID_ANY + Net: 0 @@ -339,7 +146,7 @@ 0 1 - m_staticline3 + m_staticText24 1 @@ -349,13 +156,14 @@ Resizable 1 - wxLI_VERTICAL + 0 + -1 @@ -381,119 +189,194 @@ - + 5 - wxEXPAND|wxALIGN_BOTTOM + wxALL|wxEXPAND 1 - - 2 - wxBOTH - - - 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 - fgSizer5 - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 0 - - 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Locked - - 0 - - - 0 - - 1 - m_lockedCbox - 1 - - - protected - 1 - - Resizable - 1 - - wxCHK_3STATE - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + m_NetComboBox + 1 + + + protected + 1 + + Resizable + -1 + 1 + + wxCB_DROPDOWN|wxCB_READONLY + WIDGET_NET_SELECTOR; widgets/widget_net_selector.h + 0 + + + wxFILTER_NONE + wxDefaultValidator + + Combo! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Locked + + 0 + + + 0 + + 1 + m_lockedCbox + 1 + + + protected + 1 + + Resizable + 1 + + wxCHK_3STATE + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + 5 wxALL|wxEXPAND 0 - + wxID_ANY Tracks @@ -1548,87 +1431,6 @@ - - 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_trackStaticLine - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_VERTICAL - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 wxEXPAND @@ -1643,7 +1445,7 @@ fgTrackRightSizer wxFLEX_GROWMODE_SPECIFIED none - 0 + 4 5 5 @@ -2200,11 +2002,11 @@ - + 5 wxALL|wxEXPAND 0 - + wxID_ANY Vias @@ -2213,11 +2015,11 @@ 1 protected - + 5 wxEXPAND|wxALL 1 - + 3 wxBOTH @@ -2227,7 +2029,7 @@ fgViaLeftSizer wxFLEX_GROWMODE_SPECIFIED none - 2 + 4 5 5 @@ -2743,359 +2545,6 @@ - - - - 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_viaStaticLine - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_VERTICAL - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxALL - 1 - - 3 - wxBOTH - - - 5 - - fgViaRightSizer - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 5 - - 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Design rule vias: - - 0 - - - 0 - - 1 - m_DesignRuleVias - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_DesignRuleViasCtrl - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Unit - - 0 - - - 0 - - 1 - m_DesignRuleViasUnit - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - 5 wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL @@ -3610,6 +3059,278 @@ + + + + 5 + wxEXPAND|wxALL + 1 + + 3 + wxBOTH + + + 5 + + fgViaRightSizer + wxFLEX_GROWMODE_SPECIFIED + none + 5 + 5 + + 5 + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Design rule vias: + + 0 + + + 0 + + 1 + m_DesignRuleVias + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_DesignRuleViasCtrl + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Unit + + 0 + + + 0 + + 1 + m_DesignRuleViasUnit + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL diff --git a/pcbnew/dialogs/dialog_track_via_properties_base.h b/pcbnew/dialogs/dialog_track_via_properties_base.h index 0ab6e2bfc8..8a85678821 100644 --- a/pcbnew/dialogs/dialog_track_via_properties_base.h +++ b/pcbnew/dialogs/dialog_track_via_properties_base.h @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Aug 4 2017) +// C++ code generated with wxFormBuilder (version Nov 22 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #ifndef __DIALOG_TRACK_VIA_PROPERTIES_BASE_H__ @@ -11,7 +11,6 @@ #include #include #include -class DIALOG_SHIM; class PCB_LAYER_BOX_SELECTOR; class TEXT_CTRL_EVAL; class WIDGET_NET_SELECTOR; @@ -24,9 +23,8 @@ class WIDGET_NET_SELECTOR; #include #include #include -#include -#include #include +#include #include #include #include @@ -49,7 +47,6 @@ class DIALOG_TRACK_VIA_PROPERTIES_BASE : public DIALOG_SHIM wxStaticBoxSizer* m_sbCommonSizer; wxStaticText* m_staticText24; WIDGET_NET_SELECTOR* m_NetComboBox; - wxStaticLine* m_staticline3; wxCheckBox* m_lockedCbox; wxStaticBoxSizer* m_sbTrackSizer; wxStaticText* m_TrackStartXLabel; @@ -64,7 +61,6 @@ class DIALOG_TRACK_VIA_PROPERTIES_BASE : public DIALOG_SHIM wxStaticText* m_TrackEndYLabel; TEXT_CTRL_EVAL* m_TrackEndYCtrl; wxStaticText* m_TrackEndYUnit; - wxStaticLine* m_trackStaticLine; wxStaticText* m_TrackWidthLabel; wxComboBox* m_TrackWidthCtrl; wxStaticText* m_TrackWidthUnit; @@ -78,16 +74,15 @@ class DIALOG_TRACK_VIA_PROPERTIES_BASE : public DIALOG_SHIM wxStaticText* m_ViaYLabel; TEXT_CTRL_EVAL* m_ViaYCtrl; wxStaticText* m_ViaYUnit; - wxStaticLine* m_viaStaticLine; - wxStaticText* m_DesignRuleVias; - wxChoice* m_DesignRuleViasCtrl; - wxStaticText* m_DesignRuleViasUnit; wxStaticText* m_ViaDiameterLabel; TEXT_CTRL_EVAL* m_ViaDiameterCtrl; wxStaticText* m_ViaDiameterUnit; wxStaticText* m_ViaDrillLabel; TEXT_CTRL_EVAL* m_ViaDrillCtrl; wxStaticText* m_ViaDrillUnit; + wxStaticText* m_DesignRuleVias; + wxChoice* m_DesignRuleViasCtrl; + wxStaticText* m_DesignRuleViasUnit; wxStaticText* m_ViaTypeLabel; wxChoice* m_ViaTypeChoice; wxStaticText* m_ViaStartLayerLabel;