From fe443d5392514499c74fceb4ef0c49ac1d90e683 Mon Sep 17 00:00:00 2001 From: Jouk Jansen Date: Fri, 7 Nov 2014 13:22:00 +0000 Subject: [PATCH] Fix for compilation of wxX11 without UTF git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/x11/dataobj.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/x11/dataobj.cpp b/src/x11/dataobj.cpp index ae09c0fde5..ac53d637a7 100644 --- a/src/x11/dataobj.cpp +++ b/src/x11/dataobj.cpp @@ -378,10 +378,12 @@ void wxBitmapDataObject::DoConvertToPng() // wxTextDataObject // ---------------------------------------------------------------------------- +#if defined(wxNEEDS_UTF8_FOR_TEXT_DATAOBJ) || defined(wxNEEDS_UTF16_FOR_TEXT_DATAOBJ) void wxTextDataObject::GetAllFormats(wxDataFormat *formats, wxDataObjectBase::Direction WXUNUSED(dir)) const { *formats++ = GetPreferredFormat(); } +#endif #endif // wxUSE_DATAOBJ