fixed double filename->URL conversion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@24163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -124,7 +124,6 @@ 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(url + wxT("#zip:*.xrc"));
|
rt = rt && Load(url + wxT("#zip:*.xrc"));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@@ -124,7 +124,6 @@ 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(url + wxT("#zip:*.xrc"));
|
rt = rt && Load(url + wxT("#zip:*.xrc"));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
Reference in New Issue
Block a user