hacked around wxGTK wxStaticText which doesn't derive from wxStaticTextBase (argh...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 8b0c667eb12ee750fdb9b8cab0f87cd311e01843..37741420271225b772400e811e1bd6034fdfe9e5 100644 (file)
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -25,11 +25,15 @@ class WXDLLEXPORT wxStaticTextBase : public wxControl
 public:
     wxStaticTextBase() { }
 
+    // in wxGTK wxStaticText doesn't derive from wxStaticTextBase so we have to
+    // declare this function directly in gtk header
+#ifndef __WXGTK__
     // wrap the text of the control so that no line is longer than the given
     // width (if possible: this function won't break words)
     //
     // NB: implemented in dlgcmn.cpp for now
     void Wrap(int width);
+#endif // __WXGTK__
 
     // overriden base virtuals
     virtual bool AcceptsFocus() const { return false; }

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index d9844ee042ffbfca58400445dd1f170e2b4c61fa..91e11accb13db7a104eb7c14547dbe21efbe3f25 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -238,12 +238,18 @@ wxSizer *wxDialogBase::CreateTextSizer(const wxString& message)
     return wrapper.CreateSizer(text, widthMax);
 }
 
-void wxStaticTextBase::Wrap(int width)
+void
+#ifdef __WXGTK__
+wxStaticText
+#else
+wxStaticTextBase
+#endif
+::Wrap(int width)
 {
     class LabelWrapper : public wxTextWrapper
     {
     public:
-        void WrapLabel(wxStaticTextBase *text, int widthMax)
+        void WrapLabel(wxWindow *text, int widthMax)
         {
             m_text.clear();
             Wrap(text, text->GetLabel(), widthMax);