X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/403aced8ed8e6e814f6979cc3d6988c7f731438d..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/msw/stattext.h diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h index 781b5878ab..2bae454889 100644 --- a/include/wx/msw/stattext.h +++ b/include/wx/msw/stattext.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: stattext.h +// Name: wx/msw/stattext.h // Purpose: wxStaticText class // Author: Julian Smart // Modified by: @@ -12,16 +12,8 @@ #ifndef _WX_STATTEXT_H_ #define _WX_STATTEXT_H_ -#ifdef __GNUG__ - #pragma interface "stattext.h" -#endif - -#include "wx/control.h" - -class WXDLLEXPORT wxStaticText : public wxControl +class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase { -DECLARE_DYNAMIC_CLASS(wxStaticText) - public: wxStaticText() { } @@ -44,18 +36,22 @@ public: long style = 0, const wxString& name = wxStaticTextNameStr); - // accessors - void SetLabel(const wxString& label); - bool SetFont( const wxFont &font ); + // override some methods to resize the window properly + virtual void SetLabel(const wxString& label); + virtual 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); + virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const; protected: - virtual wxSize DoGetBestSize() const; + // implement/override some base class virtuals + virtual void DoSetSize(int x, int y, int w, int h, + int sizeFlags = wxSIZE_AUTO); + virtual wxSize DoGetBestClientSize() const; + + virtual wxString DoGetLabel() const; + virtual void DoSetLabel(const wxString& str); + + DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText) }; #endif