X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3a50d19cae533583d61070a3ae939b928b84dd76..c220541de457e9aa4faac5f8eb8363fe619b79a5:/include/wx/os2/slider.h?ds=sidebyside diff --git a/include/wx/os2/slider.h b/include/wx/os2/slider.h index 782436634e..bc74fe3945 100644 --- a/include/wx/os2/slider.h +++ b/include/wx/os2/slider.h @@ -14,8 +14,6 @@ #include "wx/control.h" -WXDLLEXPORT_DATA(extern const char*) wxSliderNameStr; - // Slider class WXDLLEXPORT wxSlider: public wxSliderBase { @@ -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,9 +39,7 @@ public: ,rPos ,rSize ,lStyle -#if wxUSE_VALIDATORS ,rValidator -#endif ,rsName ); } @@ -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 ); @@ -147,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