Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enable wxNEEDS_UTF8_FOR_TEXT_DATAOBJ flag for x11 TextDataObject, and add implementation of GetAllFormat function

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-09-23 17:43:24 +00:00
parent 0e998def86
commit d956d87f2e
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/dataobj.h
View File

@@ -322,7 +322,7 @@ private:
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if wxUSE_UNICODE #if wxUSE_UNICODE
#if defined(__WXGTK20__) #if defined(__WXGTK20__) || defined(__WXX11__)
#define wxNEEDS_UTF8_FOR_TEXT_DATAOBJ #define wxNEEDS_UTF8_FOR_TEXT_DATAOBJ
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#define wxNEEDS_UTF16_FOR_TEXT_DATAOBJ #define wxNEEDS_UTF16_FOR_TEXT_DATAOBJ

10
src/x11/dataobj.cpp
View File

@@ -374,4 +374,14 @@ void wxBitmapDataObject::DoConvertToPng()
#endif #endif
} }
// ----------------------------------------------------------------------------
// wxTextDataObject
// ----------------------------------------------------------------------------
void
wxTextDataObject::GetAllFormats(wxDataFormat *formats,
wxDataObjectBase::Direction WXUNUSED(dir)) const
{
*formats++ = GetPreferredFormat();
}
#endif // wxUSE_DATAOBJ #endif // wxUSE_DATAOBJ