only check for lib directory for architectures which have multiple ABIs (Solaris...

[wxWidgets.git] / samples / widgets / slider.cpp

diff --git a/samples/widgets/slider.cpp b/samples/widgets/slider.cpp
index 7c51fdf16c936187b6cc85ddb2b610c0705374f3..748049a4efc9d6f74f925cd1a1ce545bf1270ee1 100644 (file)
--- 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
 // Name:        slider.cpp
 // Purpose:     Part of the widgets sample showing wxSlider
 // Author:      Vadim Zeitlin


@@ -24,10 +24,13 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_SLIDER
+

 // for all others, include the necessary headers
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 // 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/button.h"
     #include "wx/checkbox.h"
     #include "wx/radiobox.h"


@@ -36,6 +39,10 @@
     #include "wx/textctrl.h"
 #endif
 
     #include "wx/textctrl.h"
 #endif
 

+#if wxUSE_TOOLTIPS
+    #include "wx/tooltip.h"
+#endif
+

 #include "wx/sizer.h"
 
 #include "widgets.h"
 #include "wx/sizer.h"
 
 #include "widgets.h"


@@ -49,20 +56,32 @@
 // control ids
 enum
 {
 // control ids
 enum
 {

-    SliderPage_Reset = 100,
+    SliderPage_Reset = wxID_HIGHEST,

     SliderPage_Clear,
     SliderPage_SetValue,
     SliderPage_SetMinAndMax,
     SliderPage_SetTickFreq,
     SliderPage_Clear,
     SliderPage_SetValue,
     SliderPage_SetMinAndMax,
     SliderPage_SetTickFreq,

+    SliderPage_SetThumbLen,

     SliderPage_CurValueText,
     SliderPage_ValueText,
     SliderPage_MinText,
     SliderPage_MaxText,
     SliderPage_TickFreqText,
     SliderPage_CurValueText,
     SliderPage_ValueText,
     SliderPage_MinText,
     SliderPage_MaxText,
     SliderPage_TickFreqText,

-    SliderPage_OtherSide,
+    SliderPage_ThumbLenText,
+    SliderPage_RadioSides,
+    SliderPage_BothSides,

     SliderPage_Slider
 };
 
     SliderPage_Slider
 };
 

+// sides radiobox values
+enum
+{
+    SliderTicks_Top,
+    SliderTicks_Bottom,
+    SliderTicks_Left,
+    SliderTicks_Right
+};
+

 // ----------------------------------------------------------------------------
 // SliderWidgetsPage
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // SliderWidgetsPage
 // ----------------------------------------------------------------------------


@@ -70,8 +89,10 @@ enum
 class SliderWidgetsPage : public WidgetsPage
 {
 public:
 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
 
 protected:
     // event handlers


@@ -80,15 +101,18 @@ protected:
     void OnButtonSetValue(wxCommandEvent& event);
     void OnButtonSetMinAndMax(wxCommandEvent& event);
     void OnButtonSetTickFreq(wxCommandEvent& event);
     void OnButtonSetValue(wxCommandEvent& event);
     void OnButtonSetMinAndMax(wxCommandEvent& event);
     void OnButtonSetTickFreq(wxCommandEvent& event);

+    void OnButtonSetThumbLen(wxCommandEvent& event);

 
     void OnCheckOrRadioBox(wxCommandEvent& event);
 
 
     void OnCheckOrRadioBox(wxCommandEvent& event);
 

-    void OnSlider(wxCommandEvent& event);
+    void OnSlider(wxScrollEvent& event);

 
 

-    void OnUpdateUIOtherSide(wxUpdateUIEvent& event);

     void OnUpdateUIValueButton(wxUpdateUIEvent& event);
     void OnUpdateUIMinMaxButton(wxUpdateUIEvent& event);
     void OnUpdateUITickFreq(wxUpdateUIEvent& event);
     void OnUpdateUIValueButton(wxUpdateUIEvent& event);
     void OnUpdateUIMinMaxButton(wxUpdateUIEvent& event);
     void OnUpdateUITickFreq(wxUpdateUIEvent& event);

+    void OnUpdateUIThumbLen(wxUpdateUIEvent& event);
+    void OnUpdateUIRadioSides(wxUpdateUIEvent& event);
+    void OnUpdateUIBothSides(wxUpdateUIEvent& event);

 
     void OnUpdateUIResetButton(wxUpdateUIEvent& event);
 
 
     void OnUpdateUIResetButton(wxUpdateUIEvent& event);
 


@@ -103,6 +127,9 @@ protected:
     // set the tick frequency from the text field value
     void DoSetTickFreq();
 
     // 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); }
     // is this slider value in range?
     bool IsValidValue(int val) const
         { return (val >= m_min) && (val <= m_max); }


@@ -115,9 +142,11 @@ protected:
 
     // the check/radio boxes for styles
     wxCheckBox *m_chkLabels,
 
     // the check/radio boxes for styles
     wxCheckBox *m_chkLabels,

-               *m_chkOtherSide,
-               *m_chkVert,
-               *m_chkTicks;
+               *m_chkInverse,
+               *m_chkTicks,
+               *m_chkBothSides;
+
+    wxRadioBox *m_radioSides;

 
     // the slider itself and the sizer it is in
     wxSlider *m_slider;
 
     // the slider itself and the sizer it is in
     wxSlider *m_slider;


@@ -127,7 +156,8 @@ protected:
     wxTextCtrl *m_textValue,
                *m_textMin,
                *m_textMax,
     wxTextCtrl *m_textValue,
                *m_textMin,
                *m_textMax,

-               *m_textTickFreq;
+               *m_textTickFreq,
+               *m_textThumbLen;

 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()


@@ -143,22 +173,24 @@ BEGIN_EVENT_TABLE(SliderWidgetsPage, WidgetsPage)
     EVT_BUTTON(SliderPage_SetValue, SliderWidgetsPage::OnButtonSetValue)
     EVT_BUTTON(SliderPage_SetMinAndMax, SliderWidgetsPage::OnButtonSetMinAndMax)
     EVT_BUTTON(SliderPage_SetTickFreq, SliderWidgetsPage::OnButtonSetTickFreq)
     EVT_BUTTON(SliderPage_SetValue, SliderWidgetsPage::OnButtonSetValue)
     EVT_BUTTON(SliderPage_SetMinAndMax, SliderWidgetsPage::OnButtonSetMinAndMax)
     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_SetTickFreq, SliderWidgetsPage::OnUpdateUITickFreq)
 
     EVT_UPDATE_UI(SliderPage_SetValue, SliderWidgetsPage::OnUpdateUIValueButton)
     EVT_UPDATE_UI(SliderPage_SetMinAndMax, SliderWidgetsPage::OnUpdateUIMinMaxButton)
     EVT_UPDATE_UI(SliderPage_SetTickFreq, SliderWidgetsPage::OnUpdateUITickFreq)

+    EVT_UPDATE_UI(SliderPage_SetThumbLen, SliderWidgetsPage::OnUpdateUIThumbLen)

     EVT_UPDATE_UI(SliderPage_TickFreqText, SliderWidgetsPage::OnUpdateUITickFreq)
     EVT_UPDATE_UI(SliderPage_TickFreqText, SliderWidgetsPage::OnUpdateUITickFreq)

+    EVT_UPDATE_UI(SliderPage_RadioSides, SliderWidgetsPage::OnUpdateUIRadioSides)
+    EVT_UPDATE_UI(SliderPage_BothSides, SliderWidgetsPage::OnUpdateUIBothSides)

 
     EVT_UPDATE_UI(SliderPage_Reset, SliderWidgetsPage::OnUpdateUIResetButton)
 
     EVT_UPDATE_UI(SliderPage_CurValueText, SliderWidgetsPage::OnUpdateUICurValueText)
 
 
     EVT_UPDATE_UI(SliderPage_Reset, SliderWidgetsPage::OnUpdateUIResetButton)
 
     EVT_UPDATE_UI(SliderPage_CurValueText, SliderWidgetsPage::OnUpdateUICurValueText)
 

-    EVT_SLIDER(SliderPage_Slider, SliderWidgetsPage::OnSlider)
+    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()
 
 // ============================================================================
 END_EVENT_TABLE()
 
 // ============================================================================


@@ -167,9 +199,9 @@ END_EVENT_TABLE()
 
 IMPLEMENT_WIDGETS_PAGE(SliderWidgetsPage, _T("Slider"));
 
 
 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));
 
 {
     imaglist->Add(wxBitmap(slider_xpm));
 


@@ -177,10 +209,12 @@ SliderWidgetsPage::SliderWidgetsPage(wxNotebook *notebook,
     m_min = 0;
     m_max = 100;
 
     m_min = 0;
     m_max = 100;
 

-    m_chkVert =
+    m_chkInverse =

     m_chkTicks =
     m_chkLabels =
     m_chkTicks =
     m_chkLabels =

-    m_chkOtherSide = (wxCheckBox *)NULL;
+    m_chkBothSides = (wxCheckBox *)NULL;
+
+    m_radioSides = (wxRadioBox *)NULL;

 
     m_slider = (wxSlider *)NULL;
     m_sizerSlider = (wxSizer *)NULL;
 
     m_slider = (wxSlider *)NULL;
     m_sizerSlider = (wxSizer *)NULL;


@@ -188,18 +222,29 @@ SliderWidgetsPage::SliderWidgetsPage(wxNotebook *notebook,
     wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
 
     // left pane
     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);
 
     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"));
     m_chkTicks = CreateCheckBoxAndAddToSizer(sizerLeft, _T("Show &ticks"));
     m_chkLabels = CreateCheckBoxAndAddToSizer(sizerLeft, _T("Show &labels"));

-    m_chkOtherSide = CreateCheckBoxAndAddToSizer
-                     (
-                        sizerLeft,
-                        _T("On &other side"),
-                        SliderPage_OtherSide
-                     );
+    static const wxString sides[] =
+    {
+        _T("top"),
+        _T("bottom"),
+        _T("left"),
+        _T("right"),
+    };
+    m_radioSides = new wxRadioBox(this, SliderPage_RadioSides, _T("&Ticks/Labels"),
+                                 wxDefaultPosition, wxDefaultSize,
+                                 WXSIZEOF(sides), sides,
+                                 1, wxRA_SPECIFY_COLS);
+    sizerLeft->Add(m_radioSides, 0, wxGROW | wxALL, 5);
+    m_chkBothSides = CreateCheckBoxAndAddToSizer
+                     (sizerLeft, _T("&Both sides"), SliderPage_BothSides);
+#if wxUSE_TOOLTIPS
+    m_chkBothSides->SetToolTip( _T("\"Both sides\" is only supported \nin Win95 and Universal") );
+#endif // wxUSE_TOOLTIPS

 
     sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
 
 
     sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
 


@@ -207,14 +252,14 @@ SliderWidgetsPage::SliderWidgetsPage(wxNotebook *notebook,
     sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
 
     // middle pane
     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);
     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);
 
 
     sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
 


@@ -229,11 +274,11 @@ SliderWidgetsPage::SliderWidgetsPage(wxNotebook *notebook,
                                             SliderPage_MinText,
                                             &m_textMin);
 
                                             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);
 
     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);
 
 
     sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
 


