[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

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

diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp
index aa7455040f24ff6a01ebb2f95800561d24480ff3..f52cdb4a3dce6c3db149160a9337ac2669939f91 100644 (file)
--- a/src/gtk/dataobj.cpp
+++ b/src/gtk/dataobj.cpp
@@ -20,6 +20,7 @@
 #include "wx/mstream.h"
 #include "wx/image.h"
 #include "wx/log.h"
 #include "wx/mstream.h"
 #include "wx/image.h"
 #include "wx/log.h"

+#include "wx/uri.h"

 
 #include <gdk/gdk.h>
 
 
 #include <gdk/gdk.h>
 


@@ -80,8 +81,15 @@ void wxDataFormat::SetType( wxDataFormatId type )
     
     m_type = 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;
     if (m_type == wxDF_TEXT || m_type == wxDF_UNICODETEXT)
         m_format = g_textAtom;

+#endif

     else
     if (m_type == wxDF_BITMAP)
         m_format = g_pngAtom;
     else
     if (m_type == wxDF_BITMAP)
         m_format = g_pngAtom;


@@ -111,6 +119,13 @@ void wxDataFormat::SetId( NativeFormat format )
     m_format = format;
 
     if (m_format == g_textAtom)
     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)
         m_type = wxDF_TEXT;
     else
     if (m_format == g_pngAtom)


@@ -239,28 +254,10 @@ size_t wxFileDataObject::GetDataSize() const
 
 bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
 {
 
 bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
 {

-    // VZ: old format
-#if 0
-    // filenames are stores as a string with #0 as deliminators
-    const char *filenames = (const char*) buf;
-    size_t pos = 0;
-    for(;;)
-    {
-        if (filenames[0] == 0)
-            break;
-        if (pos >= size)
-            break;
-        wxString file( filenames );  // this returns the first file
-        AddFile( file );
-        pos += file.Len()+1;
-        filenames += file.Len()+1;
-    }
-#else // 1

     m_filenames.Empty();
 
     m_filenames.Empty();
 

-    // the text/uri-list format is a sequence of URIs (filenames prefixed by
-    // "file:" as far as I see) delimited by "\r\n" of total length size
-    // (I wonder what happens if the file has '\n' in its filename??)
+    // we get data in the text/uri-list format, i.e. as a sequence of URIs
+    // (filenames prefixed by "file:") delimited by "\r\n"

     wxString filename;
     for ( const char *p = (const char *)buf; ; p++ )
     {
     wxString filename;
     for ( const char *p = (const char *)buf; ; p++ )
     {


@@ -281,7 +278,7 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
                     lenPrefix += 2;
                 }
 
                     lenPrefix += 2;
                 }
 

-                AddFile(filename.c_str() + lenPrefix);
+                AddFile(wxURI::Unescape(filename.c_str() + lenPrefix));

                 filename.Empty();
             }
             else
                 filename.Empty();
             }
             else


@@ -301,7 +298,6 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
             filename += *p;
         }
     }
             filename += *p;
         }
     }

-#endif // 0/1

 
     return TRUE;
 }
 
     return TRUE;
 }