X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c299c3ab663257429983c24e6fb71450f3cf9f1..b5ec0c78b521cfa0f276e4d5d830f35b4fa26e91:/include/wx/os2/gauge.h?ds=sidebyside diff --git a/include/wx/os2/gauge.h b/include/wx/os2/gauge.h index 67378ff770..083e9f13a7 100644 --- a/include/wx/os2/gauge.h +++ b/include/wx/os2/gauge.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gauge.h +// Name: wx/os2/gauge.h // Purpose: wxGauge class // Author: David Webster // Modified by: @@ -12,11 +12,7 @@ #ifndef _WX_GAUGE_H_ #define _WX_GAUGE_H_ -#include "wx/control.h" - -WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr; - -class WXDLLEXPORT wxGauge: public wxControl +class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase { public: inline wxGauge() { m_nRangeMax = 0; m_nGaugePos = 0; } @@ -27,9 +23,7 @@ public: ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = wxGA_HORIZONTAL -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxGaugeNameStr ) { @@ -39,9 +33,7 @@ public: ,rPos ,rSize ,lStyle -#if wxUSE_VALIDATORS ,rValidator -#endif ,rsName ); } @@ -52,9 +44,7 @@ public: ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = wxGA_HORIZONTAL -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxGaugeNameStr ); @@ -71,15 +61,18 @@ public: void SetValue(int nPos); inline virtual bool AcceptsFocus(void) const { return FALSE; } - inline virtual void Command(wxCommandEvent& WXUNUSED(rEvent)) {}; + inline virtual void Command(wxCommandEvent& WXUNUSED(rEvent)) {} protected: int m_nRangeMax; int m_nGaugePos; + int m_nWidth; + int m_nHeight; + + wxSize DoGetBestSize(void) const; private: DECLARE_DYNAMIC_CLASS(wxGauge) }; // end of CLASS wxGauge #endif // _WX_GAUGE_H_ -