From a9bcaa149308e32a0094a4325fce226bf52f1cdd Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sat, 16 Mar 2013 12:12:18 +0100 Subject: [PATCH] Pcbnew: designe rule dialog: fix incorect size of track list grid --- pcbnew/dialogs/dialog_design_rules_base.cpp | 19 ++++++------------- pcbnew/dialogs/dialog_design_rules_base.fbp | 2 +- pcbnew/dialogs/dialog_design_rules_base.h | 6 ++++-- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/pcbnew/dialogs/dialog_design_rules_base.cpp b/pcbnew/dialogs/dialog_design_rules_base.cpp index 3ba3a1ed1d..8ac00e5da3 100644 --- a/pcbnew/dialogs/dialog_design_rules_base.cpp +++ b/pcbnew/dialogs/dialog_design_rules_base.cpp @@ -1,10 +1,12 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 10 2012) +// C++ code generated with wxFormBuilder (version Oct 8 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// +#include "dialog_design_rules_aux_helper_class.h" + #include "dialog_design_rules_base.h" /////////////////////////////////////////////////////////////////////////// @@ -198,6 +200,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID fgMinValuesSizer->Add( m_TrackMinWidthTitle, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 ); m_SetTrackMinWidthCtrl = new wxTextCtrl( m_panelGolbalDesignRules, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_SetTrackMinWidthCtrl->SetMaxLength( 0 ); fgMinValuesSizer->Add( m_SetTrackMinWidthCtrl, 0, wxALL|wxEXPAND, 5 ); m_ViaMinTitle = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("Min via diameter"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -205,6 +208,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID fgMinValuesSizer->Add( m_ViaMinTitle, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); m_SetViasMinSizeCtrl = new wxTextCtrl( m_panelGolbalDesignRules, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_SetViasMinSizeCtrl->SetMaxLength( 0 ); fgMinValuesSizer->Add( m_SetViasMinSizeCtrl, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_ViaMinDrillTitle = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("Min via drill dia"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -212,6 +216,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID fgMinValuesSizer->Add( m_ViaMinDrillTitle, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_RIGHT, 5 ); m_SetViasMinDrillCtrl = new wxTextCtrl( m_panelGolbalDesignRules, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_SetViasMinDrillCtrl->SetMaxLength( 0 ); fgMinValuesSizer->Add( m_SetViasMinDrillCtrl, 0, wxALL|wxEXPAND, 5 ); m_MicroViaMinSizeTitle = new wxStaticText( m_panelGolbalDesignRules, wxID_ANY, _("Min uvia diameter"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -323,18 +328,6 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID m_gridTrackWidthList->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); // Rows - m_gridTrackWidthList->SetRowSize( 0, 17 ); - m_gridTrackWidthList->SetRowSize( 1, 17 ); - m_gridTrackWidthList->SetRowSize( 2, 17 ); - m_gridTrackWidthList->SetRowSize( 3, 17 ); - m_gridTrackWidthList->SetRowSize( 4, 17 ); - m_gridTrackWidthList->SetRowSize( 5, 17 ); - m_gridTrackWidthList->SetRowSize( 6, 17 ); - m_gridTrackWidthList->SetRowSize( 7, 17 ); - m_gridTrackWidthList->SetRowSize( 8, 17 ); - m_gridTrackWidthList->SetRowSize( 9, 17 ); - m_gridTrackWidthList->SetRowSize( 10, 17 ); - m_gridTrackWidthList->SetRowSize( 11, 17 ); m_gridTrackWidthList->EnableDragRowSize( true ); m_gridTrackWidthList->SetRowLabelSize( 80 ); m_gridTrackWidthList->SetRowLabelValue( 0, _("Track 1") ); diff --git a/pcbnew/dialogs/dialog_design_rules_base.fbp b/pcbnew/dialogs/dialog_design_rules_base.fbp index 7366270a2a..2316fb1836 100644 --- a/pcbnew/dialogs/dialog_design_rules_base.fbp +++ b/pcbnew/dialogs/dialog_design_rules_base.fbp @@ -3256,7 +3256,7 @@ 80 "Track 1" "Track 2" "Track 3" "Track 4" "Track 5" "Track 6" "Track 7" "Track 8" "Track 9" "Track 10" "Track 11" "Track 12" wxALIGN_CENTRE - 17,17,17,17,17,17,17,17,17,17,17,17 + 12 1 diff --git a/pcbnew/dialogs/dialog_design_rules_base.h b/pcbnew/dialogs/dialog_design_rules_base.h index d1fba14b3a..431807b834 100644 --- a/pcbnew/dialogs/dialog_design_rules_base.h +++ b/pcbnew/dialogs/dialog_design_rules_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 10 2012) +// C++ code generated with wxFormBuilder (version Oct 8 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -11,7 +11,9 @@ #include #include #include -#include "dialog_design_rules_aux_helper_class.h" +class DIALOG_SHIM; +class NETS_LIST_CTRL; + #include "dialog_shim.h" #include #include