CodeWarrior has been discontinued on Mac for years, and none of the (manually maintai...

[wxWidgets.git] / src / xrc / xmlres.cpp

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 65cc83c85e0a0fec6aa5dab647c1625d7349c67d..99ae14c44b7617422b9eede59675da05c5b20c25 100644 (file)
--- 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) )
         {
@@ -1385,7 +1390,6 @@ static wxFont GetSystemFont(const wxString& name)
         SYSFNT(wxSYS_ANSI_VAR_FONT)
         SYSFNT(wxSYS_SYSTEM_FONT)
         SYSFNT(wxSYS_DEVICE_DEFAULT_FONT)
-        SYSFNT(wxSYS_DEFAULT_PALETTE)
         SYSFNT(wxSYS_SYSTEM_FIXED_FONT)
         SYSFNT(wxSYS_DEFAULT_GUI_FONT)
         #undef SYSFNT