compilation fix for wxUnivGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
81e2cbc685
commit
a351409ef2
@ -27,13 +27,13 @@ public:
|
|||||||
|
|
||||||
// in wxGTK wxStaticText doesn't derive from wxStaticTextBase so we have to
|
// in wxGTK wxStaticText doesn't derive from wxStaticTextBase so we have to
|
||||||
// declare this function directly in gtk header
|
// 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
|
// wrap the text of the control so that no line is longer than the given
|
||||||
// width (if possible: this function won't break words)
|
// width (if possible: this function won't break words)
|
||||||
//
|
//
|
||||||
// NB: implemented in dlgcmn.cpp for now
|
// NB: implemented in dlgcmn.cpp for now
|
||||||
void Wrap(int width);
|
void Wrap(int width);
|
||||||
#endif // __WXGTK__
|
#endif // ! native __WXGTK__
|
||||||
|
|
||||||
// overriden base virtuals
|
// overriden base virtuals
|
||||||
virtual bool AcceptsFocus() const { return false; }
|
virtual bool AcceptsFocus() const { return false; }
|
||||||
|
@ -239,7 +239,7 @@ wxSizer *wxDialogBase::CreateTextSizer(const wxString& message)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
#ifdef __WXGTK__
|
#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
|
||||||
wxStaticText
|
wxStaticText
|
||||||
#else
|
#else
|
||||||
wxStaticTextBase
|
wxStaticTextBase
|
||||||
|
Loading…
Reference in New Issue
Block a user