wxDefaultSize.* and wxDefaultPosition.* to wxDefaultCoord.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -660,8 +660,8 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
|
||||
|
||||
#if wxUSE_CHOICE
|
||||
panel = new wxPanel(m_notebook);
|
||||
m_choice = new wxChoice( panel, ID_CHOICE, wxPoint(10,10), wxSize(120,wxDefaultSize.y), 5, choices );
|
||||
m_choiceSorted = new wxChoice( panel, ID_CHOICE_SORTED, wxPoint(10,70), wxSize(120,wxDefaultSize.y),
|
||||
m_choice = new wxChoice( panel, ID_CHOICE, wxPoint(10,10), wxSize(120,wxDefaultCoord), 5, choices );
|
||||
m_choiceSorted = new wxChoice( panel, ID_CHOICE_SORTED, wxPoint(10,70), wxSize(120,wxDefaultCoord),
|
||||
5, choices, wxCB_SORT );
|
||||
|
||||
SetChoiceClientData(wxT("choice"), m_choice);
|
||||
@@ -684,7 +684,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
|
||||
(void)new wxStaticBox( panel, wxID_ANY, _T("&Box around combobox"),
|
||||
wxPoint(5, 5), wxSize(150, 100));
|
||||
m_combo = new MyComboBox( panel, ID_COMBO, _T("This"),
|
||||
wxPoint(20,25), wxSize(120, wxDefaultSize.y),
|
||||
wxPoint(20,25), wxSize(120, wxDefaultCoord),
|
||||
5, choices,
|
||||
wxCB_READONLY | wxPROCESS_ENTER);
|
||||
m_combo->SetBackgroundColour(*wxBLUE);
|
||||
@@ -734,7 +734,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
|
||||
m_gaugeVert = new wxGauge( panel, wxID_ANY, 100,
|
||||
wxPoint(195,35), wxSize(30, 90),
|
||||
wxGA_VERTICAL | wxGA_SMOOTH | wxNO_BORDER );
|
||||
m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200, wxPoint(18,90), wxSize(155,wxDefaultSize.y),
|
||||
m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200, wxPoint(18,90), wxSize(155,wxDefaultCoord),
|
||||
wxSL_AUTOTICKS | wxSL_LABELS );
|
||||
m_slider->SetTickFreq(40, 0);
|
||||
#if wxUSE_TOOLTIPS
|
||||
@@ -750,7 +750,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
|
||||
(void)new wxStaticText( panel, wxID_ANY,
|
||||
_T("Drag the slider!"),
|
||||
wxPoint(250,30),
|
||||
wxSize(240, wxDefaultSize.y)
|
||||
wxSize(240, wxDefaultCoord)
|
||||
);
|
||||
#else
|
||||
(void)new wxStaticText( panel, wxID_ANY,
|
||||
@@ -767,9 +767,9 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
|
||||
int initialSpinValue = -5;
|
||||
wxString s;
|
||||
s << initialSpinValue;
|
||||
m_spintext = new wxTextCtrl( panel, wxID_ANY, s, wxPoint(20,160), wxSize(80,wxDefaultSize.y) );
|
||||
m_spintext = new wxTextCtrl( panel, wxID_ANY, s, wxPoint(20,160), wxSize(80,wxDefaultCoord) );
|
||||
#if wxUSE_SPINBTN
|
||||
m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,160), wxSize(80, wxDefaultSize.y) );
|
||||
m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,160), wxSize(80, wxDefaultCoord) );
|
||||
m_spinbutton->SetRange(-40,30);
|
||||
m_spinbutton->SetValue(initialSpinValue);
|
||||
|
||||
@@ -778,7 +778,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
|
||||
#endif // wxUSE_SPINBTN
|
||||
|
||||
#if wxUSE_SPINCTRL
|
||||
m_spinctrl = new wxSpinCtrl( panel, ID_SPINCTRL, _T(""), wxPoint(200, 160), wxSize(80, wxDefaultSize.y) );
|
||||
m_spinctrl = new wxSpinCtrl( panel, ID_SPINCTRL, _T(""), wxPoint(200, 160), wxSize(80, wxDefaultCoord) );
|
||||
m_spinctrl->SetRange(10,30);
|
||||
m_spinctrl->SetValue(15);
|
||||
#endif // wxUSE_SPINCTRL
|
||||
|
Reference in New Issue
Block a user