X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c299c3ab663257429983c24e6fb71450f3cf9f1..661698e54f2bc599dc1a961ffbae08ccdd6b9b97:/include/wx/os2/slider.h

diff --git a/include/wx/os2/slider.h b/include/wx/os2/slider.h
index 66b9b282be..05fc54887e 100644
--- a/include/wx/os2/slider.h
+++ b/include/wx/os2/slider.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        slider.h
+// Name:        wx/os2/slider.h
 // Purpose:     wxSlider class
 // Author:      David Webster
 // Modified by:
@@ -14,10 +14,8 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxSliderNameStr;
-
 // Slider
-class WXDLLEXPORT wxSlider: public wxSliderBase
+class WXDLLIMPEXP_CORE wxSlider: public wxSliderBase
 {
 public:
   wxSlider();
@@ -29,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
                  )
     {
@@ -43,13 +39,11 @@ public:
                ,rPos
                ,rSize
                ,lStyle
-#if wxUSE_VALIDATORS
                ,rValidator
-#endif
                ,rsName
               );
     }
-    ~wxSlider();
+    virtual ~wxSlider();
 
     bool Create( wxWindow*          pParent
                 ,wxWindowID         vId
@@ -59,9 +53,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
                );
 
@@ -74,7 +66,7 @@ public:
                  void GetPosition( int* pnX
                                   ,int* pnY
                                  ) const ;
-                 bool Show(bool bShow);
+                 bool Show(bool bShow = TRUE);
                  void SetRange( int nMinValue
                                ,int nMaxValue
                               );
@@ -102,9 +94,6 @@ public:
                                   );
                  void SetThumbLength(int nLen) ;
                  void SetTick(int ntickPos) ;
-                 void SetTickFreq( int n
-                                  ,int nPos
-                                 );
 
     //
     // IMPLEMENTATION
@@ -113,6 +102,13 @@ public:
     inline         WXHWND   GetStaticMax(void) const { return m_hStaticMax; }
     inline         WXHWND   GetEditValue(void) const { return m_hStaticValue; }
            virtual bool     ContainsHWND(WXHWND hWnd) const;
+                   void     AdjustSubControls( int  nX
+                                              ,int  nY
+                                              ,int  nWidth
+                                              ,int  nHeight
+                                              ,int  nSizeFlags
+                                             );
+    inline         int      GetSizeFlags(void) { return m_nSizeFlags; }
                    void     Command(wxCommandEvent& rEvent);
            virtual WXHBRUSH OnCtlColor( WXHDC    hDC
                                        ,WXHWND   hWnd
@@ -138,13 +134,21 @@ protected:
     int                             m_nTickFreq;
     double                          m_dPixelToRange;
     int                             m_nThumbLength;
+    int                             m_nSizeFlags;
 
+    virtual void DoGetSize( int* pnWidth
+                           ,int* pnHeight
+                          ) const;
     virtual void DoSetSize( int  nX
                            ,int  nY
                            ,int  nWidth
                            ,int  nHeight
                            ,int  nSizeFlags = wxSIZE_AUTO
                           );
+
+    // Platform-specific implementation of SetTickFreq
+    virtual void DoSetTickFreq(int freq);
+
 private:
     DECLARE_DYNAMIC_CLASS(wxSlider)
 }; // end of CLASS wxSlider