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 76d5687af84cb3250252c109dc6f10b35dc4241b..fa507b201d1e43f3d669a1bd77987ba913793bb4 100644 (file)
--- a/include/wx/mac/carbon/slider.h
+++ b/include/wx/mac/carbon/slider.h
@@ -37,7 +37,7 @@ public:
         Create(parent, id, value, minValue, maxValue, pos, size, style, validator, name);
     }
 
         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,
 
     bool Create(wxWindow *parent, wxWindowID id,
                 int value, int minValue, int maxValue,


@@ -79,15 +79,15 @@ public:
                                  int maxW = -1, int maxH = -1,
                                  int incW = -1, int incH = -1 );
 
                                  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);
 
 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;
 
     // Common processing to invert slider values based on wxSL_INVERSE
     virtual int ValueInvertOrNot(int value) const;