X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2e1d71048207f3d008dac28d0c290ae0a6b59997..2c92d7e398074a8f7ff9b2846ba9dc052d77dd70:/src/gtk1/dataobj.cpp

diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp
index 712616a074..2b0f4f43ae 100644
--- a/src/gtk1/dataobj.cpp
+++ b/src/gtk1/dataobj.cpp
@@ -16,6 +16,7 @@
 #include "wx/debug.h"
 #include "wx/mstream.h"
 #include "wx/image.h"
+#include "wx/log.h"
 
 #include <gdk/gdk.h>
 
@@ -72,8 +73,12 @@ wxDataFormat::wxDataFormat( NativeFormat format )
 void wxDataFormat::SetType( wxDataFormatId type )
 {
     PrepareFormats();
-    m_type = type;
+    
+    if (type == wxDF_UNICODETEXT)
+       type = wxDF_TEXT;
 
+    m_type = type;
+    
     if (m_type == wxDF_TEXT)
         m_format = g_textAtom;
     else
@@ -135,7 +140,7 @@ void wxDataFormat::PrepareFormats()
     //     here (with whom?)
     if (!g_textAtom)
 #if wxUSE_UNICODE
-        g_textAtom = gdk_atom_intern( "text/utf8", FALSE );
+        g_textAtom = gdk_atom_intern( "UTF8_STRING", FALSE );
 #else
         g_textAtom = gdk_atom_intern( "STRING" /* "text/plain" */, FALSE );
 #endif
@@ -153,6 +158,11 @@ wxDataObject::wxDataObject()
 {
 }
 
+wxDataObject::~wxDataObject()
+{
+    // dtor is empty but needed for Darwin and AIX -- otherwise it doesn't link
+}
+
 bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) const
 {
     size_t nFormatCount = GetFormatCount(dir);