compilation fix for wxUnivGTK

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

diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 37741420271225b772400e811e1bd6034fdfe9e5..97f7f5441472957d99e4df1861e8697c76cd8f6c 100644 (file)
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -27,13 +27,13 @@ public:
 
     // in wxGTK wxStaticText doesn't derive from wxStaticTextBase so we have to
     // declare this function directly in gtk header
 
     // in wxGTK wxStaticText doesn't derive from wxStaticTextBase so we have to
     // declare this function directly in gtk header

-#ifndef __WXGTK__
+#if !defined(__WXGTK__) || defined(__WXUNIVERSAL__)

     // 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);
     // 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__
+#endif // ! native __WXGTK__

 
     // overriden base virtuals
     virtual bool AcceptsFocus() const { return false; }
 
     // overriden base virtuals
     virtual bool AcceptsFocus() const { return false; }

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index 91e11accb13db7a104eb7c14547dbe21efbe3f25..9b6e38f81b63725d491b4f284844752bb11f1939 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -239,7 +239,7 @@ wxSizer *wxDialogBase::CreateTextSizer(const wxString& message)
 }
 
 void
 }
 
 void

-#ifdef __WXGTK__
+#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)

 wxStaticText
 #else
 wxStaticTextBase
 wxStaticText
 #else
 wxStaticTextBase