X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/05adb9d2fdc40d8620730be490bf406b8e367cf8..594f0f5bf1355fb8d58f403d3ebacc1c1767c429:/include/wx/mac/stattext.h?ds=sidebyside diff --git a/include/wx/mac/stattext.h b/include/wx/mac/stattext.h index e41f06ba4f..934d7e8118 100644 --- a/include/wx/mac/stattext.h +++ b/include/wx/mac/stattext.h @@ -16,11 +16,7 @@ #pragma interface "stattext.h" #endif -#include "wx/control.h" - -WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr; - -class WXDLLEXPORT wxStaticText: public wxControl +class WXDLLEXPORT wxStaticText: public wxStaticTextBase { DECLARE_DYNAMIC_CLASS(wxStaticText) public: @@ -49,9 +45,10 @@ class WXDLLEXPORT wxStaticText: public wxControl virtual void Command(wxCommandEvent& WXUNUSED(event)) {}; virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {}; // events + void DrawParagraph(wxDC &dc, wxString paragraph); void OnPaint( wxPaintEvent &event ) ; void OnDraw( wxDC &dc ) ; - wxSize DoGetBestSize() const ; + virtual wxSize DoGetBestSize() const ; virtual bool AcceptsFocus() const { return FALSE; } private : wxString m_label ;