X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/371a5b4e62eb415107e045588f614fa49e866e78..23b4f32040409166e2ee53314c5b27c593982c0a:/include/wx/univ/stattext.h diff --git a/include/wx/univ/stattext.h b/include/wx/univ/stattext.h index fc17b58df8..888ade81f6 100644 --- a/include/wx/univ/stattext.h +++ b/include/wx/univ/stattext.h @@ -12,11 +12,7 @@ #ifndef _WX_UNIV_STATTEXT_H_ #define _WX_UNIV_STATTEXT_H_ -#ifdef __GNUG__ - #pragma interface "univstattext.h" -#endif - -class WXDLLEXPORT wxStaticText : public wxStaticTextBase +class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase { public: wxStaticText() { } @@ -27,7 +23,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize) { - Create(parent, -1, label, pos, size, 0, wxStaticTextNameStr); + Create(parent, wxID_ANY, label, pos, size, 0, wxStaticTextNameStr); } // full form @@ -55,9 +51,7 @@ public: virtual void SetLabel(const wxString& label); - virtual bool HasTransparentBackground() { return TRUE; } - - virtual bool IsFocused() const { return FALSE; } + virtual bool IsFocused() const { return false; } protected: // calculate the optimal size for the label @@ -66,6 +60,9 @@ protected: // draw the control virtual void DoDraw(wxControlRenderer *renderer); + virtual void DoSetLabel(const wxString& str); + virtual wxString DoGetLabel() const; + DECLARE_ABSTRACT_CLASS(wxStaticText) };