From f9d243a306f4249af2e70f6ee6b625f3731e6db9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 13 Oct 2003 09:56:30 +0000 Subject: [PATCH] fixed double filename->URL conversion git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/xrc/xmlres.cpp | 3 +-- src/xrc/xmlres.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/contrib/src/xrc/xmlres.cpp b/contrib/src/xrc/xmlres.cpp index cd440746ff..d795abd509 100644 --- a/contrib/src/xrc/xmlres.cpp +++ b/contrib/src/xrc/xmlres.cpp @@ -124,8 +124,7 @@ bool wxXmlResource::Load(const wxString& filemask) if (fnd.Lower().Matches(wxT("*.zip")) || fnd.Lower().Matches(wxT("*.xrs"))) { - wxString url(wxFileSystem::FileNameToURL(fnd)); - rt = rt && Load(url + wxT("#zip:*.xrc")); + rt = rt && Load(fnd + wxT("#zip:*.xrc")); } else #endif diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp index cd440746ff..d795abd509 100644 --- a/src/xrc/xmlres.cpp +++ b/src/xrc/xmlres.cpp @@ -124,8 +124,7 @@ bool wxXmlResource::Load(const wxString& filemask) if (fnd.Lower().Matches(wxT("*.zip")) || fnd.Lower().Matches(wxT("*.xrs"))) { - wxString url(wxFileSystem::FileNameToURL(fnd)); - rt = rt && Load(url + wxT("#zip:*.xrc")); + rt = rt && Load(fnd + wxT("#zip:*.xrc")); } else #endif -- 2.50.0