X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/936f635341e9b92b37db93cc7781d564babbe25f..03773e400b6ff2692f2a9ba045d652c3b7b7109d:/include/wx/slider.h?ds=inline

diff --git a/include/wx/slider.h b/include/wx/slider.h
index c48b004473..84896602f9 100644
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -31,7 +31,6 @@
 
 #define wxSL_TICKS           0x0010
 #define wxSL_AUTOTICKS       wxSL_TICKS // we don't support manual ticks
-#define wxSL_LABELS          0x0020
 #define wxSL_LEFT            0x0040
 #define wxSL_TOP             0x0080
 #define wxSL_RIGHT           0x0100
@@ -39,19 +38,22 @@
 #define wxSL_BOTH            0x0400
 #define wxSL_SELRANGE        0x0800
 #define wxSL_INVERSE         0x1000
+#define wxSL_MIN_MAX_LABELS  0x2000
+#define wxSL_VALUE_LABEL     0x4000
+#define wxSL_LABELS          (wxSL_MIN_MAX_LABELS|wxSL_VALUE_LABEL)
 
 #if WXWIN_COMPATIBILITY_2_6
     // obsolete
     #define wxSL_NOTIFY_DRAG     0x0000
 #endif // WXWIN_COMPATIBILITY_2_6
 
-extern WXDLLEXPORT_DATA(const char) wxSliderNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxSliderNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxSliderBase: define wxSlider interface
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxSliderBase : public wxControl
+class WXDLLIMPEXP_CORE wxSliderBase : public wxControl
 {
 public:
     /* the ctor of the derived class should have the following form:
@@ -118,7 +120,7 @@ protected:
     }
 
 private:
-    DECLARE_NO_COPY_CLASS(wxSliderBase)
+    wxDECLARE_NO_COPY_CLASS(wxSliderBase);
 };
 
 // ----------------------------------------------------------------------------
@@ -136,7 +138,7 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/slider.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/slider.h"
+    #include "wx/osx/slider.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/slider.h"
 #elif defined(__WXPM__)