Minor cleanup.

[wxWidgets.git] / src / common / filesys.cpp

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 6adf75e2df0fff527fd589bec893433e0ef304af..2d44cf8c5fc5028037469240f4346b75b17d377a 100644 (file)
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -1,32 +1,32 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        filesys.cpp
+// Name:        src/common/filesys.cpp

 // Purpose:     wxFileSystem class - interface for opening files
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // Purpose:     wxFileSystem class - interface for opening files
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik

-// Licence:     wxWindows Licence
+// CVS-ID:      $Id$
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop

 #endif
 
 #endif
 

-#include <wx/wxprec.h>

 
 

-#ifdef __BORDLANDC__
-#pragma hdrstop
-#endif
+#if wxUSE_FILESYSTEM

 
 

-#if wxUSE_FS_INET || wxUSE_FS_ZIP
+#include "wx/filesys.h"

 
 

-#ifndef WXPRECOMP
-#include <wx/wx.h>
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include <wx/wfstream.h>
-#include <wx/url.h>
-#include <wx/module.h>
-#include <wx/filesys.h>
-
+#include "wx/wfstream.h"
+#include "wx/mimetype.h"
+#include "wx/filename.h"
+#include "wx/tokenzr.h"

 
 
 //--------------------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------------------


@@ -35,27 +35,89 @@
 
 IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
 

-wxMimeTypesManager wxFileSystemHandler::m_MimeMng;
-

 
 wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 {
 
 wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 {

-    wxString ext = wxEmptyString, mime = wxEmptyString;
+    wxString ext, mime;

     wxString loc = GetRightLocation(location);
     wxString loc = GetRightLocation(location);

-    char c;
-    int l = loc.Length(), l2;
-    wxFileType *ft;
+    wxChar c;
+    int l = loc.length(), l2;

 
     l2 = l;
 
     l2 = l;

-    for (int i = l-1; i >= 0; i--) {
-        c = loc[i];
-        if (c == '#') l2 = i + 1;
-        if (c == '.') {ext = loc.Right(l2-i-1); break;}
-        if ((c == '/') || (c == '\\') || (c == ':')) {return wxEmptyString;}
+    for (int i = l-1; i >= 0; i--)
+    {
+        c = loc[(unsigned int) i];
+        if ( c == wxT('#') )
+            l2 = i + 1;
+        if ( c == wxT('.') )
+        {
+            ext = loc.Right(l2-i-1);
+            break;
+        }
+        if ( (c == wxT('/')) || (c == wxT('\\')) || (c == wxT(':')) )
+            return wxEmptyString;
+    }
+
+#if wxUSE_MIMETYPE
+    static bool s_MinimalMimeEnsured = false;
+    if (!s_MinimalMimeEnsured)
+    {
+        static const wxFileTypeInfo fallbacks[] =
+        {
+            wxFileTypeInfo(_T("image/jpeg"),
+                           wxEmptyString,
+                           wxEmptyString,
+                           _T("JPEG image (from fallback)"),
+                           _T("jpg"), _T("jpeg"), _T("JPG"), _T("JPEG"), NULL),
+            wxFileTypeInfo(_T("image/gif"),
+                           wxEmptyString,
+                           wxEmptyString,
+                           _T("GIF image (from fallback)"),
+                           _T("gif"), _T("GIF"), NULL),
+            wxFileTypeInfo(_T("image/png"),
+                           wxEmptyString,
+                           wxEmptyString,
+                           _T("PNG image (from fallback)"),
+                           _T("png"), _T("PNG"), NULL),
+            wxFileTypeInfo(_T("image/bmp"),
+                           wxEmptyString,
+                           wxEmptyString,
+                           _T("windows bitmap image (from fallback)"),
+                           _T("bmp"), _T("BMP"), NULL),
+            wxFileTypeInfo(_T("text/html"),
+                           wxEmptyString,
+                           wxEmptyString,
+                           _T("HTML document (from fallback)"),
+                           _T("htm"), _T("html"), _T("HTM"), _T("HTML"), NULL),
+            // must terminate the table with this!
+            wxFileTypeInfo()
+        };
+        wxTheMimeTypesManager->AddFallbacks(fallbacks);
+        s_MinimalMimeEnsured = true;
+    }
+
+    wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
+    if ( !ft || !ft -> GetMimeType(&mime) )
+    {
+        mime = wxEmptyString;

     }
     }

-    ft = m_MimeMng.GetFileTypeFromExtension(ext);
-    if (ft && (ft -> GetMimeType(&mime))) return mime;
-    else return wxEmptyString;
+
+    delete ft;
+
+    return mime;
+#else
+    if ( ext.IsSameAs(wxT("htm"), false) || ext.IsSameAs(_T("html"), false) )
+        return wxT("text/html");
+    if ( ext.IsSameAs(wxT("jpg"), false) || ext.IsSameAs(_T("jpeg"), false) )
+        return wxT("image/jpeg");
+    if ( ext.IsSameAs(wxT("gif"), false) )
+        return wxT("image/gif");
+    if ( ext.IsSameAs(wxT("png"), false) )
+        return wxT("image/png");
+    if ( ext.IsSameAs(wxT("bmp"), false) )
+        return wxT("image/bmp");
+    return wxEmptyString;
+#endif

 }
 
 
 }
 
 


