// sides radiobox values
enum
{
- StaticSides_Top,
- StaticSides_Bottom,
- StaticSides_Left,
- StaticSides_Right
+ SliderTicks_Top,
+ SliderTicks_Bottom,
+ SliderTicks_Left,
+ SliderTicks_Right
};
// ----------------------------------------------------------------------------
class SliderWidgetsPage : public WidgetsPage
{
public:
- SliderWidgetsPage(wxBookCtrl *book, wxImageList *imaglist);
+ SliderWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist);
virtual ~SliderWidgetsPage(){};
virtual wxControl *GetWidget() const { return m_slider; }
// the check/radio boxes for styles
wxCheckBox *m_chkLabels,
- *m_chkVert,
*m_chkInverse,
*m_chkTicks,
*m_chkBothSides;
IMPLEMENT_WIDGETS_PAGE(SliderWidgetsPage, _T("Slider"));
-SliderWidgetsPage::SliderWidgetsPage(wxBookCtrl *book,
+SliderWidgetsPage::SliderWidgetsPage(wxBookCtrlBase *book,
wxImageList *imaglist)
: WidgetsPage(book)
{
m_min = 0;
m_max = 100;
- m_chkVert =
m_chkInverse =
m_chkTicks =
m_chkLabels =
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"));
void SliderWidgetsPage::Reset()
{
- m_chkVert->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;
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
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);
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))
void SliderWidgetsPage::OnUpdateUIResetButton(wxUpdateUIEvent& event)
{
- event.Enable( m_chkVert->GetValue() ||
- m_chkInverse->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& WXUNUSED(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;