Inversed slider and wrapper for datepicker control on PalmOS. WinHandle instead of...

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

diff --git a/include/wx/slider.h b/include/wx/slider.h
index 8cd9a9dd1cdce803d59d58254615873763684855..0e5d0939b17e9b9b7713f57c59755f9043fc8724 100644 (file)
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     09.02.01
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     09.02.01
 // RCS-ID:      $Id$

-// Copyright:   (c) 1996-2001 wxWindows team
+// Copyright:   (c) 1996-2001 wxWidgets team

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -22,7 +22,7 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxSliderNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxSliderNameStr;

 
 // ----------------------------------------------------------------------------
 // wxSliderBase: define wxSlider interface
 
 // ----------------------------------------------------------------------------
 // wxSliderBase: define wxSlider interface


@@ -42,6 +42,7 @@ public:
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxSliderNameStr);
     */
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxSliderNameStr);
     */

+    wxSliderBase() { }

 
     // get/set the current slider value (should be in range)
     virtual int GetValue() const = 0;
 
     // get/set the current slider value (should be in range)
     virtual int GetValue() const = 0;


@@ -51,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


@@ -76,6 +79,14 @@ public:
     virtual int GetSelEnd() const { return GetMin(); }
     virtual int GetSelStart() const { return GetMax(); }
     virtual void SetSelection(int WXUNUSED(min), int WXUNUSED(max)) { }
     virtual int GetSelEnd() const { return GetMin(); }
     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)

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


@@ -87,7 +98,6 @@ public:
 #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__)


@@ -98,6 +108,8 @@ public:
     #include "wx/cocoa/slider.h"
 #elif defined(__WXPM__)
     #include "wx/os2/slider.h"
     #include "wx/cocoa/slider.h"
 #elif defined(__WXPM__)
     #include "wx/os2/slider.h"

+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/slider.h"

 #endif
 
 #endif // wxUSE_SLIDER
 #endif
 
 #endif // wxUSE_SLIDER