Reverted part of patch #876969 ("Fixes to Borland warnings"), resulted in bugs when...

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

diff --git a/include/wx/mac/slider.h b/include/wx/mac/slider.h
index caf89d18426f247c5d6605ef41e9d23c48c709ee..9599a60c10ba14943c24b1dbaa80e195e144490b 100644 (file)
--- a/include/wx/mac/slider.h
+++ b/include/wx/mac/slider.h
@@ -12,7 +12,7 @@
 #ifndef _WX_SLIDER_H_
 #define _WX_SLIDER_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "slider.h"
 #endif
 
@@ -20,7 +20,7 @@
 #include "wx/slider.h"
 #include "wx/stattext.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxSliderNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxSliderNameStr;
 
 // Slider
 class WXDLLEXPORT wxSlider: public wxControl
@@ -59,6 +59,9 @@ public:
   inline int GetMin() const { return m_rangeMin; }
   inline int GetMax() const { return m_rangeMax; }
 
+  void SetMin(int minValue) { SetRange(minValue, m_rangeMax); }
+  void SetMax(int maxValue) { SetRange(m_rangeMin, maxValue); }
+    
   // For trackbars only
   void SetTickFreq(int n, int pos);
   inline int GetTickFreq() const { return m_tickFreq; }
@@ -87,7 +90,7 @@ public:
      virtual void   DoMoveWindow(int x, int y, int w, int h);
  
   void Command(wxCommandEvent& event);
-    void                     MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
+    void                     MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
     virtual void            MacUpdateDimensions() ;
 
      wxStaticText*    m_macMinimumStatic ;