@@ -246,9 +291,16 @@ SliderWidgetsPage::SliderWidgetsPage(wxNotebook *notebook,
 
     sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
 
 
     sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
 

+    sizerRow = CreateSizerWithTextAndButton(SliderPage_SetThumbLen,
+                                            _T("Thumb &length"),
+                                            SliderPage_ThumbLenText,
+                                            &m_textThumbLen);
+
+    sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
+

     // right pane
     wxSizer *sizerRight = new wxBoxSizer(wxHORIZONTAL);
     // right pane
     wxSizer *sizerRight = new wxBoxSizer(wxHORIZONTAL);

-    sizerRight->SetMinSize(250, 0);
+    sizerRight->SetMinSize(150, 40);

     m_sizerSlider = sizerRight; // save it to modify it later
 
     Reset();
     m_sizerSlider = sizerRight; // save it to modify it later
 
     Reset();


@@ -256,50 +308,41 @@ SliderWidgetsPage::SliderWidgetsPage(wxNotebook *notebook,
 
     // the 3 panes panes compose the window
     sizerTop->Add(sizerLeft, 0, wxGROW | (wxALL & ~wxLEFT), 10);
 
     // 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
     sizerTop->Add(sizerRight, 1, wxGROW | (wxALL & ~wxRIGHT), 10);
 
     // final initializations

-    SetAutoLayout(TRUE);

     SetSizer(sizerTop);
 
     sizerTop->Fit(this);
 }
 
     SetSizer(sizerTop);
 
     sizerTop->Fit(this);
 }
 

