Get ShowWindowModal behavior working under OS X Cocoa for file, dir and message dialogs.

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

diff --git a/include/wx/slider.h b/include/wx/slider.h
index 3d775be237bdf9a839679c8653283fc08935f0ad..84896602f958b72dfd48608d28107056c43167ad 100644 (file)
--- 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_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
 #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_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
 
 
 #if WXWIN_COMPATIBILITY_2_6
     // obsolete
     #define wxSL_NOTIFY_DRAG     0x0000
 #endif // WXWIN_COMPATIBILITY_2_6
 

-extern WXDLLEXPORT_DATA(const wxChar) wxSliderNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxSliderNameStr[];

 
 // ----------------------------------------------------------------------------
 // wxSliderBase: define wxSlider interface
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // 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:
 {
 public:
     /* the ctor of the derived class should have the following form:


@@ -105,6 +107,9 @@ public:
 
 protected:
 
 
 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
     {
     // adjust value according to wxSL_INVERSE style
     virtual int ValueInvertOrNot(int value) const
     {


@@ -115,7 +120,7 @@ protected:
     }
 
 private:
     }
 
 private:

-    DECLARE_NO_COPY_CLASS(wxSliderBase)
+    wxDECLARE_NO_COPY_CLASS(wxSliderBase);

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


@@ -125,7 +130,7 @@ private:
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/slider.h"
 #elif defined(__WXMSW__)
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/slider.h"
 #elif defined(__WXMSW__)

-    #include "wx/msw/slider95.h"
+    #include "wx/msw/slider.h"

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


@@ -133,7 +138,7 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/slider.h"
 #elif defined(__WXMAC__)
 #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__)
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/slider.h"
 #elif defined(__WXPM__)