added GetHimagelist()

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

diff --git a/include/wx/slider.h b/include/wx/slider.h
index 894b8515fa649bc537d17f636f0951e496a386cc..dbd0a2a958358fe4ee16ae191f0e05aab5984d5a 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


@@ -80,6 +80,20 @@ 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); }
+
+protected:
+
+    // adjust value according to wxSL_INVERSE style
+    virtual int ValueInvertOrNot(int value) const
+    {
+        if (HasFlag(wxSL_INVERSE))
+            return (GetMax() + GetMin()) - value;
+        else
+            return value;
+    }
+

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


@@ -92,7 +106,9 @@ private:
     #include "wx/univ/slider.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/slider95.h"
     #include "wx/univ/slider.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/slider95.h"

-    #define wxSlider wxSlider95
+    #if WXWIN_COMPATIBILITY_2_4
+         #define wxSlider95 wxSlider
+    #endif

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


@@ -103,6 +119,8 @@ private:
     #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