X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cf73271dd6f442a98e86b559d4a55c37e25b99f..7b4a652a8bf3da1b2dd20dd22c9e6db5dd03db59:/include/wx/mac/carbon/stattext.h diff --git a/include/wx/mac/carbon/stattext.h b/include/wx/mac/carbon/stattext.h index 17ecf98ad0..c5f41c02c4 100644 --- a/include/wx/mac/carbon/stattext.h +++ b/include/wx/mac/carbon/stattext.h @@ -18,11 +18,10 @@ class WXDLLEXPORT wxStaticText: public wxStaticTextBase { - DECLARE_DYNAMIC_CLASS(wxStaticText) - public: - inline wxStaticText() : m_label() { } +public: + wxStaticText() { } - inline wxStaticText(wxWindow *parent, wxWindowID id, + wxStaticText(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -43,19 +42,12 @@ class WXDLLEXPORT wxStaticText: public wxStaticTextBase void SetLabel( const wxString &str ) ; bool SetFont( const wxFont &font ); - // operations - virtual void Command(wxCommandEvent& WXUNUSED(event)) {}; - virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {}; - // events - void DrawParagraph(wxDC &dc, wxString paragraph, int &y); - void OnPaint( wxPaintEvent &event ) ; - void OnDraw( wxDC &dc ) ; +protected : + virtual wxSize DoGetBestSize() const ; virtual bool AcceptsFocus() const { return FALSE; } - private : - wxString m_label ; - DECLARE_EVENT_TABLE() + DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText) }; #endif