-SliderWidgetsPage::~SliderWidgetsPage()
-{
-}
-

 // ----------------------------------------------------------------------------
 // operations
 // ----------------------------------------------------------------------------
 
 void SliderWidgetsPage::Reset()
 {
 // ----------------------------------------------------------------------------
 // operations
 // ----------------------------------------------------------------------------
 
 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_chkLabels->SetValue(true);
+    m_chkBothSides->SetValue(false);
+
+    m_radioSides->SetSelection(SliderTicks_Top);

 }
 
 void SliderWidgetsPage::CreateSlider()
 {
     int flags = 0;
 
 }
 
 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() )
     {
         flags |= wxSL_LABELS;
 
     if ( m_chkLabels->GetValue() )
     {
         flags |= wxSL_LABELS;

-
-        if ( m_chkOtherSide->GetValue() )
-            flags |= isVert ? wxSL_RIGHT : wxSL_BOTTOM;
-        else
-            flags |= isVert ? wxSL_LEFT : wxSL_TOP;

     }
 
     if ( m_chkTicks->GetValue() )
     }
 
     if ( m_chkTicks->GetValue() )


@@ -307,6 +350,34 @@ void SliderWidgetsPage::CreateSlider()
         flags |= wxSL_AUTOTICKS;
     }
 
         flags |= wxSL_AUTOTICKS;
     }
 

