added wxTB_NO_TOOLTIPS (heavily modified patch 1458009)

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

diff --git a/samples/widgets/slider.cpp b/samples/widgets/slider.cpp
index 3067c60d4186dbbb6f740b7b5a881c2659e0e688..4502d6c87148532835d9472670bbe48310091a51 100644 (file)
--- a/samples/widgets/slider.cpp
+++ b/samples/widgets/slider.cpp
@@ -89,10 +89,11 @@ enum
 class SliderWidgetsPage : public WidgetsPage
 {
 public:
 class SliderWidgetsPage : public WidgetsPage
 {
 public:

-    SliderWidgetsPage(wxBookCtrl *book, wxImageList *imaglist);
+    SliderWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);

     virtual ~SliderWidgetsPage(){};
 
     virtual wxControl *GetWidget() const { return m_slider; }
     virtual ~SliderWidgetsPage(){};
 
     virtual wxControl *GetWidget() const { return m_slider; }

+    virtual void RecreateWidget() { CreateSlider(); }

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


@@ -197,14 +198,18 @@ END_EVENT_TABLE()
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-IMPLEMENT_WIDGETS_PAGE(SliderWidgetsPage, _T("Slider"));
+#if defined(__WXUNIVERSAL__)
+    #define FAMILY_CTRLS UNIVERSAL_CTRLS
+#else
+    #define FAMILY_CTRLS NATIVE_CTRLS
+#endif

 
 

-SliderWidgetsPage::SliderWidgetsPage(wxBookCtrl *book,
+IMPLEMENT_WIDGETS_PAGE(SliderWidgetsPage, _T("Slider"), FAMILY_CTRLS );
+
+SliderWidgetsPage::SliderWidgetsPage(WidgetsBookCtrl *book,

                                      wxImageList *imaglist)
                                      wxImageList *imaglist)

-                  : WidgetsPage(book)
+                  : WidgetsPage(book, imaglist, slider_xpm)

 {
 {

-    imaglist->Add(wxBitmap(slider_xpm));
-

     // init everything
     m_min = 0;
     m_max = 100;
     // init everything
     m_min = 0;
     m_max = 100;


@@ -333,7 +338,7 @@ void SliderWidgetsPage::Reset()
 
 void SliderWidgetsPage::CreateSlider()
 {
 
 void SliderWidgetsPage::CreateSlider()
 {

-    int flags = 0;
+    int flags = ms_defaultFlags;

 
     if ( m_chkInverse->GetValue() )
     {
 
     if ( m_chkInverse->GetValue() )
     {


@@ -562,11 +567,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( false );
     event.Enable( m_chkTicks->GetValue() );
 #else
     event.Enable( false );

-#endif // defined(__WIN95__) || defined(__WXUNIVERSAL__)
+#endif // defined(__WXMSW__) || defined(__WXUNIVERSAL__)

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


@@ -591,7 +596,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;


@@ -606,7 +611,7 @@ void SliderWidgetsPage::OnSlider(wxScrollEvent& event)
 
     static int s_numSliderEvents = 0;
 
 
     static int s_numSliderEvents = 0;
 

-    wxLogMessage(wxT("Slider event #%d: %s (pos = %d, int value = %ld)"),
+    wxLogMessage(wxT("Slider event #%d: %s (pos = %d, int value = %d)"),

                  s_numSliderEvents++,
                  eventNames[index],
                  event.GetPosition(),
                  s_numSliderEvents++,
                  eventNames[index],
                  event.GetPosition(),