handlers added using AddHandler() last must have the highest priority (patch 1522807)

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

diff --git a/docs/latex/wx/filesys.tex b/docs/latex/wx/filesys.tex
index 5f28f6f0920a58c05170a993a38b45f5d7877933..2d38e300a553a24c45a2c9d8d33ce1f3a8b1613f 100644 (file)
--- a/docs/latex/wx/filesys.tex
+++ b/docs/latex/wx/filesys.tex
@@ -38,8 +38,10 @@ Constructor.
 
 \func{static void}{AddHandler}{\param{wxFileSystemHandler }{*handler}}
 
-This static function adds new handler into the list of handlers.
-The \helpref{handlers}{wxfilesystemhandler} provide access to virtual FS.
+This static function adds new handler into the list of 
+\helpref{handlers}{wxfilesystemhandler} which provide access to virtual FS.
+Note that if two handlers for the same protocol are added, the last one added
+takes precedence.
 
 \wxheading{Note}
 

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 5e99f9787a01d6c3a926876059f13a4bff1fe2cd..44e265776bcd8bd534c700ef530ca31261b342ca 100644 (file)
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -482,7 +482,9 @@ bool wxFileSystem::FindFileInPath(wxString *pStr,
 
 void wxFileSystem::AddHandler(wxFileSystemHandler *handler)
 {
-    m_Handlers.Append(handler);
+    // prepend the handler to the beginning of the list because handlers added
+    // last should have the highest priority to allow overriding them
+    m_Handlers.Insert(0u, handler);
 }
 
 bool wxFileSystem::HasHandlerForPath(const wxString &location)