MOre fixes for DLL builds

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

diff --git a/include/wx/mac/slider.h b/include/wx/mac/slider.h
index ff45a5790df1b9833c6053899147b1f3cbf4b4f2..db747cda720c552e9d0110d20d542a8b2cbbdc94 100644 (file)
--- a/include/wx/mac/slider.h
+++ b/include/wx/mac/slider.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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
-// Licence:    wxWindows licence
+// 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
 
@@ -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
@@ -53,7 +53,6 @@ public:
 
   virtual int GetValue() const ;
   virtual void SetValue(int);
-  bool Show(bool show);
 
   void SetRange(int minValue, int maxValue);
 
@@ -76,18 +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);
-       void                                    MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
- protected:
-       wxStaticText*   m_macMinimumStatic ;
-       wxStaticText*   m_macMaximumStatic ;
-       wxStaticText*   m_macValueStatic ;
+    void                     MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
+    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()
 };