@@ -63,96 +125,122 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 wxString wxFileSystemHandler::GetProtocol(const wxString& location) const
 {
     wxString s = wxEmptyString;
 wxString wxFileSystemHandler::GetProtocol(const wxString& location) const
 {
     wxString s = wxEmptyString;

-    int i, l = location.Length();
-    bool fnd;
+    int i, l = location.length();
+    bool fnd = false;

 
 

-    fnd = FALSE;
-    for (i = l-1; (i >= 0) && ((location[i] != '#') || (!fnd)); i--) {
-        if ((location[i] == ':') && (i != 1 /*win: C:\path*/)) fnd = TRUE;
+    for (i = l-1; (i >= 0) && ((location[i] != wxT('#')) || (!fnd)); i--) {
+        if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = true;

     }
     }

-    if (!fnd) return "file";
-    for (++i; (i < l) && (location[i] != ':'); i++) s << location[i];
+    if (!fnd) return wxT("file");
+    for (++i; (i < l) && (location[i] != wxT(':')); i++) s << location[i];

     return s;
 }
 
 
     return s;
 }
 
 

-

 wxString wxFileSystemHandler::GetLeftLocation(const wxString& location) const
 {
     int i;
 wxString wxFileSystemHandler::GetLeftLocation(const wxString& location) const
 {
     int i;

-    bool fnd;
+    bool fnd = false;

 
 

-    fnd = FALSE;
-    for (i = location.Length()-1; i >= 0; i--) {
-        if ((location[i] == ':') && (i != 1 /*win: C:\path*/)) fnd = TRUE;
-        else if (fnd && (location[i] == '#')) return location.Left(i);
+    for (i = location.length()-1; i >= 0; i--) {
+        if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = true;
+        else if (fnd && (location[i] == wxT('#'))) return location.Left(i);

     }
     return wxEmptyString;
 }
 
     }
     return wxEmptyString;
 }
 

-
-

 wxString wxFileSystemHandler::GetRightLocation(const wxString& location) const
 {
 wxString wxFileSystemHandler::GetRightLocation(const wxString& location) const
 {

-    int i, l = location.Length();
+    int i, l = location.length();

     int l2 = l + 1;
     int l2 = l + 1;

-    for (i = l-1; (i >= 0) && ((location[i] != ':') || (i == 1) || (location[i-2] == ':')); i--) {if (location[i] == '#') l2 = i + 1;}
+
+    for (i = l-1;
+         (i >= 0) &&
+         ((location[i] != wxT(':')) || (i == 1) || (location[i-2] == wxT(':')));
+         i--)
+    {
+        if (location[i] == wxT('#')) l2 = i + 1;
+    }

     if (i == 0) return wxEmptyString;
     else return location.Mid(i + 1, l2 - i - 2);
 }
 
     if (i == 0) return wxEmptyString;
     else return location.Mid(i + 1, l2 - i - 2);
 }
 

-
-

 wxString wxFileSystemHandler::GetAnchor(const wxString& location) const
 {
 wxString wxFileSystemHandler::GetAnchor(const wxString& location) const
 {

-    char c;
-    int l = location.Length();
+    wxChar c;
+    int l = location.length();

 
     for (int i = l-1; i >= 0; i--) {
         c = location[i];
 
     for (int i = l-1; i >= 0; i--) {
         c = location[i];

-        if (c == '#') return location.Right(l-i-1);
-        else if ((c == '.') || (c == '/') || (c == '\\') || (c == ':')) return wxEmptyString;
+        if (c == wxT('#')) return location.Right(l-i-1);
+        else if ((c == wxT('.')) || (c == wxT('/')) || (c == wxT('\\')) || (c == wxT(':'))) return wxEmptyString;

     }
     return wxEmptyString;
 }
 
 
     }
     return wxEmptyString;
 }
 
 

