check for wxUSE_TIMER in headers, not the files including them

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

diff --git a/include/wx/mac/carbon/slider.h b/include/wx/mac/carbon/slider.h
index a53d0729ad130a757b56a01a88431e62354a6fdf..fa507b201d1e43f3d669a1bd77987ba913793bb4 100644 (file)
--- a/include/wx/mac/carbon/slider.h
+++ b/include/wx/mac/carbon/slider.h
@@ -12,18 +12,14 @@
 #ifndef _WX_SLIDER_H_
 #define _WX_SLIDER_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "slider.h"
-#endif
-
 #include "wx/control.h"
 #include "wx/slider.h"
 #include "wx/stattext.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxSliderNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxSliderNameStr[];
 
 // Slider
-class WXDLLEXPORT wxSlider: public wxControl
+class WXDLLEXPORT wxSlider: public wxSliderBase
 {
     DECLARE_DYNAMIC_CLASS(wxSlider)
 
@@ -41,7 +37,7 @@ public:
         Create(parent, id, value, minValue, maxValue, pos, size, style, validator, name);
     }
 
-    ~wxSlider();
+    virtual ~wxSlider();
 
     bool Create(wxWindow *parent, wxWindowID id,
                 int value, int minValue, int maxValue,
@@ -83,15 +79,15 @@ public:
                                  int maxW = -1, int maxH = -1,
                                  int incW = -1, int incH = -1 );
 
+    void Command(wxCommandEvent& event);
+    virtual wxInt32 MacControlHit(WXEVENTHANDLERREF handler, WXEVENTREF event);
+    void MacHandleControlClick(WXWidget control, wxInt16 controlpart, bool mouseStillDown);
+
 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);
-    virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
-    void                     MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
-
     // Common processing to invert slider values based on wxSL_INVERSE
     virtual int ValueInvertOrNot(int value) const;