Support wxDF_UNICODETEXT

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

diff --git a/src/x11/clipbrd.cpp b/src/x11/clipbrd.cpp
index 1ae753aec7a944efa3805679eac298891fa1c834..80a7a15d25a331ed6d2ab48df0137e48d861939f 100644 (file)
--- a/src/x11/clipbrd.cpp
+++ b/src/x11/clipbrd.cpp
@@ -249,7 +249,7 @@ selection_handler( GtkWidget *WXUNUSED(widget),
 
     // transform Unicode text into multibyte before putting it on clipboard
 #if wxUSE_UNICODE
-    if ( format.GetType() == wxDF_TEXT )
+    if ( format.GetType() == wxDF_TEXT || format.GetType() == wxDF_UNICODETEXT)
     {
         const wchar_t *wstr = (const wchar_t *)d;
         size_t len = wxConvCurrent->WC2MB(NULL, wstr, 0);

diff --git a/src/x11/dataobj.cpp b/src/x11/dataobj.cpp
index 1f2d5aaf0990a8bb7238a6934d7a239f5976475a..b0c6bbc7d4d658c6df6e71a6062f053cef5ac991 100644 (file)
--- a/src/x11/dataobj.cpp
+++ b/src/x11/dataobj.cpp
@@ -80,7 +80,7 @@ void wxDataFormat::SetType( wxDataFormatId type )
     PrepareFormats();
     m_type = type;
 
-    if (m_type == wxDF_TEXT)
+    if (m_type == wxDF_TEXT || m_type == wxDF_UNICODETEXT)
         m_format = g_textAtom;
     else
     if (m_type == wxDF_BITMAP)