Removed unnecessary #ifs

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

diff --git a/include/wx/mac/slider.h b/include/wx/mac/slider.h
index 239e914e5cedb657ef56e3cfd4dbc19d035d2046..7c52c5a54ad02532f0a8dd5da0ff2a505b97637f 100644 (file)
--- a/include/wx/mac/slider.h
+++ b/include/wx/mac/slider.h
@@ -1,22 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        slider.h
 // Purpose:     wxSlider class
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SLIDER_H_
 #define _WX_SLIDER_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "slider.h"
 #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,31 @@ 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 ) ;
+       virtual void            MacUpdateDimensions() ;
+
+       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()
 };