X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab13b95e5cd3ce2feb83b5b5011fb21b84041f1e..1602d4d0fb10d4aebe0e3d63fbab0bb8d09f34ff:/src/gtk1/dataobj.cpp diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp index 2111b237e8..b4341cc0e4 100644 --- a/src/gtk1/dataobj.cpp +++ b/src/gtk1/dataobj.cpp @@ -15,12 +15,15 @@ #include "wx/wxprec.h" #include "wx/dataobj.h" + +#if wxUSE_DATAOBJ + #include "wx/app.h" #include "wx/debug.h" #include "wx/mstream.h" #include "wx/image.h" #include "wx/log.h" -#include "wx/url.h" +#include "wx/uri.h" #include @@ -278,11 +281,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 @@ -400,4 +399,4 @@ void wxBitmapDataObject::DoConvertToPng() image.SaveFile(mstream, wxBITMAP_TYPE_PNG); } - +#endif // wxUSE_DATAOBJ