Fix code when making scrollwindow bigger so that

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

diff --git a/samples/widgets/slider.cpp b/samples/widgets/slider.cpp
index 6cd722210863cba33bb30fe357daa3770d4245cc..c70a7947314784d15ae0de6ca07a7376f1af912b 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,6 +24,8 @@
     #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"


@@ -44,6 +46,7 @@
 #include "wx/sizer.h"
 
 #include "widgets.h"
 #include "wx/sizer.h"
 
 #include "widgets.h"

+

 #include "icons/slider.xpm"
 
 // ----------------------------------------------------------------------------
 #include "icons/slider.xpm"
 
 // ----------------------------------------------------------------------------


@@ -73,10 +76,10 @@ enum
 // sides radiobox values
 enum
 {
 // sides radiobox values
 enum
 {

-    StaticSides_Top,
-    StaticSides_Bottom,
-    StaticSides_Left,
-    StaticSides_Right
+    SliderTicks_Top,
+    SliderTicks_Bottom,
+    SliderTicks_Left,
+    SliderTicks_Right

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -86,8 +89,11 @@ 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; }
+    virtual void RecreateWidget() { CreateSlider(); }

 
 protected:
     // event handlers
 
 protected:
     // event handlers


@@ -137,7 +143,7 @@ protected:
 
     // the check/radio boxes for styles
     wxCheckBox *m_chkLabels,
 
     // the check/radio boxes for styles
     wxCheckBox *m_chkLabels,

-               *m_chkVert,
+               *m_chkInverse,

                *m_chkTicks,
                *m_chkBothSides;
 
                *m_chkTicks,
                *m_chkBothSides;
 


@@ -184,8 +190,8 @@ BEGIN_EVENT_TABLE(SliderWidgetsPage, WidgetsPage)
 
     EVT_COMMAND_SCROLL(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()
 
 // ============================================================================


@@ -194,9 +200,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));
 


@@ -204,7 +210,7 @@ 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_chkBothSides = (wxCheckBox *)NULL;
     m_chkTicks =
     m_chkLabels =
     m_chkBothSides = (wxCheckBox *)NULL;


@@ -217,10 +223,10 @@ 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"));
     static const wxString sides[] =
     m_chkTicks = CreateCheckBoxAndAddToSizer(sizerLeft, _T("Show &ticks"));
     m_chkLabels = CreateCheckBoxAndAddToSizer(sizerLeft, _T("Show &labels"));
     static const wxString sides[] =


@@ -247,14 +253,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);
 


@@ -269,7 +275,7 @@ 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);
 
     m_textMin->SetValue( wxString::Format(_T("%d"), m_min) );
     sizerRow->Add(m_textMax, 1, wxLEFT | wxALIGN_CENTRE_VERTICAL, 5);
 
     m_textMin->SetValue( wxString::Format(_T("%d"), m_min) );


@@ -287,7 +293,7 @@ SliderWidgetsPage::SliderWidgetsPage(wxNotebook *notebook,
     sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
 
     sizerRow = CreateSizerWithTextAndButton(SliderPage_SetThumbLen,
     sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
 
     sizerRow = CreateSizerWithTextAndButton(SliderPage_SetThumbLen,

-                                            _T("Thumb &lenght"),
+                                            _T("Thumb &length"),

                                             SliderPage_ThumbLenText,
                                             &m_textThumbLen);
 
                                             SliderPage_ThumbLenText,
                                             &m_textThumbLen);
 


@@ -307,39 +313,33 @@ SliderWidgetsPage::SliderWidgetsPage(wxNotebook *notebook,
     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_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()
 {
 }
 
 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_chkLabels->GetValue() )
     {


@@ -353,18 +353,22 @@ void SliderWidgetsPage::CreateSlider()
 
     switch ( m_radioSides->GetSelection() )
     {
 
     switch ( m_radioSides->GetSelection() )
     {

-        case StaticSides_Top:
+        case SliderTicks_Top:

             flags |= wxSL_TOP;
             break;
             flags |= wxSL_TOP;
             break;

-        case StaticSides_Left:
+
+        case SliderTicks_Left:

             flags |= wxSL_LEFT;
             break;
             flags |= wxSL_LEFT;
             break;

-        case StaticSides_Bottom:
+
+        case SliderTicks_Bottom:

             flags |= wxSL_BOTTOM;
             break;
             flags |= wxSL_BOTTOM;
             break;

-        case StaticSides_Right:
+
+        case SliderTicks_Right:

             flags |= wxSL_RIGHT;
             break;
             flags |= wxSL_RIGHT;
             break;

+

         default:
             wxFAIL_MSG(_T("unexpected radiobox selection"));
             // fall through
         default:
             wxFAIL_MSG(_T("unexpected radiobox selection"));
             // fall through


@@ -401,7 +405,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);


@@ -438,7 +442,7 @@ void SliderWidgetsPage::DoSetThumbLen()
     long len;
     if ( !m_textThumbLen->GetValue().ToLong(&len) )
     {
     long len;
     if ( !m_textThumbLen->GetValue().ToLong(&len) )
     {

-        wxLogWarning(_T("Invalid slider thumb lenght"));
+        wxLogWarning(_T("Invalid slider thumb length"));

 
         return;
     }
 
         return;
     }


@@ -484,6 +488,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))


@@ -529,13 +539,14 @@ 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_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();
 }
 {
     CreateSlider();
 }


@@ -552,11 +563,11 @@ void SliderWidgetsPage::OnUpdateUIRadioSides(wxUpdateUIEvent& event)
 
 void SliderWidgetsPage::OnUpdateUIBothSides(wxUpdateUIEvent& event)
 {
 
 void SliderWidgetsPage::OnUpdateUIBothSides(wxUpdateUIEvent& event)
 {

-#if defined(__WIN95__) || defined(__WXUNIVERSAL__)
+#if defined(__WXMSW__) || defined(__WXUNIVERSAL__)

     event.Enable( m_chkTicks->GetValue() );
 #else
     event.Enable( m_chkTicks->GetValue() );
 #else

-    event.Enable( FALSE );
-#endif // defined(__WIN95__) || defined(__WXUNIVERSAL__)
+    event.Enable( false );
+#endif // defined(__WXMSW__) || defined(__WXUNIVERSAL__)

 }
 
 void SliderWidgetsPage::OnSlider(wxScrollEvent& event)
 }
 
 void SliderWidgetsPage::OnSlider(wxScrollEvent& event)


@@ -581,7 +592,7 @@ void SliderWidgetsPage::OnSlider(wxScrollEvent& event)
         wxT("wxEVT_SCROLL_PAGEDOWN"),
         wxT("wxEVT_SCROLL_THUMBTRACK"),
         wxT("wxEVT_SCROLL_THUMBRELEASE"),
         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;
     };
 
     int index = eventType - wxEVT_SCROLL_TOP;


@@ -596,9 +607,11 @@ void SliderWidgetsPage::OnSlider(wxScrollEvent& event)
 
     static int s_numSliderEvents = 0;
 
 
     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],
                  s_numSliderEvents++,
                  eventNames[index],

-                 event.GetPosition());
+                 event.GetPosition(),
+                 event.GetInt());

 }
 
 }
 

+#endif // wxUSE_SLIDER