/////////////////////////////////////////////////////////////////////////////
-// Program: wxWindows Widgets Sample
+// Program: wxWidgets Widgets Sample
// Name: slider.cpp
// Purpose: Part of the widgets sample showing wxSlider
// Author: Vadim Zeitlin
// Created: 16.04.01
// Id: $Id$
// Copyright: (c) 2001 Vadim Zeitlin
-// License: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
#pragma hdrstop
#endif
+#if wxUSE_SLIDER
+
// 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"
#include "wx/textctrl.h"
#endif
+#if wxUSE_TOOLTIPS
+ #include "wx/tooltip.h"
+#endif
+
#include "wx/sizer.h"
#include "widgets.h"
+
#include "icons/slider.xpm"
// ----------------------------------------------------------------------------
SliderPage_Clear,
SliderPage_SetValue,
SliderPage_SetMinAndMax,
+ SliderPage_SetLineSize,
+ SliderPage_SetPageSize,
SliderPage_SetTickFreq,
+ SliderPage_SetThumbLen,
SliderPage_CurValueText,
SliderPage_ValueText,
SliderPage_MinText,
SliderPage_MaxText,
+ SliderPage_LineSizeText,
+ SliderPage_PageSizeText,
SliderPage_TickFreqText,
- SliderPage_OtherSide,
+ SliderPage_ThumbLenText,
+ SliderPage_RadioSides,
+ SliderPage_BothSides,
SliderPage_Slider
};
+// sides radiobox values
+enum
+{
+ SliderTicks_None,
+ SliderTicks_Top,
+ SliderTicks_Bottom,
+ SliderTicks_Left,
+ SliderTicks_Right
+};
+
// ----------------------------------------------------------------------------
// SliderWidgetsPage
// ----------------------------------------------------------------------------
class SliderWidgetsPage : public WidgetsPage
{
public:
- SliderWidgetsPage(wxNotebook *notebook, wxImageList *imaglist);
- virtual ~SliderWidgetsPage();
+ SliderWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
+ virtual ~SliderWidgetsPage(){};
+
+ virtual wxControl *GetWidget() const { return m_slider; }
+ virtual void RecreateWidget() { CreateSlider(); }
+
+ // lazy creation of the content
+ virtual void CreateContent();
protected:
// event handlers
void OnButtonClear(wxCommandEvent& event);
void OnButtonSetValue(wxCommandEvent& event);
void OnButtonSetMinAndMax(wxCommandEvent& event);
+ void OnButtonSetLineSize(wxCommandEvent& event);
+ void OnButtonSetPageSize(wxCommandEvent& event);
void OnButtonSetTickFreq(wxCommandEvent& event);
+ void OnButtonSetThumbLen(wxCommandEvent& event);
void OnCheckOrRadioBox(wxCommandEvent& event);
void OnSlider(wxScrollEvent& event);
- void OnUpdateUIOtherSide(wxUpdateUIEvent& event);
void OnUpdateUIValueButton(wxUpdateUIEvent& event);
void OnUpdateUIMinMaxButton(wxUpdateUIEvent& event);
+ void OnUpdateUILineSize(wxUpdateUIEvent& event);
+ void OnUpdateUIPageSize(wxUpdateUIEvent& event);
void OnUpdateUITickFreq(wxUpdateUIEvent& event);
+ void OnUpdateUIThumbLen(wxUpdateUIEvent& event);
+ void OnUpdateUIRadioSides(wxUpdateUIEvent& event);
+ void OnUpdateUIBothSides(wxUpdateUIEvent& event);
void OnUpdateUIResetButton(wxUpdateUIEvent& event);
// (re)create the slider
void CreateSlider();
+ // set the line size from the text field value
+ void DoSetLineSize();
+
+ // set the page size from the text field value
+ void DoSetPageSize();
+
// set the tick frequency from the text field value
void DoSetTickFreq();
+ // set the thumb len from the text field value
+ void DoSetThumbLen();
+
// is this slider value in range?
bool IsValidValue(int val) const
{ return (val >= m_min) && (val <= m_max); }
// ------------
// the check/radio boxes for styles
- wxCheckBox *m_chkLabels,
- *m_chkOtherSide,
- *m_chkVert,
- *m_chkTicks;
+ wxCheckBox *m_chkMinMaxLabels,
+ *m_chkValueLabel,
+ *m_chkInverse,
+ *m_chkTicks,
+ *m_chkBothSides;
+
+ wxRadioBox *m_radioSides;
// the slider itself and the sizer it is in
wxSlider *m_slider;
wxTextCtrl *m_textValue,
*m_textMin,
*m_textMax,
- *m_textTickFreq;
+ *m_textLineSize,
+ *m_textPageSize,
+ *m_textTickFreq,
+ *m_textThumbLen;
private:
DECLARE_EVENT_TABLE()
EVT_BUTTON(SliderPage_Reset, SliderWidgetsPage::OnButtonReset)
EVT_BUTTON(SliderPage_SetValue, SliderWidgetsPage::OnButtonSetValue)
EVT_BUTTON(SliderPage_SetMinAndMax, SliderWidgetsPage::OnButtonSetMinAndMax)
+ EVT_BUTTON(SliderPage_SetLineSize, SliderWidgetsPage::OnButtonSetLineSize)
+ EVT_BUTTON(SliderPage_SetPageSize, SliderWidgetsPage::OnButtonSetPageSize)
EVT_BUTTON(SliderPage_SetTickFreq, SliderWidgetsPage::OnButtonSetTickFreq)
-
- EVT_UPDATE_UI(SliderPage_OtherSide, SliderWidgetsPage::OnUpdateUIOtherSide)
+ EVT_BUTTON(SliderPage_SetThumbLen, SliderWidgetsPage::OnButtonSetThumbLen)
EVT_UPDATE_UI(SliderPage_SetValue, SliderWidgetsPage::OnUpdateUIValueButton)
EVT_UPDATE_UI(SliderPage_SetMinAndMax, SliderWidgetsPage::OnUpdateUIMinMaxButton)
+ EVT_UPDATE_UI(SliderPage_SetLineSize, SliderWidgetsPage::OnUpdateUILineSize)
+ EVT_UPDATE_UI(SliderPage_SetPageSize, SliderWidgetsPage::OnUpdateUIPageSize)
EVT_UPDATE_UI(SliderPage_SetTickFreq, SliderWidgetsPage::OnUpdateUITickFreq)
- EVT_UPDATE_UI(SliderPage_TickFreqText, SliderWidgetsPage::OnUpdateUITickFreq)
+ EVT_UPDATE_UI(SliderPage_SetThumbLen, SliderWidgetsPage::OnUpdateUIThumbLen)
+ EVT_UPDATE_UI(SliderPage_RadioSides, SliderWidgetsPage::OnUpdateUIRadioSides)
+ EVT_UPDATE_UI(SliderPage_BothSides, SliderWidgetsPage::OnUpdateUIBothSides)
EVT_UPDATE_UI(SliderPage_Reset, SliderWidgetsPage::OnUpdateUIResetButton)
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()
// ============================================================================
// implementation
// ============================================================================
-IMPLEMENT_WIDGETS_PAGE(SliderWidgetsPage, _T("Slider"));
+#if defined(__WXUNIVERSAL__)
+ #define FAMILY_CTRLS UNIVERSAL_CTRLS
+#else
+ #define FAMILY_CTRLS NATIVE_CTRLS
+#endif
+
+IMPLEMENT_WIDGETS_PAGE(SliderWidgetsPage, wxT("Slider"), FAMILY_CTRLS );
-SliderWidgetsPage::SliderWidgetsPage(wxNotebook *notebook,
- wxImageList *imaglist)
- : WidgetsPage(notebook)
+SliderWidgetsPage::SliderWidgetsPage(WidgetsBookCtrl *book,
+ wxImageList *imaglist)
+ : WidgetsPage(book, imaglist, slider_xpm)
{
- imaglist->Add(wxBitmap(slider_xpm));
-
// init everything
m_min = 0;
m_max = 100;
- m_chkVert =
+ m_chkInverse =
m_chkTicks =
- m_chkLabels =
- m_chkOtherSide = (wxCheckBox *)NULL;
+ m_chkMinMaxLabels =
+ m_chkValueLabel =
+ m_chkBothSides = (wxCheckBox *)NULL;
+
+ m_radioSides = (wxRadioBox *)NULL;
m_slider = (wxSlider *)NULL;
m_sizerSlider = (wxSizer *)NULL;
+}
+void SliderWidgetsPage::CreateContent()
+{
wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
// left pane
- wxStaticBox *box = new wxStaticBox(this, -1, _T("&Set style"));
+ wxStaticBox *box = new wxStaticBox(this, wxID_ANY, wxT("&Set style"));
wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
- m_chkVert = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Vertical"));
- m_chkTicks = CreateCheckBoxAndAddToSizer(sizerLeft, _T("Show &ticks"));
- m_chkLabels = CreateCheckBoxAndAddToSizer(sizerLeft, _T("Show &labels"));
- m_chkOtherSide = CreateCheckBoxAndAddToSizer
- (
- sizerLeft,
- _T("On &other side"),
- SliderPage_OtherSide
- );
+ m_chkInverse = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Inverse"));
+ m_chkTicks = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("Show &ticks"));
+ m_chkMinMaxLabels = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("Show min/max &labels"));
+ m_chkValueLabel = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("Show &value label"));
+ static const wxString sides[] =
+ {
+ wxT("default"),
+ wxT("top"),
+ wxT("bottom"),
+ wxT("left"),
+ wxT("right"),
+ };
+ m_radioSides = new wxRadioBox(this, SliderPage_RadioSides, wxT("&Label position"),
+ wxDefaultPosition, wxDefaultSize,
+ WXSIZEOF(sides), sides,
+ 1, wxRA_SPECIFY_COLS);
+ sizerLeft->Add(m_radioSides, 0, wxGROW | wxALL, 5);
+ m_chkBothSides = CreateCheckBoxAndAddToSizer
+ (sizerLeft, wxT("&Both sides"), SliderPage_BothSides);
+#if wxUSE_TOOLTIPS
+ m_chkBothSides->SetToolTip( wxT("\"Both sides\" is only supported \nin Win95 and Universal") );
+#endif // wxUSE_TOOLTIPS
sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
- wxButton *btn = new wxButton(this, SliderPage_Reset, _T("&Reset"));
+ wxButton *btn = new wxButton(this, SliderPage_Reset, wxT("&Reset"));
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, wxT("&Change slider value"));
wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL);
wxTextCtrl *text;
- wxSizer *sizerRow = CreateSizerWithTextAndLabel(_T("Current value"),
+ wxSizer *sizerRow = CreateSizerWithTextAndLabel(wxT("Current value"),
SliderPage_CurValueText,
&text);
- text->SetEditable(FALSE);
+ text->SetEditable(false);
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
sizerRow = CreateSizerWithTextAndButton(SliderPage_SetValue,
- _T("Set &value"),
+ wxT("Set &value"),
SliderPage_ValueText,
&m_textValue);
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
sizerRow = CreateSizerWithTextAndButton(SliderPage_SetMinAndMax,
- _T("&Min and max"),
+ wxT("&Min and max"),
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) );
- m_textMax->SetValue( wxString::Format(_T("%d"), m_max) );
+ m_textMin->SetValue( wxString::Format(wxT("%d"), m_min) );
+ m_textMax->SetValue( wxString::Format(wxT("%d"), m_max) );
+
+ sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
+
+ sizerRow = CreateSizerWithTextAndButton(SliderPage_SetLineSize,
+ wxT("Li&ne size"),
+ SliderPage_LineSizeText,
+ &m_textLineSize);
+
+ sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
+
+ sizerRow = CreateSizerWithTextAndButton(SliderPage_SetPageSize,
+ wxT("P&age size"),
+ SliderPage_PageSizeText,
+ &m_textPageSize);
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
sizerRow = CreateSizerWithTextAndButton(SliderPage_SetTickFreq,
- _T("Tick &frequency"),
+ wxT("Tick &frequency"),
SliderPage_TickFreqText,
&m_textTickFreq);
- m_textTickFreq->SetValue(_T("10"));
+ m_textTickFreq->SetValue(wxT("10"));
+
+ sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
+
+ sizerRow = CreateSizerWithTextAndButton(SliderPage_SetThumbLen,
+ wxT("Thumb &length"),
+ SliderPage_ThumbLenText,
+ &m_textThumbLen);
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
// right pane
wxSizer *sizerRight = new wxBoxSizer(wxHORIZONTAL);
- sizerRight->SetMinSize(150, 0);
+ sizerRight->SetMinSize(150, 40);
m_sizerSlider = sizerRight; // save it to modify it later
Reset();
CreateSlider();
+ m_textLineSize->SetValue(wxString::Format(wxT("%d"), m_slider->GetLineSize()));
+ m_textPageSize->SetValue(wxString::Format(wxT("%d"), m_slider->GetPageSize()));
+
// the 3 panes panes compose the window
sizerTop->Add(sizerLeft, 0, wxGROW | (wxALL & ~wxLEFT), 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);
-}
-
-SliderWidgetsPage::~SliderWidgetsPage()
-{
}
// ----------------------------------------------------------------------------
void SliderWidgetsPage::Reset()
{
- m_chkLabels->SetValue(TRUE);
- m_chkTicks->SetValue(FALSE);
- m_chkVert->SetValue(FALSE);
- m_chkOtherSide->SetValue(FALSE);
+ m_chkInverse->SetValue(false);
+ m_chkTicks->SetValue(true);
+ m_chkValueLabel->SetValue(true);
+ m_chkMinMaxLabels->SetValue(true);
+ m_chkBothSides->SetValue(false);
+
+ m_radioSides->SetSelection(SliderTicks_None);
}
void SliderWidgetsPage::CreateSlider()
{
- int flags = 0;
+ int flags = ms_defaultFlags;
- 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() )
+ if ( m_chkMinMaxLabels->GetValue() )
{
- flags |= wxSL_LABELS;
+ flags |= wxSL_MIN_MAX_LABELS;
+ }
- if ( m_chkOtherSide->GetValue() )
- flags |= isVert ? wxSL_RIGHT : wxSL_BOTTOM;
- else
- flags |= isVert ? wxSL_LEFT : wxSL_TOP;
+ if ( m_chkValueLabel->GetValue() )
+ {
+ flags |= wxSL_VALUE_LABEL;
}
if ( m_chkTicks->GetValue() )
flags |= wxSL_AUTOTICKS;
}
+ // notice that the style names refer to the _ticks_ positions while we want
+ // to allow the user to select the label(s) positions and the labels are on
+ // the opposite side from the ticks, hence the apparent reversal below
+ switch ( m_radioSides->GetSelection() )
+ {
+ case SliderTicks_None:
+ break;
+
+ case SliderTicks_Top:
+ flags |= wxSL_BOTTOM;
+ break;
+
+ case SliderTicks_Left:
+ flags |= wxSL_RIGHT | wxSL_VERTICAL;
+ break;
+
+ case SliderTicks_Bottom:
+ flags |= wxSL_TOP;
+ break;
+
+ case SliderTicks_Right:
+ flags |= wxSL_LEFT | wxSL_VERTICAL;
+ break;
+
+ default:
+ wxFAIL_MSG(wxT("unexpected radiobox selection"));
+ // fall through
+ }
+
+ if ( m_chkBothSides->GetValue() )
+ {
+ flags |= wxSL_BOTH;
+ }
+
int val = m_min;
if ( m_slider )
{
val = valOld;
}
- m_sizerSlider->Remove(m_slider);
+ m_sizerSlider->Detach( m_slider );
if ( m_sizerSlider->GetChildren().GetCount() )
{
// we have 2 spacers, remove them too
- m_sizerSlider->Remove((int)0);
- m_sizerSlider->Remove((int)0);
+ m_sizerSlider->Remove( 0 );
+ m_sizerSlider->Remove( 0 );
}
delete m_slider;
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_sizerSlider->Layout();
}
+void SliderWidgetsPage::DoSetLineSize()
+{
+ long lineSize;
+ if ( !m_textLineSize->GetValue().ToLong(&lineSize) )
+ {
+ wxLogWarning(wxT("Invalid slider line size"));
+
+ return;
+ }
+
+ m_slider->SetLineSize(lineSize);
+
+ if ( m_slider->GetLineSize() != lineSize )
+ {
+ wxLogWarning(wxT("Invalid line size in slider."));
+ }
+}
+
+void SliderWidgetsPage::DoSetPageSize()
+{
+ long pageSize;
+ if ( !m_textPageSize->GetValue().ToLong(&pageSize) )
+ {
+ wxLogWarning(wxT("Invalid slider page size"));
+
+ return;
+ }
+
+ m_slider->SetPageSize(pageSize);
+
+ if ( m_slider->GetPageSize() != pageSize )
+ {
+ wxLogWarning(wxT("Invalid page size in slider."));
+ }
+}
+
void SliderWidgetsPage::DoSetTickFreq()
{
long freq;
if ( !m_textTickFreq->GetValue().ToLong(&freq) )
{
- wxLogWarning(_T("Invalid slider tick frequency"));
+ wxLogWarning(wxT("Invalid slider tick frequency"));
return;
}
- m_slider->SetTickFreq(freq, 0 /* unused */);
+ m_slider->SetTickFreq(freq);
+}
+
+void SliderWidgetsPage::DoSetThumbLen()
+{
+ long len;
+ if ( !m_textThumbLen->GetValue().ToLong(&len) )
+ {
+ wxLogWarning(wxT("Invalid slider thumb length"));
+
+ return;
+ }
+
+ m_slider->SetThumbLength(len);
}
// ----------------------------------------------------------------------------
CreateSlider();
}
+void SliderWidgetsPage::OnButtonSetLineSize(wxCommandEvent& WXUNUSED(event))
+{
+ DoSetLineSize();
+}
+
+void SliderWidgetsPage::OnButtonSetPageSize(wxCommandEvent& WXUNUSED(event))
+{
+ DoSetPageSize();
+}
+
void SliderWidgetsPage::OnButtonSetTickFreq(wxCommandEvent& WXUNUSED(event))
{
DoSetTickFreq();
}
+void SliderWidgetsPage::OnButtonSetThumbLen(wxCommandEvent& WXUNUSED(event))
+{
+ DoSetThumbLen();
+}
+
void SliderWidgetsPage::OnButtonSetMinAndMax(wxCommandEvent& WXUNUSED(event))
{
long minNew,
!m_textMax->GetValue().ToLong(&maxNew) ||
minNew >= maxNew )
{
- wxLogWarning(_T("Invalid min/max values for the slider."));
+ wxLogWarning(wxT("Invalid min/max values for the slider."));
return;
}
m_max = maxNew;
m_slider->SetRange(minNew, maxNew);
+
+ if ( m_slider->GetMin() != m_min ||
+ m_slider->GetMax() != m_max )
+ {
+ wxLogWarning(wxT("Invalid range in slider."));
+ }
}
void SliderWidgetsPage::OnButtonSetValue(wxCommandEvent& WXUNUSED(event))
long val;
if ( !m_textValue->GetValue().ToLong(&val) || !IsValidValue(val) )
{
- wxLogWarning(_T("Invalid slider value."));
+ wxLogWarning(wxT("Invalid slider value."));
return;
}
event.Enable( m_textValue->GetValue().ToLong(&val) && IsValidValue(val) );
}
+void SliderWidgetsPage::OnUpdateUILineSize(wxUpdateUIEvent& event)
+{
+ long lineSize;
+ event.Enable( m_textLineSize->GetValue().ToLong(&lineSize) &&
+ (lineSize > 0) && (lineSize <= m_max - m_min) );
+}
+
+void SliderWidgetsPage::OnUpdateUIPageSize(wxUpdateUIEvent& event)
+{
+ long pageSize;
+ event.Enable( m_textPageSize->GetValue().ToLong(&pageSize) &&
+ (pageSize > 0) && (pageSize <= m_max - m_min) );
+}
+
void SliderWidgetsPage::OnUpdateUITickFreq(wxUpdateUIEvent& event)
{
long freq;
(freq > 0) && (freq <= m_max - m_min) );
}
+void SliderWidgetsPage::OnUpdateUIThumbLen(wxUpdateUIEvent& event)
+{
+ long val;
+ event.Enable( m_textThumbLen->GetValue().ToLong(&val));
+}
+
void SliderWidgetsPage::OnUpdateUIMinMaxButton(wxUpdateUIEvent& event)
{
long mn, mx;
void SliderWidgetsPage::OnUpdateUIResetButton(wxUpdateUIEvent& event)
{
- event.Enable( m_chkVert->GetValue() ||
- !m_chkLabels->GetValue() ||
- m_chkOtherSide->GetValue() ||
- m_chkTicks->GetValue() );
+ event.Enable( m_chkInverse->GetValue() ||
+ !m_chkTicks->GetValue() ||
+ !m_chkValueLabel->GetValue() ||
+ !m_chkMinMaxLabels->GetValue() ||
+ m_chkBothSides->GetValue() ||
+ m_radioSides->GetSelection() != SliderTicks_None );
}
-void SliderWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& event)
+void SliderWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event))
{
CreateSlider();
}
void SliderWidgetsPage::OnUpdateUICurValueText(wxUpdateUIEvent& event)
{
- event.SetText( wxString::Format(_T("%d"), m_slider->GetValue()) );
+ event.SetText( wxString::Format(wxT("%d"), m_slider->GetValue()) );
}
-void SliderWidgetsPage::OnUpdateUIOtherSide(wxUpdateUIEvent& event)
+void SliderWidgetsPage::OnUpdateUIRadioSides(wxUpdateUIEvent& event)
{
- event.Enable( m_chkLabels->GetValue() );
+ event.Enable( m_chkValueLabel->GetValue() || m_chkTicks->GetValue() );
}
-void SliderWidgetsPage::OnSlider(wxScrollEvent& event)
+void SliderWidgetsPage::OnUpdateUIBothSides(wxUpdateUIEvent& event)
{
- long value = event.GetInt();
+#if defined(__WXMSW__) || defined(__WXUNIVERSAL__)
+ event.Enable( m_chkTicks->GetValue() );
+#else
+ event.Enable( false );
+#endif // defined(__WXMSW__) || defined(__WXUNIVERSAL__)
+}
- wxASSERT_MSG( value == m_slider->GetValue(),
- wxT("slider value should be the same") );
+void SliderWidgetsPage::OnSlider(wxScrollEvent& event)
+{
+ wxASSERT_MSG( event.GetInt() == m_slider->GetValue(),
+ wxT("slider value should be the same") );
wxEventType eventType = event.GetEventType();
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;
If this assert is triggered, there is an unknown slider event which
should be added to the above eventNames array.
*/
- wxASSERT_MSG(index >= 0 && index < WXSIZEOF(eventNames),
+ wxASSERT_MSG(index >= 0 && (size_t)index < WXSIZEOF(eventNames),
wxT("Unknown slider event") );
static int s_numSliderEvents = 0;
- wxLogMessage(wxT("Slider event #%d: %s (pos = %d)"),
+ wxLogMessage(wxT("Slider event #%d: %s (pos = %d, int value = %d)"),
s_numSliderEvents++,
eventNames[index],
- event.GetPosition());
+ event.GetPosition(),
+ event.GetInt());
}
+#endif // wxUSE_SLIDER
projects / wxWidgets.git / blobdiff