corrected off by 1 error in cMB2WC() call (thanks valgrind)

[wxWidgets.git] / src / gtk / dataobj.cpp

diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp
index ef24cfe8afc6dea778727548f8dcf1a211163f24..32288359f174f16b42d82b61061129297ddaead0 100644 (file)
--- a/src/gtk/dataobj.cpp
+++ b/src/gtk/dataobj.cpp
@@ -58,13 +58,7 @@ wxDataFormat::wxDataFormat( wxDataFormatId type )
     SetType( type );
 }
 
-wxDataFormat::wxDataFormat( const wxChar *id )
-{
-    PrepareFormats();
-    SetId( id );
-}
-
-wxDataFormat::wxDataFormat( const wxString &id )
+void wxDataFormat::InitFromString( const wxString &id )
 {
     PrepareFormats();
     SetId( id );
@@ -138,12 +132,11 @@ void wxDataFormat::SetId( NativeFormat format )
         m_type = wxDF_PRIVATE;
 }
 
-void wxDataFormat::SetId( const wxChar *id )
+void wxDataFormat::SetId( const wxString& id )
 {
     PrepareFormats();
     m_type = wxDF_PRIVATE;
-    wxString tmp( id );
-    m_format = gdk_atom_intern( (const char*) tmp.ToAscii(), FALSE );
+    m_format = gdk_atom_intern( id.ToAscii(), FALSE );
 }
 
 void wxDataFormat::PrepareFormats()
@@ -279,7 +272,12 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
                     lenPrefix += 2;
                 }
 
-                AddFile(wxURI::Unescape(filename.c_str() + lenPrefix));
+                // It would probably be nicer to use a GTK or Glib
+                // function to unescape the 8-bit strings pointed to
+                // by buf, but this does the same in wx code.
+                wxString filename_unicode = wxURI::Unescape(filename.c_str() + lenPrefix);
+                wxCharBuffer filename_8bit = filename_unicode.mb_str(wxConvISO8859_1);
+                AddFile(wxString(filename_8bit, *wxConvFileName));
                 filename.Empty();
             }
             else if ( !filename.empty() )
@@ -296,6 +294,7 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
         }
         else
         {
+            // The string is in ISO-8859-1 according to XDND spec
             filename += *p;
         }
     }