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

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

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 65cc83c85e0a0fec6aa5dab647c1625d7349c67d..b8d8b356012b2e6a0242a38b367d996aabe1f886 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -178,8 +178,10 @@ bool wxXmlResource::IsArchive(const wxString& filename)
 
 #endif // wxUSE_FILESYSTEM
 
-bool wxXmlResource::Load(const wxString& filemask)
+bool wxXmlResource::Load(const wxString& filemask_)
 {
+    wxString filemask = ConvertFileNameToURL(filemask_);
+
 #if wxUSE_FILESYSTEM
     wxFileSystem fsys;
 #   define wxXmlFindFirst  fsys.FindFirst(filemask, wxFILE)
@@ -197,8 +199,6 @@ bool wxXmlResource::Load(const wxString& filemask)
 
     while (!fnd.empty())
     {
-        fnd = ConvertFileNameToURL(fnd);
-
 #if wxUSE_FILESYSTEM
         if ( IsArchive(fnd) )
         {