From: Václav Slavík <vslavik@fastmail.fm>
Date: Mon, 13 Oct 2003 09:56:30 +0000 (+0000)
Subject: fixed double filename->URL conversion
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f9d243a306f4249af2e70f6ee6b625f3731e6db9

fixed double filename->URL conversion


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

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