From 174f2229cdb37772606a38a09523cdd7d091d988 Mon Sep 17 00:00:00 2001 From: Ryan Norton Date: Thu, 28 Oct 2004 10:00:05 +0000 Subject: [PATCH] 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 --- src/gtk/dataobj.cpp | 8 ++------ src/gtk1/dataobj.cpp | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp index 2111b237e8..f52cdb4a3d 100644 --- 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/url.h" +#include "wx/uri.h" #include @@ -278,11 +278,7 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf) 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 diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp index 2111b237e8..f52cdb4a3d 100644 --- 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/url.h" +#include "wx/uri.h" #include @@ -278,11 +278,7 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf) 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 -- 2.47.2