X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/442b35b53bf95f5c6c003ea9ddbefd17adbc2a00..c6ea1fdaf924be4ee49a19d12f76e4fcd257bb0a:/include/wx/univ/stattext.h diff --git a/include/wx/univ/stattext.h b/include/wx/univ/stattext.h index 869b9960da..7ee5cac3ff 100644 --- a/include/wx/univ/stattext.h +++ b/include/wx/univ/stattext.h @@ -6,26 +6,26 @@ // Created: 14.08.00 // RCS-ID: $Id$ // Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com) -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_UNIV_STATTEXT_H_ #define _WX_UNIV_STATTEXT_H_ -#ifdef __GNUG__ - #pragma interface "univstattext.h" -#endif +#include "wx/generic/stattextg.h" -class WXDLLEXPORT wxStaticText : public wxStaticTextBase +class WXDLLIMPEXP_CORE wxStaticText : public wxGenericStaticText { public: + wxStaticText() { } + // usual ctor wxStaticText(wxWindow *parent, const wxString& label, 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 @@ -33,7 +33,7 @@ public: wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, + const wxSize& size = wxDefaultSize, long style = 0, const wxString &name = wxStaticTextNameStr) { @@ -45,7 +45,7 @@ public: wxWindowID id, const wxString &label, const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, + const wxSize &size = wxDefaultSize, long style = 0, const wxString &name = wxStaticTextNameStr); @@ -53,12 +53,16 @@ public: virtual void SetLabel(const wxString& label); -protected: - // calculate the optimal size for the label - virtual wxSize DoGetBestClientSize() const; + virtual bool IsFocused() const { return false; } +protected: // draw the control virtual void DoDraw(wxControlRenderer *renderer); + + virtual void DoSetLabel(const wxString& str); + virtual wxString DoGetLabel() const; + + DECLARE_DYNAMIC_CLASS(wxStaticText) }; #endif // _WX_UNIV_STATTEXT_H_