don't confuse wxDF_UNICODETEXT and wxDF_TEXT

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

diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp
index aa7455040f24ff6a01ebb2f95800561d24480ff3..0602e780372db27ec04a1ec7366240485ade5606 100644 (file)
--- a/src/gtk/dataobj.cpp
+++ b/src/gtk/dataobj.cpp
@@ -80,8 +80,15 @@ void wxDataFormat::SetType( wxDataFormatId type )
     
     m_type = type;
     
+#if wxUSE_UNICODE
+    if (m_type == wxDF_UNICODETEXT)
+        m_format = g_textAtom;
+    else if (m_type == wxDF_TEXT)
+        m_format = g_altTextAtom;
+#else
     if (m_type == wxDF_TEXT || m_type == wxDF_UNICODETEXT)
         m_format = g_textAtom;
+#endif
     else
     if (m_type == wxDF_BITMAP)
         m_format = g_pngAtom;
@@ -111,6 +118,13 @@ void wxDataFormat::SetId( NativeFormat format )
     m_format = format;
 
     if (m_format == g_textAtom)
+#if wxUSE_UNICODE
+        m_type = wxDF_UNICODETEXT;
+#else
+        m_type = wxDF_TEXT;
+#endif
+    else
+    if (m_format == g_altTextAtom)
         m_type = wxDF_TEXT;
     else
     if (m_format == g_pngAtom)

diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp
index aa7455040f24ff6a01ebb2f95800561d24480ff3..0602e780372db27ec04a1ec7366240485ade5606 100644 (file)
--- a/src/gtk1/dataobj.cpp
+++ b/src/gtk1/dataobj.cpp
@@ -80,8 +80,15 @@ void wxDataFormat::SetType( wxDataFormatId type )
     
     m_type = type;
     
+#if wxUSE_UNICODE
+    if (m_type == wxDF_UNICODETEXT)
+        m_format = g_textAtom;
+    else if (m_type == wxDF_TEXT)
+        m_format = g_altTextAtom;
+#else
     if (m_type == wxDF_TEXT || m_type == wxDF_UNICODETEXT)
         m_format = g_textAtom;
+#endif
     else
     if (m_type == wxDF_BITMAP)
         m_format = g_pngAtom;
@@ -111,6 +118,13 @@ void wxDataFormat::SetId( NativeFormat format )
     m_format = format;
 
     if (m_format == g_textAtom)
+#if wxUSE_UNICODE
+        m_type = wxDF_UNICODETEXT;
+#else
+        m_type = wxDF_TEXT;
+#endif
+    else
+    if (m_format == g_altTextAtom)
         m_type = wxDF_TEXT;
     else
     if (m_format == g_pngAtom)