X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8b611f0eb265e95343dc6c503debb6e908a8fd2e..c687b303a5040da07009ea93504121aeec56682a:/samples/widgets/slider.cpp?ds=sidebyside diff --git a/samples/widgets/slider.cpp b/samples/widgets/slider.cpp index b0f1fa8d3e..748049a4ef 100644 --- a/samples/widgets/slider.cpp +++ b/samples/widgets/slider.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Program: wxWindows Widgets Sample +// Program: wxWidgets Widgets Sample // Name: slider.cpp // Purpose: Part of the widgets sample showing wxSlider // Author: Vadim Zeitlin @@ -24,6 +24,8 @@ #pragma hdrstop #endif +#if wxUSE_SLIDER + // for all others, include the necessary headers #ifndef WX_PRECOMP #include "wx/log.h" @@ -44,7 +46,7 @@ #include "wx/sizer.h" #include "widgets.h" -#if wxUSE_SLIDER + #include "icons/slider.xpm" // ---------------------------------------------------------------------------- @@ -74,10 +76,10 @@ enum // sides radiobox values enum { - StaticSides_Top, - StaticSides_Bottom, - StaticSides_Left, - StaticSides_Right + SliderTicks_Top, + SliderTicks_Bottom, + SliderTicks_Left, + SliderTicks_Right }; // ---------------------------------------------------------------------------- @@ -87,8 +89,10 @@ enum class SliderWidgetsPage : public WidgetsPage { public: - SliderWidgetsPage(wxNotebook *notebook, wxImageList *imaglist); - virtual ~SliderWidgetsPage(); + SliderWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist); + virtual ~SliderWidgetsPage(){}; + + virtual wxControl *GetWidget() const { return m_slider; } protected: // event handlers @@ -138,7 +142,7 @@ protected: // the check/radio boxes for styles wxCheckBox *m_chkLabels, - *m_chkVert, + *m_chkInverse, *m_chkTicks, *m_chkBothSides; @@ -185,8 +189,8 @@ BEGIN_EVENT_TABLE(SliderWidgetsPage, WidgetsPage) EVT_COMMAND_SCROLL(SliderPage_Slider, SliderWidgetsPage::OnSlider) - EVT_CHECKBOX(-1, SliderWidgetsPage::OnCheckOrRadioBox) - EVT_RADIOBOX(-1, SliderWidgetsPage::OnCheckOrRadioBox) + EVT_CHECKBOX(wxID_ANY, SliderWidgetsPage::OnCheckOrRadioBox) + EVT_RADIOBOX(wxID_ANY, SliderWidgetsPage::OnCheckOrRadioBox) END_EVENT_TABLE() // ============================================================================ @@ -195,9 +199,9 @@ END_EVENT_TABLE() IMPLEMENT_WIDGETS_PAGE(SliderWidgetsPage, _T("Slider")); -SliderWidgetsPage::SliderWidgetsPage(wxNotebook *notebook, - wxImageList *imaglist) - : WidgetsPage(notebook) +SliderWidgetsPage::SliderWidgetsPage(wxBookCtrlBase *book, + wxImageList *imaglist) + : WidgetsPage(book) { imaglist->Add(wxBitmap(slider_xpm)); @@ -205,7 +209,7 @@ SliderWidgetsPage::SliderWidgetsPage(wxNotebook *notebook, m_min = 0; m_max = 100; - m_chkVert = + m_chkInverse = m_chkTicks = m_chkLabels = m_chkBothSides = (wxCheckBox *)NULL; @@ -218,10 +222,10 @@ SliderWidgetsPage::SliderWidgetsPage(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")); + m_chkInverse = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Inverse")); m_chkTicks = CreateCheckBoxAndAddToSizer(sizerLeft, _T("Show &ticks")); m_chkLabels = CreateCheckBoxAndAddToSizer(sizerLeft, _T("Show &labels")); static const wxString sides[] = @@ -248,14 +252,14 @@ SliderWidgetsPage::SliderWidgetsPage(wxNotebook *notebook, sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15); // middle pane - wxStaticBox *box2 = new wxStaticBox(this, -1, _T("&Change slider value")); + wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, _T("&Change slider value")); wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL); wxTextCtrl *text; wxSizer *sizerRow = CreateSizerWithTextAndLabel(_T("Current value"), SliderPage_CurValueText, &text); - text->SetEditable(FALSE); + text->SetEditable(false); sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5); @@ -270,7 +274,7 @@ SliderWidgetsPage::SliderWidgetsPage(wxNotebook *notebook, SliderPage_MinText, &m_textMin); - m_textMax = new wxTextCtrl(this, SliderPage_MaxText, _T("")); + m_textMax = new wxTextCtrl(this, SliderPage_MaxText, wxEmptyString); sizerRow->Add(m_textMax, 1, wxLEFT | wxALIGN_CENTRE_VERTICAL, 5); m_textMin->SetValue( wxString::Format(_T("%d"), m_min) ); @@ -288,7 +292,7 @@ SliderWidgetsPage::SliderWidgetsPage(wxNotebook *notebook, sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5); sizerRow = CreateSizerWithTextAndButton(SliderPage_SetThumbLen, - _T("Thumb &lenght"), + _T("Thumb &length"), SliderPage_ThumbLenText, &m_textThumbLen); @@ -308,39 +312,33 @@ SliderWidgetsPage::SliderWidgetsPage(wxNotebook *notebook, sizerTop->Add(sizerRight, 1, wxGROW | (wxALL & ~wxRIGHT), 10); // final initializations - SetAutoLayout(TRUE); SetSizer(sizerTop); sizerTop->Fit(this); } -SliderWidgetsPage::~SliderWidgetsPage() -{ -} - // ---------------------------------------------------------------------------- // operations // ---------------------------------------------------------------------------- void SliderWidgetsPage::Reset() { - m_chkVert->SetValue(FALSE); - m_chkTicks->SetValue(TRUE); - m_chkLabels->SetValue(TRUE); - m_chkBothSides->SetValue(FALSE); + m_chkInverse->SetValue(false); + m_chkTicks->SetValue(true); + m_chkLabels->SetValue(true); + m_chkBothSides->SetValue(false); - m_radioSides->SetSelection(StaticSides_Top); + m_radioSides->SetSelection(SliderTicks_Top); } void SliderWidgetsPage::CreateSlider() { int flags = 0; - bool isVert = m_chkVert->GetValue(); - if ( isVert ) - flags |= wxSL_VERTICAL; - else - flags |= wxSL_HORIZONTAL; + if ( m_chkInverse->GetValue() ) + { + flags |= wxSL_INVERSE; + } if ( m_chkLabels->GetValue() ) { @@ -354,18 +352,22 @@ void SliderWidgetsPage::CreateSlider() switch ( m_radioSides->GetSelection() ) { - case StaticSides_Top: + case SliderTicks_Top: flags |= wxSL_TOP; break; - case StaticSides_Left: + + case SliderTicks_Left: flags |= wxSL_LEFT; break; - case StaticSides_Bottom: + + case SliderTicks_Bottom: flags |= wxSL_BOTTOM; break; - case StaticSides_Right: + + case SliderTicks_Right: flags |= wxSL_RIGHT; break; + default: wxFAIL_MSG(_T("unexpected radiobox selection")); // fall through @@ -402,7 +404,7 @@ void SliderWidgetsPage::CreateSlider() wxDefaultPosition, wxDefaultSize, flags); - if ( isVert ) + if ( m_slider->HasFlag(wxSL_VERTICAL) ) { m_sizerSlider->Add(0, 0, 1); m_sizerSlider->Add(m_slider, 0, wxGROW | wxALL, 5); @@ -439,7 +441,7 @@ void SliderWidgetsPage::DoSetThumbLen() long len; if ( !m_textThumbLen->GetValue().ToLong(&len) ) { - wxLogWarning(_T("Invalid slider thumb lenght")); + wxLogWarning(_T("Invalid slider thumb length")); return; } @@ -485,6 +487,12 @@ void SliderWidgetsPage::OnButtonSetMinAndMax(wxCommandEvent& WXUNUSED(event)) m_max = maxNew; m_slider->SetRange(minNew, maxNew); + + if ( m_slider->GetMin() != m_min || + m_slider->GetMax() != m_max ) + { + wxLogWarning(_T("Invalid range in slider.")); + } } void SliderWidgetsPage::OnButtonSetValue(wxCommandEvent& WXUNUSED(event)) @@ -530,13 +538,14 @@ void SliderWidgetsPage::OnUpdateUIMinMaxButton(wxUpdateUIEvent& event) void SliderWidgetsPage::OnUpdateUIResetButton(wxUpdateUIEvent& event) { - event.Enable( m_chkVert->GetValue() || + event.Enable( m_chkInverse->GetValue() || !m_chkTicks->GetValue() || !m_chkLabels->GetValue() || - m_chkBothSides->GetValue() ); + m_chkBothSides->GetValue() || + m_radioSides->GetSelection() != SliderTicks_Top ); } -void SliderWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& event) +void SliderWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event)) { CreateSlider(); } @@ -556,7 +565,7 @@ void SliderWidgetsPage::OnUpdateUIBothSides(wxUpdateUIEvent& event) #if defined(__WIN95__) || defined(__WXUNIVERSAL__) event.Enable( m_chkTicks->GetValue() ); #else - event.Enable( FALSE ); + event.Enable( false ); #endif // defined(__WIN95__) || defined(__WXUNIVERSAL__) } @@ -582,7 +591,7 @@ void SliderWidgetsPage::OnSlider(wxScrollEvent& event) wxT("wxEVT_SCROLL_PAGEDOWN"), wxT("wxEVT_SCROLL_THUMBTRACK"), wxT("wxEVT_SCROLL_THUMBRELEASE"), - wxT("wxEVT_SCROLL_ENDSCROLL") + wxT("wxEVT_SCROLL_CHANGED") }; int index = eventType - wxEVT_SCROLL_TOP; @@ -597,11 +606,11 @@ void SliderWidgetsPage::OnSlider(wxScrollEvent& event) static int s_numSliderEvents = 0; - wxLogMessage(wxT("Slider event #%d: %s (pos = %d)"), + wxLogMessage(wxT("Slider event #%d: %s (pos = %d, int value = %ld)"), s_numSliderEvents++, eventNames[index], - event.GetPosition()); + event.GetPosition(), + event.GetInt()); } -#endif - // wxUSE_SLIDER +#endif // wxUSE_SLIDER