X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..c6ea1fdaf924be4ee49a19d12f76e4fcd257bb0a:/include/wx/univ/stattext.h diff --git a/include/wx/univ/stattext.h b/include/wx/univ/stattext.h index 3c882c69c3..7ee5cac3ff 100644 --- a/include/wx/univ/stattext.h +++ b/include/wx/univ/stattext.h @@ -12,11 +12,9 @@ #ifndef _WX_UNIV_STATTEXT_H_ #define _WX_UNIV_STATTEXT_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "univstattext.h" -#endif +#include "wx/generic/stattextg.h" -class WXDLLEXPORT wxStaticText : public wxStaticTextBase +class WXDLLIMPEXP_CORE wxStaticText : public wxGenericStaticText { public: wxStaticText() { } @@ -27,7 +25,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,18 +53,16 @@ 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 - virtual wxSize DoGetBestClientSize() const; - // draw the control virtual void DoDraw(wxControlRenderer *renderer); - DECLARE_ABSTRACT_CLASS(wxStaticText) + virtual void DoSetLabel(const wxString& str); + virtual wxString DoGetLabel() const; + + DECLARE_DYNAMIC_CLASS(wxStaticText) }; #endif // _WX_UNIV_STATTEXT_H_