check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/include/wx/slider.h b/include/wx/slider.h
index a3c114f06431715a46610b96aa5ec021ee5832f1..14aca4445b102050a1a30e140d9021118d0f8dc6 100644 (file)
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -40,11 +40,12 @@
 #define wxSL_SELRANGE        0x0800
 #define wxSL_INVERSE         0x1000
 
-// obsolete
-#define wxSL_NOTIFY_DRAG     0x0000
+#if WXWIN_COMPATIBILITY_2_6
+    // obsolete
+    #define wxSL_NOTIFY_DRAG     0x0000
+#endif // WXWIN_COMPATIBILITY_2_6
 
-
-extern WXDLLEXPORT_DATA(const wxChar) wxSliderNameStr[];
+extern WXDLLEXPORT_DATA(const char) wxSliderNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxSliderBase: define wxSlider interface
@@ -104,6 +105,9 @@ public:
 
 protected:
 
+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
     // adjust value according to wxSL_INVERSE style
     virtual int ValueInvertOrNot(int value) const
     {
@@ -125,9 +129,6 @@ private:
     #include "wx/univ/slider.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/slider95.h"
-    #if WXWIN_COMPATIBILITY_2_4
-         #define wxSlider95 wxSlider
-    #endif
 #elif defined(__WXMOTIF__)
     #include "wx/motif/slider.h"
 #elif defined(__WXGTK20__)