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

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

diff --git a/include/wx/mac/carbon/slider.h b/include/wx/mac/carbon/slider.h
index e9702ea6faeb4a2077aea85f2a96c9a56f20a20d..4cd1a1d78adbed4b21040e00540de15df22b7738 100644 (file)
--- a/include/wx/mac/carbon/slider.h
+++ b/include/wx/mac/carbon/slider.h
@@ -16,7 +16,7 @@
 #include "wx/slider.h"
 #include "wx/stattext.h"
 
 #include "wx/slider.h"
 #include "wx/stattext.h"
 

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

 
 // Slider
 class WXDLLEXPORT wxSlider: public wxSliderBase
 
 // Slider
 class WXDLLEXPORT wxSlider: public wxSliderBase


@@ -37,7 +37,7 @@ public:
         Create(parent, id, value, minValue, maxValue, pos, size, style, validator, name);
     }
 
         Create(parent, id, value, minValue, maxValue, pos, size, style, validator, name);
     }
 

-    ~wxSlider();
+    virtual ~wxSlider();

 
     bool Create(wxWindow *parent, wxWindowID id,
                 int value, int minValue, int maxValue,
 
     bool Create(wxWindow *parent, wxWindowID id,
                 int value, int minValue, int maxValue,


@@ -74,11 +74,6 @@ public:
     int GetThumbLength() const ;
     void SetTick(int tickPos) ;
 
     int GetThumbLength() const ;
     void SetTick(int tickPos) ;
 

-    // set min/max size of the slider
-    virtual void DoSetSizeHints( int minW, int minH,
-                                 int maxW = -1, int maxH = -1,
-                                 int incW = -1, int incH = -1 );
-

     void Command(wxCommandEvent& event);
     virtual wxInt32 MacControlHit(WXEVENTHANDLERREF handler, WXEVENTREF event);
     void MacHandleControlClick(WXWidget control, wxInt16 controlpart, bool mouseStillDown);
     void Command(wxCommandEvent& event);
     virtual wxInt32 MacControlHit(WXEVENTHANDLERREF handler, WXEVENTREF event);
     void MacHandleControlClick(WXWidget control, wxInt16 controlpart, bool mouseStillDown);


@@ -88,6 +83,11 @@ protected:
     virtual void   DoSetSize(int x, int y, int w, int h, int sizeFlags);
     virtual void   DoMoveWindow(int x, int y, int w, int h);
 
     virtual void   DoSetSize(int x, int y, int w, int h, int sizeFlags);
     virtual void   DoMoveWindow(int x, int y, int w, int h);
 

+    // set min/max size of the slider
+    virtual void DoSetSizeHints( int minW, int minH,
+                                 int maxW, int maxH,
+                                 int incW, int incH);
+

     // Common processing to invert slider values based on wxSL_INVERSE
     virtual int ValueInvertOrNot(int value) const;
 
     // Common processing to invert slider values based on wxSL_INVERSE
     virtual int ValueInvertOrNot(int value) const;