X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/23239d944abef634f7816a501d2daa02815842f6..9d5cfd0e64a2c09d957517405758de680806e674:/src/xrc/xmlres.cpp diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp index 65cc83c85e..115f3461e5 100644 --- a/src/xrc/xmlres.cpp +++ b/src/xrc/xmlres.cpp @@ -178,8 +178,15 @@ bool wxXmlResource::IsArchive(const wxString& filename) #endif // wxUSE_FILESYSTEM -bool wxXmlResource::Load(const wxString& filemask) +bool wxXmlResource::LoadFile(const wxFileName& file) { + return Load(wxFileSystem::FileNameToURL(file)); +} + +bool wxXmlResource::Load(const wxString& filemask_) +{ + wxString filemask = ConvertFileNameToURL(filemask_); + #if wxUSE_FILESYSTEM wxFileSystem fsys; # define wxXmlFindFirst fsys.FindFirst(filemask, wxFILE) @@ -197,8 +204,6 @@ bool wxXmlResource::Load(const wxString& filemask) while (!fnd.empty()) { - fnd = ConvertFileNameToURL(fnd); - #if wxUSE_FILESYSTEM if ( IsArchive(fnd) ) {