X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/511ac294daea69d4bae9644db2fb272c712e059c..d0f063020e6fb1b1a660952d0844071e0df24324:/include/wx/os2/slider.h?ds=inline diff --git a/include/wx/os2/slider.h b/include/wx/os2/slider.h index e3f6f87fa5..9fc369c7e5 100644 --- a/include/wx/os2/slider.h +++ b/include/wx/os2/slider.h @@ -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,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 ); @@ -72,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 ); @@ -145,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