]> git.saurik.com Git - wxWidgets.git/blobdiff - include/wx/os2/slider.h
Implement GetDashCount() for Carbon/Cocoa.
[wxWidgets.git] / include / wx / os2 / slider.h
index 887177c827ace0303dc197ee26fe32d57b0813ee..9fc369c7e5e3510d26e7b8d1cdc0d662a01aeced 100644 (file)
@@ -15,7 +15,7 @@
 #include "wx/control.h"
 
 // Slider
-class WXDLLEXPORT wxSlider: public wxSliderBase
+class WXDLLIMPEXP_CORE wxSlider: public wxSliderBase
 {
 public:
   wxSlider();
@@ -27,9 +27,7 @@ public:
                   ,const wxPoint&     rPos = wxDefaultPosition
                   ,const wxSize&      rSize = wxDefaultSize
                   ,long               lStyle = wxSL_HORIZONTAL
-#if wxUSE_VALIDATORS
                   ,const wxValidator& rValidator = wxDefaultValidator
-#endif
                   ,const wxString&    rsName = wxSliderNameStr
                  )
     {
@@ -41,13 +39,11 @@ public:
                ,rPos
                ,rSize
                ,lStyle
-#if wxUSE_VALIDATORS
                ,rValidator
-#endif
                ,rsName
               );
     }
-    ~wxSlider();
+    virtual ~wxSlider();
 
     bool Create( wxWindow*          pParent
                 ,wxWindowID         vId
@@ -57,25 +53,20 @@ public:
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = wxSL_HORIZONTAL
-#if wxUSE_VALIDATORS
                 ,const wxValidator& rValidator = wxDefaultValidator
-#endif
                 ,const wxString&    rsName = wxSliderNameStr
                );
 
          virtual int  GetValue(void) const ;
          virtual void SetValue(int);
 
-         virtual void DoGetSize( int* pnWidth
-                                ,int* pnHeight
-                               ) const;
                  void GetSize( int* pnX
                               ,int* pnY
                              ) const;
                  void GetPosition( int* pnX
                                   ,int* pnY
                                  ) const ;
-                 bool Show(bool bShow);
+                 bool Show(bool bShow = TRUE);
                  void SetRange( int nMinValue
                                ,int nMaxValue
                               );
@@ -148,6 +139,9 @@ protected:
     int                             m_nThumbLength;
     int                             m_nSizeFlags;
 
+    virtual void DoGetSize( int* pnWidth
+                           ,int* pnHeight
+                          ) const;
     virtual void DoSetSize( int  nX
                            ,int  nY
                            ,int  nWidth