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

fixed wxXmlResource::Load's detection of filenames to be done as early as possible

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2009-02-26 00:13:03 +00:00
parent 574e1c5a03
commit acd32ffcdb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/xrc/xmlres.cpp
View File

@@ -178,8 +178,10 @@ bool wxXmlResource::IsArchive(const wxString& filename)
#endif // wxUSE_FILESYSTEM #endif // wxUSE_FILESYSTEM
bool wxXmlResource::Load(const wxString& filemask) bool wxXmlResource::Load(const wxString& filemask_)
{ {
wxString filemask = ConvertFileNameToURL(filemask_);
#if wxUSE_FILESYSTEM #if wxUSE_FILESYSTEM
wxFileSystem fsys; wxFileSystem fsys;
# define wxXmlFindFirst fsys.FindFirst(filemask, wxFILE) # define wxXmlFindFirst fsys.FindFirst(filemask, wxFILE)
@@ -197,8 +199,6 @@ bool wxXmlResource::Load(const wxString& filemask)
while (!fnd.empty()) while (!fnd.empty())
{ {
fnd = ConvertFileNameToURL(fnd);
#if wxUSE_FILESYSTEM #if wxUSE_FILESYSTEM
if ( IsArchive(fnd) ) if ( IsArchive(fnd) )
{ {