From a351409ef2b30f92b933b0f77fbd20a36d7e963a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 18 Aug 2005 22:16:52 +0000 Subject: [PATCH] compilation fix for wxUnivGTK git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/stattext.h | 4 ++-- src/common/dlgcmn.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wx/stattext.h b/include/wx/stattext.h index 3774142027..97f7f54414 100644 --- 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 -#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); -#endif // __WXGTK__ +#endif // ! native __WXGTK__ // overriden base virtuals virtual bool AcceptsFocus() const { return false; } diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp index 91e11accb1..9b6e38f81b 100644 --- a/src/common/dlgcmn.cpp +++ b/src/common/dlgcmn.cpp @@ -239,7 +239,7 @@ wxSizer *wxDialogBase::CreateTextSizer(const wxString& message) } void -#ifdef __WXGTK__ +#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__) wxStaticText #else wxStaticTextBase