~azonenberg/kicad/advanced-feature-bugfixes

« back to all changes in this revision

Viewing changes to pcbnew/dialogs/dialog_create_array_base.h

  • Committer: Andrew Zonenberg
  • Date: 2015-07-12 16:18:42 UTC
  • mfrom: (5925.1.2 kicad)
  • Revision ID: azonenberg@skipjack.lab.troy.drawersteak.com-20150712161842-4u0kwpcygx15yv10
Merged changes from mainline to this branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
67
67
                wxStaticText* m_labelStagger;
68
68
                wxTextCtrl* m_entryStagger;
69
69
                wxRadioBox* m_radioBoxGridStaggerType;
70
 
                wxStaticText* m_labelGridStaggerType;
71
70
                wxRadioBox* m_radioBoxGridNumberingAxis;
72
71
                wxCheckBox* m_checkBoxGridReverseNumbering;
73
72
                wxCheckBox* m_checkBoxGridRestartNumbering;
112
111
        
113
112
        public:
114
113
                
115
 
                DIALOG_CREATE_ARRAY_BASE( wxWindow* parent, wxWindowID id = wxID_DIALOG_CREATE_ARRAY, const wxString& title = _("Create array"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 576,428 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
 
114
                DIALOG_CREATE_ARRAY_BASE( wxWindow* parent, wxWindowID id = wxID_DIALOG_CREATE_ARRAY, const wxString& title = _("Create Array"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
116
115
                ~DIALOG_CREATE_ARRAY_BASE();
117
116
        
118
117
};