Use proper wxURI unescape instead of old way

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

diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp
index 2111b237e8608827d8164af84eee2011c16c72e8..f52cdb4a3dce6c3db149160a9337ac2669939f91 100644 (file)
--- a/src/gtk/dataobj.cpp
+++ b/src/gtk/dataobj.cpp
@@ -20,7 +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/url.h"
+#include "wx/uri.h"

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


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

-                AddFile(
-#if wxUSE_URL
-                        wxURL::ConvertFromURI
-#endif // wxUSE_URL
-                            (filename.c_str() + lenPrefix));
+                AddFile(wxURI::Unescape(filename.c_str() + lenPrefix));

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

diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp
index 2111b237e8608827d8164af84eee2011c16c72e8..f52cdb4a3dce6c3db149160a9337ac2669939f91 100644 (file)
--- a/src/gtk1/dataobj.cpp
+++ b/src/gtk1/dataobj.cpp
@@ -20,7 +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/url.h"
+#include "wx/uri.h"

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


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

-                AddFile(
-#if wxUSE_URL
-                        wxURL::ConvertFromURI
-#endif // wxUSE_URL
-                            (filename.c_str() + lenPrefix));
+                AddFile(wxURI::Unescape(filename.c_str() + lenPrefix));

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