X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32b8ec418aee4e38877d4cb79e2984c766dcc358..084ad0c2424aa998a640c151f8fa762435364449:/samples/widgets/spinbtn.cpp diff --git a/samples/widgets/spinbtn.cpp b/samples/widgets/spinbtn.cpp index 99862dfd6b..f7e793ac8c 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,10 +24,13 @@ #pragma hdrstop #endif +#if wxUSE_SPINBTN + // for all others, include the necessary headers #ifndef WX_PRECOMP #include "wx/log.h" + #include "wx/bitmap.h" #include "wx/button.h" #include "wx/checkbox.h" #include "wx/radiobox.h" @@ -51,7 +54,7 @@ // control ids enum { - SpinBtnPage_Reset = 100, + SpinBtnPage_Reset = wxID_HIGHEST, SpinBtnPage_Clear, SpinBtnPage_SetValue, SpinBtnPage_SetMinAndMax, @@ -70,8 +73,15 @@ enum class SpinBtnWidgetsPage : public WidgetsPage { public: - SpinBtnWidgetsPage(wxNotebook *notebook, wxImageList *imaglist); - virtual ~SpinBtnWidgetsPage(); + SpinBtnWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); + virtual ~SpinBtnWidgetsPage(){}; + + virtual wxControl *GetWidget() const { return m_spinbtn; } + virtual wxControl *GetWidget2() const { return m_spinctrl; } + virtual void RecreateWidget() { CreateSpin(); } + + // lazy creation of the content + virtual void CreateContent(); protected: // event handlers @@ -82,10 +92,10 @@ protected: void OnCheckOrRadioBox(wxCommandEvent& event); - void OnSpinBtn(wxCommandEvent& event); - void OnSpinBtnUp(wxCommandEvent& event); - void OnSpinBtnDown(wxCommandEvent& event); - void OnSpinCtrl(wxCommandEvent& event); + void OnSpinBtn(wxSpinEvent& event); + void OnSpinBtnUp(wxSpinEvent& event); + void OnSpinBtnDown(wxSpinEvent& event); + void OnSpinCtrl(wxSpinEvent& event); void OnUpdateUIValueButton(wxUpdateUIEvent& event); void OnUpdateUIMinMaxButton(wxUpdateUIEvent& event); @@ -126,8 +136,8 @@ protected: *m_textMax; private: - DECLARE_EVENT_TABLE(); - DECLARE_WIDGETS_PAGE(SpinBtnWidgetsPage); + DECLARE_EVENT_TABLE() + DECLARE_WIDGETS_PAGE(SpinBtnWidgetsPage) }; // ---------------------------------------------------------------------------- @@ -151,21 +161,35 @@ 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() // ============================================================================ // implementation // ============================================================================ -IMPLEMENT_WIDGETS_PAGE(SpinBtnWidgetsPage, _T("Spin")); +#if defined(__WXUNIVERSAL__) + #define FAMILY_CTRLS UNIVERSAL_CTRLS +#else + #define FAMILY_CTRLS NATIVE_CTRLS +#endif -SpinBtnWidgetsPage::SpinBtnWidgetsPage(wxNotebook *notebook, +IMPLEMENT_WIDGETS_PAGE(SpinBtnWidgetsPage, _T("Spin"), + FAMILY_CTRLS | EDITABLE_CTRLS + ); + +SpinBtnWidgetsPage::SpinBtnWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist) - : WidgetsPage(notebook) + : WidgetsPage(book, imaglist, spinbtn_xpm) { - imaglist->Add(wxBitmap(spinbtn_xpm)); + m_chkVert = NULL; + m_chkWrap = NULL; + m_spinbtn = NULL; + m_spinctrl = NULL; + m_textValue = NULL; + m_textMin = NULL; + m_textMax = NULL; // init everything m_min = 0; @@ -176,11 +200,14 @@ SpinBtnWidgetsPage::SpinBtnWidgetsPage(wxNotebook *notebook, m_spinbtn = (wxSpinButton *)NULL; m_sizerSpin = (wxSizer *)NULL; +} +void SpinBtnWidgetsPage::CreateContent() +{ 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")); @@ -192,14 +219,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); @@ -214,17 +243,17 @@ 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("%lu"), m_min)); - m_textMax->SetValue(wxString::Format(_T("%lu"), m_max)); + m_textMin->SetValue( wxString::Format(_T("%d"), m_min) ); + m_textMax->SetValue( wxString::Format(_T("%d"), m_max) ); sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5); // right pane wxSizer *sizerRight = new wxBoxSizer(wxVERTICAL); - sizerRight->SetMinSize(250, 0); + sizerRight->SetMinSize(150, 0); m_sizerSpin = sizerRight; // save it to modify it later Reset(); @@ -232,33 +261,28 @@ SpinBtnWidgetsPage::SpinBtnWidgetsPage(wxNotebook *notebook, // the 3 panes panes compose the window sizerTop->Add(sizerLeft, 0, wxGROW | (wxALL & ~wxLEFT), 10); - sizerTop->Add(sizerMiddle, 1, wxGROW | wxALL, 10); + sizerTop->Add(sizerMiddle, 0, wxGROW | wxALL, 10); 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() { - int flags = 0; + int flags = ms_defaultFlags; bool isVert = m_chkVert->GetValue(); if ( isVert ) @@ -278,13 +302,13 @@ void SpinBtnWidgetsPage::CreateSpin() val = valOld; } - m_sizerSpin->Remove(m_spinbtn); - m_sizerSpin->Remove(m_spinctrl); + m_sizerSpin->Detach( m_spinbtn ); + m_sizerSpin->Detach( m_spinctrl ); // there are 3 spacers left - m_sizerSpin->Remove((int)0); - m_sizerSpin->Remove((int)0); - m_sizerSpin->Remove((int)0); + m_sizerSpin->Remove( 0 ); + m_sizerSpin->Remove( 0 ); + m_sizerSpin->Remove( 0 ); delete m_spinbtn; delete m_spinctrl; @@ -329,7 +353,7 @@ void SpinBtnWidgetsPage::OnButtonSetMinAndMax(wxCommandEvent& WXUNUSED(event)) maxNew = 0; // init to suppress compiler warning if ( !m_textMin->GetValue().ToLong(&minNew) || !m_textMax->GetValue().ToLong(&maxNew) || - minNew >= maxNew ) + minNew > maxNew ) { wxLogWarning(_T("Invalid min/max values for the spinbtn.")); @@ -368,7 +392,7 @@ void SpinBtnWidgetsPage::OnUpdateUIMinMaxButton(wxUpdateUIEvent& event) long mn, mx; event.Enable( m_textMin->GetValue().ToLong(&mn) && m_textMax->GetValue().ToLong(&mx) && - mn < mx); + mn <= mx); } void SpinBtnWidgetsPage::OnUpdateUIResetButton(wxUpdateUIEvent& event) @@ -376,7 +400,7 @@ void SpinBtnWidgetsPage::OnUpdateUIResetButton(wxUpdateUIEvent& event) event.Enable( !m_chkVert->GetValue() || m_chkWrap->GetValue() ); } -void SpinBtnWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& event) +void SpinBtnWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event)) { CreateSpin(); } @@ -386,7 +410,7 @@ void SpinBtnWidgetsPage::OnUpdateUICurValueText(wxUpdateUIEvent& event) event.SetText( wxString::Format(_T("%d"), m_spinbtn->GetValue())); } -void SpinBtnWidgetsPage::OnSpinBtn(wxCommandEvent& event) +void SpinBtnWidgetsPage::OnSpinBtn(wxSpinEvent& event) { int value = event.GetInt(); @@ -396,20 +420,22 @@ void SpinBtnWidgetsPage::OnSpinBtn(wxCommandEvent& event) wxLogMessage(_T("Spin button value changed, now %d"), value); } -void SpinBtnWidgetsPage::OnSpinBtnUp(wxCommandEvent& event) +void SpinBtnWidgetsPage::OnSpinBtnUp(wxSpinEvent& event) { - wxLogMessage(_T("Spin button value incremented, will be %d (was %d)"), - event.GetInt(), m_spinbtn->GetValue()); + wxLogMessage( _T("Spin button value incremented, will be %d (was %d)"), + event.GetInt(), m_spinbtn->GetValue() ); } -void SpinBtnWidgetsPage::OnSpinBtnDown(wxCommandEvent& event) +void SpinBtnWidgetsPage::OnSpinBtnDown(wxSpinEvent& event) { - wxLogMessage(_T("Spin button value decremented, will be %d (was %d)"), - event.GetInt(), m_spinbtn->GetValue()); + wxLogMessage( _T("Spin button value decremented, will be %d (was %d)"), + event.GetInt(), m_spinbtn->GetValue() ); } -void SpinBtnWidgetsPage::OnSpinCtrl(wxCommandEvent& event) +void SpinBtnWidgetsPage::OnSpinCtrl(wxSpinEvent& event) { + if (!m_spinctrl) + return; int value = event.GetInt(); wxASSERT_MSG( value == m_spinctrl->GetValue(), @@ -417,3 +443,5 @@ void SpinBtnWidgetsPage::OnSpinCtrl(wxCommandEvent& event) wxLogMessage(_T("Spin control value changed, now %d"), value); } +#endif + // wxUSE_SPINBTN