+    switch ( m_radioSides->GetSelection() )
+    {
+        case SliderTicks_Top:
+            flags |= wxSL_TOP;
+            break;
+
+        case SliderTicks_Left:
+            flags |= wxSL_LEFT;
+            break;
+
+        case SliderTicks_Bottom:
+            flags |= wxSL_BOTTOM;
+            break;
+
+        case SliderTicks_Right:
+            flags |= wxSL_RIGHT;
+            break;
+
+        default:
+            wxFAIL_MSG(_T("unexpected radiobox selection"));
+            // fall through
+    }
+
+    if ( m_chkBothSides->GetValue() )
+    {
+        flags |= wxSL_BOTH;
+    }
+

     int val = m_min;
     if ( m_slider )
     {
     int val = m_min;
     if ( m_slider )
     {


@@ -316,13 +387,13 @@ void SliderWidgetsPage::CreateSlider()
             val = valOld;
         }
 
             val = valOld;
         }
 

-        m_sizerSlider->Remove(m_slider);
+        m_sizerSlider->Detach( m_slider );

 
         if ( m_sizerSlider->GetChildren().GetCount() )
         {
             // we have 2 spacers, remove them too
 
         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;
         }
 
         delete m_slider;


@@ -333,7 +404,7 @@ void SliderWidgetsPage::CreateSlider()
                             wxDefaultPosition, wxDefaultSize,
                             flags);
 
                             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->Add(0, 0, 1);
         m_sizerSlider->Add(m_slider, 0, wxGROW | wxALL, 5);


@@ -365,6 +436,19 @@ void SliderWidgetsPage::DoSetTickFreq()
     m_slider->SetTickFreq(freq, 0 /* unused */);
 }
 
     m_slider->SetTickFreq(freq, 0 /* unused */);
 }
 

+void SliderWidgetsPage::DoSetThumbLen()
+{
+    long len;
+    if ( !m_textThumbLen->GetValue().ToLong(&len) )
+    {
+        wxLogWarning(_T("Invalid slider thumb length"));
+
+        return;
+    }
+
+    m_slider->SetThumbLength(len);
+}
+

 // ----------------------------------------------------------------------------
 // event handlers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // event handlers
 // ----------------------------------------------------------------------------


@@ -381,6 +465,11 @@ void SliderWidgetsPage::OnButtonSetTickFreq(wxCommandEvent& WXUNUSED(event))
     DoSetTickFreq();
 }
 
     DoSetTickFreq();
 }
 

