X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0dbd6262a9ee7d735fb3930707346298f71b2cb7..59840ba3b16e4baf3228dd79c6b7ae40b55cf488:/include/wx/mac/slider.h?ds=sidebyside

diff --git a/include/wx/mac/slider.h b/include/wx/mac/slider.h
index 239e914e5c..44f8719b05 100644
--- a/include/wx/mac/slider.h
+++ b/include/wx/mac/slider.h
@@ -17,6 +17,8 @@
 #endif
 
 #include "wx/control.h"
+#include "wx/slider.h"
+#include "wx/stattext.h"
 
 WXDLLEXPORT_DATA(extern const char*) wxSliderNameStr;
 
@@ -51,10 +53,6 @@ public:
 
   virtual int GetValue() const ;
   virtual void SetValue(int);
-  void GetSize(int *x, int *y) const ;
-  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-  void GetPosition(int *x, int *y) const ;
-  bool Show(bool show);
 
   void SetRange(int minValue, int maxValue);
 
@@ -77,13 +75,30 @@ public:
   int GetThumbLength() const ;
   void SetTick(int tickPos) ;
 
+ 
+     // set min/max size of the slider
+     virtual void SetSizeHints( int minW, int minH,
+                                int maxW = -1, int maxH = -1,
+                                int incW = -1, int incH = -1 );
+ 
+   protected:
+     virtual wxSize DoGetBestSize() const;
+     virtual void   DoSetSize(int x, int y, int w, int h, int sizeFlags);
+     virtual void   DoMoveWindow(int x, int y, int w, int h);
+ 
   void Command(wxCommandEvent& event);
- protected:
+	void 					MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
+
+ 	wxStaticText*	m_macMinimumStatic ;
+ 	wxStaticText*	m_macMaximumStatic ;
+ 	wxStaticText*	m_macValueStatic ;
+
   int           m_rangeMin;
   int           m_rangeMax;
   int           m_pageSize;
   int           m_lineSize;
   int           m_tickFreq;
+private :
 DECLARE_EVENT_TABLE()
 };