added wxXmlResource::LoadFile() to avoid URL-vs-filename ambiguity in Load()

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

diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h
index c15202e8a79a5256cdd8e3432f2af99959ea8f2b..0c80dfc9be1e5a19d0f0312b9204a333b92dd99b 100644 (file)
--- a/include/wx/xrc/xmlres.h
+++ b/include/wx/xrc/xmlres.h
@@ -109,9 +109,12 @@ public:
     virtual ~wxXmlResource();
 
     // Loads resources from XML files that match given filemask.
-    // This method understands VFS (see filesys.h).
+    // This method understands wxFileSystem URLs if wxUSE_FILESYS.
     bool Load(const wxString& filemask);
 
+    // Loads resources from single XRC file.
+    bool LoadFile(const wxFileName& file);
+
     // Unload resource from the given XML file (wildcards not allowed)
     bool Unload(const wxString& filename);
 

diff --git a/interface/wx/xrc/xmlres.h b/interface/wx/xrc/xmlres.h
index 41fdb748ebb76898ee4df80247c2295cf5aba366..460b7fa71422073aa14430832a35496fccd9f339 100644 (file)
--- a/interface/wx/xrc/xmlres.h
+++ b/interface/wx/xrc/xmlres.h
@@ -196,10 +196,27 @@ public:
                 wxLogError("Couldn't load resources!");
         @endcode
 
-        This method understands VFS (see wxFileSystem::FindFirst).
+        @note
+        If wxUSE_FILESYS is enabled, this method understands wxFileSystem URLs
+        (see wxFileSystem::FindFirst()).
+
+        @note
+        If you are sure that the argument is name of single XRC file (rather
+        than an URL or a wildcard), use LoadFile() instead.
+
+        @see LoadFile()
     */
     bool Load(const wxString& filemask);
 
+    /**
+        Simpler form of Load() for loading a single XRC file.
+
+        @since 2.9.0
+
+        @see Load()
+    */
+    bool LoadFile(const wxFileName& file);
+
     /**
         Loads a bitmap resource from a file.
     */

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index b8d8b356012b2e6a0242a38b367d996aabe1f886..115f3461e51176295b8de89eec62c607b140f715 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -178,6 +178,11 @@ bool wxXmlResource::IsArchive(const wxString& filename)
 
 #endif // wxUSE_FILESYSTEM
 
+bool wxXmlResource::LoadFile(const wxFileName& file)
+{
+    return Load(wxFileSystem::FileNameToURL(file));
+}
+
 bool wxXmlResource::Load(const wxString& filemask_)
 {
     wxString filemask = ConvertFileNameToURL(filemask_);