added definition of TARGET_CARBON when compiling with non generated setup.h

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

diff --git a/include/wx/mac/slider.h b/include/wx/mac/slider.h
index ff45a5790df1b9833c6053899147b1f3cbf4b4f2..5a3c76f86a1364eac5d9e8b2db6b5249d514f453 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_
 
 #ifndef _WX_SLIDER_H_
 #define _WX_SLIDER_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "slider.h"
 #endif
 
 #pragma interface "slider.h"
 #endif
 


@@ -53,7 +53,6 @@ public:
 
   virtual int GetValue() const ;
   virtual void SetValue(int);
 
   virtual int GetValue() const ;
   virtual void SetValue(int);

-  bool Show(bool show);

 
   void SetRange(int minValue, int maxValue);
 
 
   void SetRange(int minValue, int maxValue);
 


@@ -76,9 +75,21 @@ public:
   int GetThumbLength() const ;
   void SetTick(int tickPos) ;
 
   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 Command(wxCommandEvent& event);

-       void                                    MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
- protected:
+       void                                    MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
+       virtual void            MacUpdateDimensions() ;
+

        wxStaticText*   m_macMinimumStatic ;
        wxStaticText*   m_macMaximumStatic ;
        wxStaticText*   m_macValueStatic ;
        wxStaticText*   m_macMinimumStatic ;
        wxStaticText*   m_macMaximumStatic ;
        wxStaticText*   m_macValueStatic ;


@@ -88,6 +99,7 @@ public:
   int           m_pageSize;
   int           m_lineSize;
   int           m_tickFreq;
   int           m_pageSize;
   int           m_lineSize;
   int           m_tickFreq;

+private :

 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };