X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/403aced8ed8e6e814f6979cc3d6988c7f731438d..f41bc3e3f3fda37fba548440b230288c5eed0953:/include/wx/msw/stattext.h diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h index 781b5878ab..29561640a9 100644 --- a/include/wx/msw/stattext.h +++ b/include/wx/msw/stattext.h @@ -16,12 +16,8 @@ #pragma interface "stattext.h" #endif -#include "wx/control.h" - -class WXDLLEXPORT wxStaticText : public wxControl +class WXDLLEXPORT wxStaticText : public wxStaticTextBase { -DECLARE_DYNAMIC_CLASS(wxStaticText) - public: wxStaticText() { } @@ -44,18 +40,17 @@ public: long style = 0, const wxString& name = wxStaticTextNameStr); - // accessors - void SetLabel(const wxString& label); - bool SetFont( const wxFont &font ); - - // overriden base class virtuals - virtual bool AcceptsFocus() const { return FALSE; } - - // callbacks - virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + // override some methods to resize the window properly + virtual void SetLabel(const wxString& label); + virtual bool SetFont( const wxFont &font ); protected: + virtual void DoSetSize(int x, int y, int w, int h, + int sizeFlags = wxSIZE_AUTO); virtual wxSize DoGetBestSize() const; + virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + + DECLARE_DYNAMIC_CLASS(wxStaticText) }; #endif