make wxTmemchr() return (and take) char* instead of void* in ANSI build too

[wxWidgets.git] / include / wx / gtk / stattext.h

diff --git a/include/wx/gtk/stattext.h b/include/wx/gtk/stattext.h
index 42193ac8d10ad0c9e0492f13ba0dd711c5e5eee3..949d2cbf9c22105b87090934abe6fe980e7d628c 100644 (file)
--- a/include/wx/gtk/stattext.h
+++ b/include/wx/gtk/stattext.h
@@ -14,7 +14,7 @@
 // wxStaticText
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxStaticText : public wxControl
+class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase
 {
 public:
     wxStaticText();
@@ -43,8 +43,7 @@ public:
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
-    // see wx/stattext.h
-    void Wrap(int width);
+
 
     // implementation
     // --------------
@@ -59,6 +58,9 @@ protected:
 
     virtual wxSize DoGetBestSize() const;
 
+    virtual wxString DoGetLabel() const;
+    virtual void DoSetLabel(const wxString& str);
+
     DECLARE_DYNAMIC_CLASS(wxStaticText)
 };