X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0a3d26b81f22b0269e4b3ab2c2bb1fb60c74fe06..c4e2838090992384911a6a6aa44cac985d79a555:/samples/widgets/spinbtn.cpp?ds=sidebyside diff --git a/samples/widgets/spinbtn.cpp b/samples/widgets/spinbtn.cpp index 1082559a93..d0c53b37bf 100644 --- a/samples/widgets/spinbtn.cpp +++ b/samples/widgets/spinbtn.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Program: wxWindows Widgets Sample +// Program: wxWidgets Widgets Sample // Name: spinbtn.cpp // Purpose: Part of the widgets sample showing wxSpinButton // Author: Vadim Zeitlin @@ -24,6 +24,8 @@ #pragma hdrstop #endif +#if wxUSE_SPINBTN + // for all others, include the necessary headers #ifndef WX_PRECOMP #include "wx/log.h" @@ -42,7 +44,7 @@ #include "wx/sizer.h" #include "widgets.h" -#if wxUSE_SPINBTN + #include "icons/spinbtn.xpm" // ---------------------------------------------------------------------------- @@ -71,8 +73,10 @@ enum class SpinBtnWidgetsPage : public WidgetsPage { public: - SpinBtnWidgetsPage(wxNotebook *notebook, wxImageList *imaglist); - virtual ~SpinBtnWidgetsPage(); + SpinBtnWidgetsPage(wxBookCtrl *book, wxImageList *imaglist); + virtual ~SpinBtnWidgetsPage(){}; + + virtual wxControl *GetWidget() const { return m_spinbtn; } protected: // event handlers @@ -152,8 +156,8 @@ BEGIN_EVENT_TABLE(SpinBtnWidgetsPage, WidgetsPage) EVT_SPIN_DOWN(SpinBtnPage_SpinBtn, SpinBtnWidgetsPage::OnSpinBtnDown) EVT_SPINCTRL(SpinBtnPage_SpinCtrl, SpinBtnWidgetsPage::OnSpinCtrl) - EVT_CHECKBOX(-1, SpinBtnWidgetsPage::OnCheckOrRadioBox) - EVT_RADIOBOX(-1, SpinBtnWidgetsPage::OnCheckOrRadioBox) + EVT_CHECKBOX(wxID_ANY, SpinBtnWidgetsPage::OnCheckOrRadioBox) + EVT_RADIOBOX(wxID_ANY, SpinBtnWidgetsPage::OnCheckOrRadioBox) END_EVENT_TABLE() // ============================================================================ @@ -162,9 +166,9 @@ END_EVENT_TABLE() IMPLEMENT_WIDGETS_PAGE(SpinBtnWidgetsPage, _T("Spin")); -SpinBtnWidgetsPage::SpinBtnWidgetsPage(wxNotebook *notebook, +SpinBtnWidgetsPage::SpinBtnWidgetsPage(wxBookCtrl *book, wxImageList *imaglist) - : WidgetsPage(notebook) + : WidgetsPage(book) { m_chkVert = NULL; m_chkWrap = NULL; @@ -188,7 +192,7 @@ SpinBtnWidgetsPage::SpinBtnWidgetsPage(wxNotebook *notebook, wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL); // left pane - wxStaticBox *box = new wxStaticBox(this, -1, _T("&Set style")); + wxStaticBox *box = new wxStaticBox(this, wxID_ANY, _T("&Set style")); wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL); m_chkVert = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Vertical")); @@ -200,14 +204,16 @@ SpinBtnWidgetsPage::SpinBtnWidgetsPage(wxNotebook *notebook, sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15); // middle pane - wxStaticBox *box2 = new wxStaticBox(this, -1, _T("&Change spinbtn value")); + wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, + _T("&Change spinbtn value")); + wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL); wxTextCtrl *text; wxSizer *sizerRow = CreateSizerWithTextAndLabel(_T("Current value"), SpinBtnPage_CurValueText, &text); - text->SetEditable(FALSE); + text->SetEditable(false); sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5); @@ -222,7 +228,7 @@ SpinBtnWidgetsPage::SpinBtnWidgetsPage(wxNotebook *notebook, SpinBtnPage_MinText, &m_textMin); - m_textMax = new wxTextCtrl(this, SpinBtnPage_MaxText, _T("")); + m_textMax = new wxTextCtrl(this, SpinBtnPage_MaxText, wxEmptyString); sizerRow->Add(m_textMax, 1, wxLEFT | wxALIGN_CENTRE_VERTICAL, 5); m_textMin->SetValue( wxString::Format(_T("%d"), m_min) ); @@ -244,24 +250,19 @@ SpinBtnWidgetsPage::SpinBtnWidgetsPage(wxNotebook *notebook, sizerTop->Add(sizerRight, 1, wxGROW | (wxALL & ~wxRIGHT), 10); // final initializations - SetAutoLayout(TRUE); SetSizer(sizerTop); sizerTop->Fit(this); } -SpinBtnWidgetsPage::~SpinBtnWidgetsPage() -{ -} - // ---------------------------------------------------------------------------- // operations // ---------------------------------------------------------------------------- void SpinBtnWidgetsPage::Reset() { - m_chkVert->SetValue(TRUE); - m_chkWrap->SetValue(FALSE); + m_chkVert->SetValue(true); + m_chkWrap->SetValue(false); } void SpinBtnWidgetsPage::CreateSpin()