+wxString wxFileSystemHandler::FindFirst(const wxString& WXUNUSED(spec),
+                                        int WXUNUSED(flags))
+{
+    return wxEmptyString;
+}

 
 

-
+wxString wxFileSystemHandler::FindNext()
+{
+    return wxEmptyString;
+}

 
 //--------------------------------------------------------------------------------
 // wxLocalFSHandler
 //--------------------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------------------
 // wxLocalFSHandler
 //--------------------------------------------------------------------------------
 

-class wxLocalFSHandler : public wxFileSystemHandler
-{
-    public:
-        virtual bool CanOpen(const wxString& location);
-        virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
-};
-

 
 

+wxString wxLocalFSHandler::ms_root;

 
 bool wxLocalFSHandler::CanOpen(const wxString& location)
 {
 
 bool wxLocalFSHandler::CanOpen(const wxString& location)
 {

-    return GetProtocol(location) == "file";
+    return GetProtocol(location) == wxT("file");

 }
 
 }
 

-
-

 wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
 {
 wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
 {

+    // location has Unix path separators

     wxString right = GetRightLocation(location);
     wxString right = GetRightLocation(location);

-    if (wxFileExists(right))
-        return new wxFSFile(new wxFileInputStream(right),
-                            right,
-                            GetMimeTypeFromExt(location),
-                            GetAnchor(location));
-    else return NULL;
-}
+    wxFileName fn = wxFileSystem::URLToFileName(right);
+    wxString fullpath = ms_root + fn.GetFullPath();
+
+    if (!wxFileExists(fullpath))
+        return (wxFSFile*) NULL;
+
+    // we need to check whether we can really read from this file, otherwise
+    // wxFSFile is not going to work
+    wxFFileInputStream *is = new wxFFileInputStream(fullpath);
+    if ( !is->Ok() )
+    {
+        delete is;
+        return (wxFSFile*) NULL;
+    }

 
 

+    return new wxFSFile(is,
+                        right,
+                        GetMimeTypeFromExt(location),
+                        GetAnchor(location)
+#if wxUSE_DATETIME
+                        ,wxDateTime(wxFileModificationTime(fullpath))
+#endif // wxUSE_DATETIME
+                        );
+}

 
 

+wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags)
+{
+    wxFileName fn = wxFileSystem::URLToFileName(GetRightLocation(spec));
+    return wxFindFirstFile(ms_root + fn.GetFullPath(), flags);
+}

 
 

+wxString wxLocalFSHandler::FindNext()
+{
+    return wxFindNextFile();
+}

 
 
 
 
 
 


@@ -161,49 +249,101 @@ wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString&
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystem, wxObject)
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystem, wxObject)

+IMPLEMENT_ABSTRACT_CLASS(wxFSFile, wxObject)

 
 
 wxList wxFileSystem::m_Handlers;
 
 
 
 
 wxList wxFileSystem::m_Handlers;
 
 

