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

fixed loading of resource from ZIP files on MacOS

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-03-27 20:06:20 +00:00
parent aae91497f6
commit 76806f5906
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,7 +121,8 @@ 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")))
{ {
rt = rt && Load(fnd + wxT("#zip:*.xrc")); wxString url(wxFileSystem::FileNameToURL(fnd));
rt = rt && Load(url + wxT("#zip:*.xrc"));
} }
else else
#endif #endif

4
docs/toback24.txt
View File

@@ -165,6 +165,10 @@ Must be modified to be binary compatible before backporting!
Checking in xmlres.cpp; Checking in xmlres.cpp;
/pack/cvsroots/wxwindows/wxWindows/contrib/src/xrc/xmlres.cpp,v <-- xmlres.cpp /pack/cvsroots/wxwindows/wxWindows/contrib/src/xrc/xmlres.cpp,v <-- xmlres.cpp
new revision: 1.27; previous revision: 1.26 new revision: 1.27; previous revision: 1.26
done
(also revision 1.30->1.31 of xmlres.cpp !!!)
Checking in xmlres.h; Checking in xmlres.h;
/pack/cvsroots/wxwindows/wxWindows/contrib/include/wx/xrc/xmlres.h,v <-- xmlres.h /pack/cvsroots/wxwindows/wxWindows/contrib/include/wx/xrc/xmlres.h,v <-- xmlres.h
new revision: 1.22; previous revision: 1.21 new revision: 1.22; previous revision: 1.21

3
src/xrc/xmlres.cpp
View File

@@ -121,7 +121,8 @@ 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")))
{ {
rt = rt && Load(fnd + wxT("#zip:*.xrc")); wxString url(wxFileSystem::FileNameToURL(fnd));
rt = rt && Load(url + wxT("#zip:*.xrc"));
} }
else else
#endif #endif