Don't use wxUSE_POCKETPC_UI, determine appropriate UI from

[wxWidgets.git] / include / wx / slider.h

diff --git a/include/wx/slider.h b/include/wx/slider.h
index 09cd35c8b5df76d4928d2511679e987f636ed823..dfd4a63904b39480de4cd7b499c7564401db63cc 100644 (file)
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -52,6 +52,8 @@ public:
     virtual void SetRange(int minValue, int maxValue) = 0;
     virtual int GetMin() const = 0;
     virtual int GetMax() const = 0;
     virtual void SetRange(int minValue, int maxValue) = 0;
     virtual int GetMin() const = 0;
     virtual int GetMax() const = 0;

+    void SetMin( int minValue ) { SetRange( minValue , GetMax() ) ; }
+    void SetMax( int maxValue ) { SetRange( GetMin() , maxValue ) ; }

 
     // the line/page size is the increment by which the slider moves when
     // cursor arrow key/page up or down are pressed (clicking the mouse is like
 
     // the line/page size is the increment by which the slider moves when
     // cursor arrow key/page up or down are pressed (clicking the mouse is like


@@ -78,6 +80,11 @@ public:
     virtual int GetSelStart() const { return GetMax(); }
     virtual void SetSelection(int WXUNUSED(min), int WXUNUSED(max)) { }
 
     virtual int GetSelStart() const { return GetMax(); }
     virtual void SetSelection(int WXUNUSED(min), int WXUNUSED(max)) { }
 

+
+    virtual void ApplyParentThemeBackground(const wxColour& bg)
+        { SetBackgroundColour(bg); }
+
+

 private:
     DECLARE_NO_COPY_CLASS(wxSliderBase)
 };
 private:
     DECLARE_NO_COPY_CLASS(wxSliderBase)
 };


@@ -91,7 +98,6 @@ private:
 #elif defined(__WXMSW__)
     #include "wx/msw/slider95.h"
     #define wxSlider wxSlider95
 #elif defined(__WXMSW__)
     #include "wx/msw/slider95.h"
     #define wxSlider wxSlider95

-    #define sm_classwxSlider sm_classwxSlider95

 #elif defined(__WXMOTIF__)
     #include "wx/motif/slider.h"
 #elif defined(__WXGTK__)
 #elif defined(__WXMOTIF__)
     #include "wx/motif/slider.h"
 #elif defined(__WXGTK__)