+static wxString MakeCorrectPath(const wxString& path)
+{
+    wxString p(path);
+    wxString r;
+    int i, j, cnt;
+
+    cnt = p.length();
+    for (i = 0; i < cnt; i++)
+      if (p.GetChar(i) == wxT('\\')) p.GetWritableChar(i) = wxT('/'); // Want to be windows-safe
+
+    if (p.Left(2) == wxT("./")) { p = p.Mid(2); cnt -= 2; }
+
+    if (cnt < 3) return p;
+
+    r << p.GetChar(0) << p.GetChar(1);
+
+    // skip trailing ../.., if any
+    for (i = 2; i < cnt && (p.GetChar(i) == wxT('/') || p.GetChar(i) == wxT('.')); i++) r << p.GetChar(i);
+
+    // remove back references: translate dir1/../dir2 to dir2
+    for (; i < cnt; i++)
+    {
+        r << p.GetChar(i);
+        if (p.GetChar(i) == wxT('/') && p.GetChar(i-1) == wxT('.') && p.GetChar(i-2) == wxT('.'))
+        {
+            for (j = r.length() - 2; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {}
+            if (j >= 0 && r.GetChar(j) != wxT(':'))
+            {
+                for (j = j - 1; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {}
+                r.Remove(j + 1);
+            }
+        }
+    }
+
+    for (; i < cnt; i++) r << p.GetChar(i);
+
+    return r;
+}
+

 
 void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
 {
     int i, pathpos = -1;
 
 void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
 {
     int i, pathpos = -1;

-    m_Path = location;

 
 

-    for (i = m_Path.Length()-1; i >= 0; i--)
-        if (m_Path[i] == '\\') m_Path.GetWritableChar(i) = '/';         // wanna be windows-safe
+    m_Path = MakeCorrectPath(location);
+
+    if (is_dir)
+    {
+        if (m_Path.length() > 0 && m_Path.Last() != wxT('/') && m_Path.Last() != wxT(':'))
+            m_Path << wxT('/');
+    }

 
 

-    if (is_dir == FALSE) {
-        for (i = m_Path.Length()-1; i >= 0; i--) {
-            if (m_Path[i] == '/') {
-                if ((i > 1) && (m_Path[i-1] == '/') && (m_Path[i-2] == ':')) {
+    else
+    {
+        for (i = m_Path.length()-1; i >= 0; i--)
+        {
+            if (m_Path[(unsigned int) i] == wxT('/'))
+            {
+                if ((i > 1) && (m_Path[(unsigned int) (i-1)] == wxT('/')) && (m_Path[(unsigned int) (i-2)] == wxT(':')))
+                {

                     i -= 2;
                     continue;
                 }
                     i -= 2;
                     continue;
                 }

-                else {
-                    pathpos = i; 
+                else
+                {
+                    pathpos = i;

                     break;
                 }
             }
                     break;
                 }
             }

-        else if (m_Path[i] == ':') {
-            pathpos = i;
-        break;
+            else if (m_Path[(unsigned int) i] == wxT(':')) {
+                pathpos = i;
+                break;
+            }

         }
         }

-    }
-        if (pathpos == -1) {
-            for (i = 0; i < (int) m_Path.Length(); i++) {
-                if (m_Path[i] == ':') {
-                    //m_Path << '/';
+        if (pathpos == -1)
+        {
+            for (i = 0; i < (int) m_Path.length(); i++)
+            {
+                if (m_Path[(unsigned int) i] == wxT(':'))
+                {

                     m_Path.Remove(i+1);
                     break;
                 }
             }
                     m_Path.Remove(i+1);
                     break;
                 }
             }

-            if (i == (int) m_Path.Length()) m_Path = wxEmptyString;
+            if (i == (int) m_Path.length())
+                m_Path = wxEmptyString;

         }
         }

-        else {
-            if (m_Path[m_Path.Length()-1] != '/') m_Path << '/';
+        else
+        {

             m_Path.Remove(pathpos+1);
         }
     }
             m_Path.Remove(pathpos+1);
         }
     }


@@ -213,45 +353,55 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
 
 wxFSFile* wxFileSystem::OpenFile(const wxString& location)
 {
 
 wxFSFile* wxFileSystem::OpenFile(const wxString& location)
 {

-    wxString loc = location;
-    int i, ln;
-    char meta;
+    wxString loc = MakeCorrectPath(location);
+    unsigned i, ln;
+    wxChar meta;

     wxFSFile *s = NULL;
     wxFSFile *s = NULL;

-    wxNode *node;
+    wxList::compatibility_iterator node;

 
 

-    ln = loc.Length();
+    ln = loc.length();

     meta = 0;
     meta = 0;

-    for (i = 0; i < ln; i++) {
-        if (loc[i] == '\\') loc.GetWritableChar(i) = '/';         // wanna be windows-safe
-        if (!meta) switch (loc[i]) {
-            case '/' : case ':' : case '#' : meta = loc[i];
+    for (i = 0; i < ln; i++)
+    {
+        switch (loc[i])
+        {
+            case wxT('/') : case wxT(':') : case wxT('#') :
+                meta = loc[i];
+                break;

         }
         }

+        if (meta != 0) break;

     }
     m_LastName = wxEmptyString;
 
     // try relative paths first :
     }
     m_LastName = wxEmptyString;
 
     // try relative paths first :

-    if (meta != ':') {
+    if (meta != wxT(':'))
+    {

         node = m_Handlers.GetFirst();
         node = m_Handlers.GetFirst();

-        while (node){
+        while (node)
+        {

             wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();
             wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();

-            if (h -> CanOpen(m_Path + location)) {
-                s = h -> OpenFile(*this, m_Path + location);
-                if (s) {m_LastName = m_Path + location; break;}
+            if (h->CanOpen(m_Path + loc))
+            {
+                s = h->OpenFile(*this, m_Path + loc);
+                if (s) { m_LastName = m_Path + loc; break; }

             }
             }

-            node = node -> GetNext();
+            node = node->GetNext();

         }
     }
 
     // if failed, try absolute paths :
         }
     }
 
     // if failed, try absolute paths :

-    if (s == NULL) {
+    if (s == NULL)
+    {

         node = m_Handlers.GetFirst();
         node = m_Handlers.GetFirst();

-        while (node){
-            wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();
-            if (h -> CanOpen(location)) {
-                s = h -> OpenFile(*this, location);
-                if (s) {m_LastName = location; break; }
+        while (node)
+        {
+            wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData();
+            if (h->CanOpen(loc))
+            {
+                s = h->OpenFile(*this, loc);
+                if (s) { m_LastName = loc; break; }

             }
             }

-            node = node -> GetNext();
+            node = node->GetNext();

         }
     }
     return (s);
         }
     }
     return (s);


@@ -259,19 +409,191 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
 
 
 
 
 
 

+wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
+{
+    wxList::compatibility_iterator node;
+    wxString spec2(spec);
+
+    m_FindFileHandler = NULL;
+
+    for (int i = spec2.length()-1; i >= 0; i--)
+        if (spec2[(unsigned int) i] == wxT('\\')) spec2.GetWritableChar(i) = wxT('/'); // Want to be windows-safe
+
+    node = m_Handlers.GetFirst();
+    while (node)
+    {
+        m_FindFileHandler = (wxFileSystemHandler*) node -> GetData();
+        if (m_FindFileHandler -> CanOpen(m_Path + spec2))
+            return m_FindFileHandler -> FindFirst(m_Path + spec2, flags);
+        node = node->GetNext();
+    }
+
+    node = m_Handlers.GetFirst();
+    while (node)
+    {
+        m_FindFileHandler = (wxFileSystemHandler*) node -> GetData();
+        if (m_FindFileHandler -> CanOpen(spec2))
+            return m_FindFileHandler -> FindFirst(spec2, flags);
+        node = node->GetNext();
+    }
+
+    return wxEmptyString;
+}
+
+
+
+wxString wxFileSystem::FindNext()
+{
+    if (m_FindFileHandler == NULL) return wxEmptyString;
+    else return m_FindFileHandler -> FindNext();
+}
+
+bool wxFileSystem::FindFileInPath(wxString *pStr,
+                                  const wxChar *path,
+                                  const wxChar *basename)
+{
+    // we assume that it's not empty
+    wxCHECK_MSG( !wxIsEmpty(basename), false,
+                _T("empty file name in wxFileSystem::FindFileInPath"));
+
+    // skip path separator in the beginning of the file name if present
+    if ( wxIsPathSeparator(*basename) )
+       basename++;
+
+    wxStringTokenizer tokenizer(path, wxPATH_SEP);
+    while ( tokenizer.HasMoreTokens() )
+    {
+        wxString strFile = tokenizer.GetNextToken();
+        if ( !wxEndsWithPathSeparator(strFile) )
+            strFile += wxFILE_SEP_PATH;
+        strFile += basename;
+
+        wxFSFile *file = OpenFile(strFile);
+        if ( file )
+        {
+            delete file;
+            *pStr = strFile;
+            return true;
+        }
+    }
+
+    return false;
+}
+

 void wxFileSystem::AddHandler(wxFileSystemHandler *handler)
 {
 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((size_t)0, handler);
+}
+
+wxFileSystemHandler* wxFileSystem::RemoveHandler(wxFileSystemHandler *handler)
+{
+    // if handler has already been removed (or deleted)
+    // we return NULL. This is by design in case
+    // CleanUpHandlers() is called before RemoveHandler
+    // is called, as we cannot control the order
+    // which modules are unloaded
+    if (!m_Handlers.DeleteObject(handler))
+        return NULL;
+
+    return handler;
+}
+
+
+bool wxFileSystem::HasHandlerForPath(const wxString &location)
+{
+    for ( wxList::compatibility_iterator node = m_Handlers.GetFirst();
+           node; node = node->GetNext() )
+    {
+        wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData();
+        if (h->CanOpen(location))
+            return true;
+    }
+
+    return false;
+}
+
+void wxFileSystem::CleanUpHandlers()
+{
+    WX_CLEAR_LIST(wxList, m_Handlers);

 }
 
 }
 

+static const wxString g_unixPathString(wxT("/"));
+static const wxString g_nativePathString(wxFILE_SEP_PATH);
+
+// Returns the native path for a file URL
+wxFileName wxFileSystem::URLToFileName(const wxString& url)
+{
+    wxString path = url;

 
 

+    if ( path.Find(wxT("file://")) == 0 )
+    {
+        path = path.Mid(7);
+    }
+    else if ( path.Find(wxT("file:")) == 0 )
+    {
+        path = path.Mid(5);
+    }
+    // Remove preceding double slash on Mac Classic
+#if defined(__WXMAC__) && !defined(__UNIX__)
+    else if ( path.Find(wxT("//")) == 0 )
+        path = path.Mid(2);
+#endif

 
 

+    path.Replace(wxT("%25"), wxT("%"));
+    path.Replace(wxT("%3A"), wxT(":"));

 
 

+#ifdef __WXMSW__
+    // file urls either start with a forward slash (local harddisk),
+    // otherwise they have a servername/sharename notation,
+    // which only exists on msw and corresponds to a unc
+    if ( path[0u] == wxT('/') && path [1u] != wxT('/'))
+    {
+        path = path.Mid(1);
+    }
+    else if ( (url.Find(wxT("file://")) == 0) &&
+              (path.Find(wxT('/')) != wxNOT_FOUND) &&
+              (path.length() > 1) && (path[1u] != wxT(':')) )
+    {
+        path = wxT("//") + path;
+    }
+#endif

 
 

+    path.Replace(g_unixPathString, g_nativePathString);

 
 

+    return wxFileName(path, wxPATH_NATIVE);
+}

 
 

+// Returns the file URL for a native path
+wxString wxFileSystem::FileNameToURL(const wxFileName& filename)
+{
+    wxFileName fn = filename;
+    fn.Normalize(wxPATH_NORM_DOTS | wxPATH_NORM_TILDE | wxPATH_NORM_ABSOLUTE);
+    wxString url = fn.GetFullPath(wxPATH_NATIVE);
+
+#ifndef __UNIX__
+    // unc notation, wxMSW
+    if ( url.Find(wxT("\\\\")) == 0 )
+    {
+        url = wxT("//") + url.Mid(2);
+    }
+    else
+    {
+        url = wxT("/") + url;
+#ifdef __WXMAC__
+        url = wxT("/") + url;
+#endif

 
 

+    }
+#endif

 
 

+    url.Replace(g_nativePathString, g_unixPathString);
+    url.Replace(wxT("%"), wxT("%25"));
+    url.Replace(wxT(":"), wxT("%3A"));
+    url = wxT("file:") + url;
+    return url;
+}

 
 
 ///// Module:
 
 
 ///// Module:


@@ -281,17 +603,31 @@ class wxFileSystemModule : public wxModule
     DECLARE_DYNAMIC_CLASS(wxFileSystemModule)
 
     public:
     DECLARE_DYNAMIC_CLASS(wxFileSystemModule)
 
     public:

+        wxFileSystemModule() :
+            wxModule(),
+            m_handler(NULL)
+        {
+        }
+

         virtual bool OnInit()
         {
         virtual bool OnInit()
         {

-            wxFileSystem::AddHandler(new wxLocalFSHandler);
-            return TRUE;
+            m_handler = new wxLocalFSHandler;
+            wxFileSystem::AddHandler(m_handler);
+            return true;

         }
         }

-        virtual void OnExit() {}
-};
+        virtual void OnExit()
+        {
+            delete wxFileSystem::RemoveHandler(m_handler);

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)
+            wxFileSystem::CleanUpHandlers();
+        }

 
 

+    private:
+        wxFileSystemHandler* m_handler;

 
 

+};

 
 

-#endif // wxUSE_FS_INET || wxUSE_FS_ZIP
+IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)

 
 

+#endif
+  // wxUSE_FILESYSTEM