+void SliderWidgetsPage::OnButtonSetThumbLen(wxCommandEvent& WXUNUSED(event))
+{
+    DoSetThumbLen();
+}
+

 void SliderWidgetsPage::OnButtonSetMinAndMax(wxCommandEvent& WXUNUSED(event))
 {
     long minNew,
 void SliderWidgetsPage::OnButtonSetMinAndMax(wxCommandEvent& WXUNUSED(event))
 {
     long minNew,


@@ -398,6 +487,12 @@ void SliderWidgetsPage::OnButtonSetMinAndMax(wxCommandEvent& WXUNUSED(event))
     m_max = maxNew;
 
     m_slider->SetRange(minNew, maxNew);
     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::OnButtonSetValue(wxCommandEvent& WXUNUSED(event))


@@ -427,6 +522,12 @@ void SliderWidgetsPage::OnUpdateUITickFreq(wxUpdateUIEvent& event)
                   (freq > 0) && (freq <= m_max - m_min) );
 }
 
                   (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::OnUpdateUIMinMaxButton(wxUpdateUIEvent& event)
 {
     long mn, mx;


@@ -437,34 +538,79 @@ void SliderWidgetsPage::OnUpdateUIMinMaxButton(wxUpdateUIEvent& event)
 
 void SliderWidgetsPage::OnUpdateUIResetButton(wxUpdateUIEvent& event)
 {
 
 void SliderWidgetsPage::OnUpdateUIResetButton(wxUpdateUIEvent& event)
 {

-    event.Enable( m_chkVert->GetValue() ||
+    event.Enable( m_chkInverse->GetValue() ||
+                  !m_chkTicks->GetValue() ||

                   !m_chkLabels->GetValue() ||
                   !m_chkLabels->GetValue() ||

-                  m_chkOtherSide->GetValue() ||
-                  m_chkTicks->GetValue() );
+                  m_chkBothSides->GetValue() ||
+                  m_radioSides->GetSelection() != SliderTicks_Top );

 }
 
 }
 

-void SliderWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& event)
+void SliderWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event))

 {
     CreateSlider();
 }
 
 void SliderWidgetsPage::OnUpdateUICurValueText(wxUpdateUIEvent& event)
 {
 {
     CreateSlider();
 }
 
 void SliderWidgetsPage::OnUpdateUICurValueText(wxUpdateUIEvent& event)
 {

-    event.SetText( wxString::Format(_T("%d"), m_slider->GetValue()));
+    event.SetText( wxString::Format(_T("%d"), m_slider->GetValue()) );

 }
 
 }
 

-void SliderWidgetsPage::OnUpdateUIOtherSide(wxUpdateUIEvent& event)
+void SliderWidgetsPage::OnUpdateUIRadioSides(wxUpdateUIEvent& event)

 {
 {

-    event.Enable( m_chkLabels->GetValue() );
+    event.Enable( m_chkLabels->GetValue() || m_chkTicks->GetValue() );

 }
 
 }
 

-void SliderWidgetsPage::OnSlider(wxCommandEvent& event)
+void SliderWidgetsPage::OnUpdateUIBothSides(wxUpdateUIEvent& event)

 {
 {

-    int value = event.GetInt();
+#if defined(__WIN95__) || defined(__WXUNIVERSAL__)
+    event.Enable( m_chkTicks->GetValue() );
+#else
+    event.Enable( false );
+#endif // defined(__WIN95__) || defined(__WXUNIVERSAL__)
+}

 
 

-    wxASSERT_MSG( value == m_slider->GetValue(),
-                  _T("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();

 
 

-    wxLogMessage(_T("Slider value changed, now %d"), value);
+    /*
+        This array takes the EXACT order of the declarations in
+        include/wx/event.h
+        (section "wxScrollBar and wxSlider event identifiers")
+    */
+    static const wxChar *eventNames[] =
+    {
+        wxT("wxEVT_SCROLL_TOP"),
+        wxT("wxEVT_SCROLL_BOTTOM"),
+        wxT("wxEVT_SCROLL_LINEUP"),
+        wxT("wxEVT_SCROLL_LINEDOWN"),
+        wxT("wxEVT_SCROLL_PAGEUP"),
+        wxT("wxEVT_SCROLL_PAGEDOWN"),
+        wxT("wxEVT_SCROLL_THUMBTRACK"),
+        wxT("wxEVT_SCROLL_THUMBRELEASE"),
+        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 && (size_t)index < WXSIZEOF(eventNames),
+                 wxT("Unknown slider event") );
+
+
+    static int s_numSliderEvents = 0;
+
+    wxLogMessage(wxT("Slider event #%d: %s (pos = %d, int value = %ld)"),
+                 s_numSliderEvents++,
+                 eventNames[index],
+                 event.GetPosition(),
+                 event.GetInt());

 }
 
 }
 

+#endif // wxUSE_SLIDER