Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed double filename->URL conversion

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-10-13 09:56:30 +00:00
parent 18aeafcbc0
commit f9d243a306
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/src/xrc/xmlres.cpp
View File

@@ -124,8 +124,7 @@ bool wxXmlResource::Load(const wxString& filemask)
if (fnd.Lower().Matches(wxT("*.zip")) || if (fnd.Lower().Matches(wxT("*.zip")) ||
fnd.Lower().Matches(wxT("*.xrs"))) fnd.Lower().Matches(wxT("*.xrs")))
{ {
wxString url(wxFileSystem::FileNameToURL(fnd)); rt = rt && Load(fnd + wxT("#zip:*.xrc"));
rt = rt && Load(url + wxT("#zip:*.xrc"));
} }
else else
#endif #endif

3
src/xrc/xmlres.cpp
View File

@@ -124,8 +124,7 @@ bool wxXmlResource::Load(const wxString& filemask)
if (fnd.Lower().Matches(wxT("*.zip")) || if (fnd.Lower().Matches(wxT("*.zip")) ||
fnd.Lower().Matches(wxT("*.xrs"))) fnd.Lower().Matches(wxT("*.xrs")))
{ {
wxString url(wxFileSystem::FileNameToURL(fnd)); rt = rt && Load(fnd + wxT("#zip:*.xrc"));
rt = rt && Load(url + wxT("#zip:*.xrc"));
} }
else else
#endif #endif