X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d167e39384679dc78e64fc04af62a24e828a31d..7e2baeb41321aedca928608f816f03c13afdeff9:/include/wx/os2/stattext.h diff --git a/include/wx/os2/stattext.h b/include/wx/os2/stattext.h index 56fe3b63d8..1399736537 100644 --- a/include/wx/os2/stattext.h +++ b/include/wx/os2/stattext.h @@ -12,21 +12,12 @@ #ifndef _WX_STATTEXT_H_ #define _WX_STATTEXT_H_ -#ifdef __GNUG__ -#pragma interface "stattext.h" -#endif - #include "wx/control.h" -WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr; - -class WXDLLEXPORT wxStaticText : public wxControl +class WXDLLEXPORT wxStaticText : public wxStaticTextBase { - DECLARE_DYNAMIC_CLASS(wxStaticText) - - public: +public: inline wxStaticText() { } - inline wxStaticText( wxWindow* pParent ,wxWindowID vId ,const wxString& rsLabel @@ -51,8 +42,8 @@ class WXDLLEXPORT wxStaticText : public wxControl // // Accessors // - void SetLabel(const wxString&); - bool SetFont(const wxFont &rFont); + virtual void SetLabel(const wxString& rsLabel); + virtual bool SetFont(const wxFont &rFont); // // Overriden base class virtuals @@ -68,7 +59,16 @@ class WXDLLEXPORT wxStaticText : public wxControl ); protected: + virtual void DoSetSize( int nX + ,int nY + ,int nWidth + ,int nHeight + ,int nSizeFlags = wxSIZE_AUTO + ); virtual wxSize DoGetBestSize(void) const; + +private: + DECLARE_DYNAMIC_CLASS(wxStaticText) }; // end of CLASS wxStaticText #endif