Changes corresponding to patch #841324 from Ian Brown:

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

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index b0f1c67a4c7182db86d53de35c5782fc228282ab..f8b2a9fa2a23fdbff64eebedd031466ae7bce9cd 100644 (file)
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -3,29 +3,30 @@
 // 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

+// CVS-ID:      $Id$

 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma implementation "filesys.h"

 #endif
 
 #include "wx/wxprec.h"
 
 #endif
 
 #include "wx/wxprec.h"
 

-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__

 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#if !wxUSE_SOCKETS
-    #undef wxUSE_FS_INET
-    #define wxUSE_FS_INET 0
-#endif

 
 

-#if (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+#if wxUSE_FILESYSTEM

 
 #include "wx/wfstream.h"
 #include "wx/module.h"
 #include "wx/filesys.h"
 
 #include "wx/wfstream.h"
 #include "wx/module.h"
 #include "wx/filesys.h"

+#include "wx/mimetype.h"
+#include "wx/filename.h"
+#include "wx/log.h"
+

 
 //--------------------------------------------------------------------------------
 // wxFileSystemHandler
 
 //--------------------------------------------------------------------------------
 // wxFileSystemHandler


@@ -33,78 +34,62 @@
 
 IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
 

-wxMimeTypesManager *wxFileSystemHandler::m_MimeMng = NULL;
-
-void wxFileSystemHandler::CleanUpStatics()
-{
-    if (m_MimeMng) delete m_MimeMng;
-    m_MimeMng = NULL;
-}

 
 

+#if wxUSE_MIMETYPE
+static wxFileTypeInfo *gs_FSMimeFallbacks = NULL;
+#endif

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

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

     wxString loc = GetRightLocation(location);
     char c;
     int l = loc.Length(), l2;
     wxString loc = GetRightLocation(location);
     char c;
     int l = loc.Length(), l2;

-    wxFileType *ft;

 
     l2 = l;
 
     l2 = l;

-    for (int i = l-1; i >= 0; i--) {
+    for (int i = l-1; i >= 0; i--)
+    {

         c = loc[(unsigned int) 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 (m_MimeMng == NULL) {
-        m_MimeMng = new wxMimeTypesManager;
-
-        static const wxFileTypeInfo fallbacks[] =
+        if ( c == wxT('#') )
+            l2 = i + 1;
+        if ( c == wxT('.') )

         {
         {

-            wxFileTypeInfo("image/jpeg",
-                           "",
-                           "",
-                           "JPEG image (from fallback)",
-                           "jpg", "jpeg", NULL),
-            wxFileTypeInfo("image/gif",
-                           "",
-                           "",
-                           "GIF image (from fallback)",
-                           "gif", NULL),
-            wxFileTypeInfo("image/png",
-                           "",
-                           "",
-                           "PNG image (from fallback)",
-                           "png", NULL),
-            wxFileTypeInfo("image/bmp",
-                           "",
-                           "",
-                           "windows bitmap image (from fallback)",
-                           "bmp", NULL),
-            wxFileTypeInfo("text/html",
-                           "",
-                           "",
-                           "HTML document (from fallback)",
-                           "htm", "html", NULL),
-
-            // must terminate the table with this!
-            wxFileTypeInfo()
-        };
-
-        m_MimeMng -> AddFallbacks(fallbacks);
+            ext = loc.Right(l2-i-1);
+            break;
+        }
+        if ( (c == wxT('/')) || (c == wxT('\\')) || (c == wxT(':')) )
+            return wxEmptyString;

     }
 
     }
 

-    ft = m_MimeMng -> GetFileTypeFromExtension(ext);
-    if (ft && (ft -> GetMimeType(&mime))) {
-        delete ft; 
-        return mime;
+#if wxUSE_MIMETYPE
+    static bool s_MinimalMimeEnsured = FALSE;
+    if (!s_MinimalMimeEnsured) {
+        wxTheMimeTypesManager->AddFallbacks(gs_FSMimeFallbacks);
+        s_MinimalMimeEnsured = TRUE;

     }
     }

-    else {
-        delete ft;
-        return wxEmptyString;
+
+    wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
+    if ( !ft || !ft -> GetMimeType(&mime) )
+    {
+        mime = 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

 }
 
 
 }
 
 


@@ -142,7 +127,14 @@ wxString wxFileSystemHandler::GetRightLocation(const wxString& location) const
 {
     int i, l = location.Length();
     int l2 = l + 1;
 {
     int i, l = location.Length();
     int l2 = l + 1;

-    for (i = l-1; (i >= 0) && ((location[i] != wxT(':')) || (i == 1) || (location[i-2] == wxT(':'))); i--) {if (location[i] == wxT('#')) 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);
 }


@@ -176,15 +168,8 @@ wxString wxFileSystemHandler::FindNext()
 // wxLocalFSHandler
 //--------------------------------------------------------------------------------
 
 // wxLocalFSHandler
 //--------------------------------------------------------------------------------
 

-class wxLocalFSHandler : public wxFileSystemHandler
-{
-    public:
-        virtual bool CanOpen(const wxString& location);
-        virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
-        virtual wxString FindFirst(const wxString& spec, int flags = 0);
-        virtual wxString FindNext();
-};

 
 

+wxString wxLocalFSHandler::ms_root;

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


@@ -193,19 +178,37 @@ bool wxLocalFSHandler::CanOpen(const wxString& location)
 
 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 (wxFSFile*) 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)
 {
 }
 
 wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags)
 {

-    wxString right = GetRightLocation(spec);
-    return wxFindFirstFile(right, flags);
+    wxFileName fn = wxFileSystem::URLToFileName(GetRightLocation(spec));
+    return wxFindFirstFile(ms_root + fn.GetFullPath(), flags);

 }
 
 wxString wxLocalFSHandler::FindNext()
 }
 
 wxString wxLocalFSHandler::FindNext()


@@ -220,39 +223,77 @@ wxString wxLocalFSHandler::FindNext()
 //-----------------------------------------------------------------------------
 
 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[(unsigned int) i] == wxT('\\')) m_Path.GetWritableChar(i) = wxT('/');         // wanna be windows-safe
+    m_Path = MakeCorrectPath(location);

 
     if (is_dir)
     {
         if (m_Path.Length() > 0 && m_Path.Last() != wxT('/') && m_Path.Last() != wxT(':'))
 
     if (is_dir)
     {
         if (m_Path.Length() > 0 && m_Path.Last() != wxT('/') && m_Path.Last() != wxT(':'))

-               m_Path << wxT('/');
+            m_Path << wxT('/');

     }
     }

-    
+

     else
     {
         for (i = m_Path.Length()-1; i >= 0; i--)
     else
     {
         for (i = m_Path.Length()-1; i >= 0; i--)

-       {
+        {

             if (m_Path[(unsigned int) i] == wxT('/'))
             if (m_Path[(unsigned int) i] == wxT('/'))

-               {
+            {

                 if ((i > 1) && (m_Path[(unsigned int) (i-1)] == wxT('/')) && (m_Path[(unsigned int) (i-2)] == wxT(':')))
                 if ((i > 1) && (m_Path[(unsigned int) (i-1)] == wxT('/')) && (m_Path[(unsigned int) (i-2)] == wxT(':')))

-                       {
+                {

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

-                       {
+                {

                     pathpos = i;
                     break;
                 }
                     pathpos = i;
                     break;
                 }


@@ -263,20 +304,20 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
             }
         }
         if (pathpos == -1)
             }
         }
         if (pathpos == -1)

-       {
+        {

             for (i = 0; i < (int) m_Path.Length(); i++)
             for (i = 0; i < (int) m_Path.Length(); i++)

-           {
+            {

                 if (m_Path[(unsigned int) i] == wxT(':'))
                 if (m_Path[(unsigned int) i] == wxT(':'))

-                       {
+                {

                     m_Path.Remove(i+1);
                     break;
                 }
             }
             if (i == (int) m_Path.Length())
                     m_Path.Remove(i+1);
                     break;
                 }
             }
             if (i == (int) m_Path.Length())

-               m_Path = wxEmptyString;
+                m_Path = wxEmptyString;

         }
         else
         }
         else

-       {
+        {

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


@@ -286,22 +327,23 @@ 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;
+    wxString loc = MakeCorrectPath(location);
+    unsigned i, ln;

     char meta;
     wxFSFile *s = NULL;
     char meta;
     wxFSFile *s = NULL;

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

 
     ln = loc.Length();
     meta = 0;
     for (i = 0; i < ln; i++)
     {
 
     ln = loc.Length();
     meta = 0;
     for (i = 0; i < ln; i++)
     {

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

     }
     m_LastName = wxEmptyString;
 
     }
     m_LastName = wxEmptyString;
 


@@ -310,12 +352,12 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
     {
         node = m_Handlers.GetFirst();
         while (node)
     {
         node = m_Handlers.GetFirst();
         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();
         }


@@ -326,12 +368,12 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
     {
         node = m_Handlers.GetFirst();
         while (node)
     {
         node = m_Handlers.GetFirst();
         while (node)

-       {
+        {

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

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

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


@@ -343,22 +385,22 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
 
 wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
 {
 
 wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
 {

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

     wxString spec2(spec);
     wxString spec2(spec);

-    
+

     m_FindFileHandler = NULL;
 
     for (int i = spec2.Length()-1; i >= 0; i--)
     m_FindFileHandler = NULL;
 
     for (int i = spec2.Length()-1; i >= 0; i--)

-        if (spec2[(unsigned int) i] == wxT('\\')) spec2.GetWritableChar(i) = wxT('/'); // wanna be windows-safe
+        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();
 
     node = m_Handlers.GetFirst();
     while (node)
     {
         m_FindFileHandler = (wxFileSystemHandler*) node -> GetData();

-        if (m_FindFileHandler -> CanOpen(m_Path + spec2)) 
+        if (m_FindFileHandler -> CanOpen(m_Path + spec2))

             return m_FindFileHandler -> FindFirst(m_Path + spec2, flags);
         node = node->GetNext();
             return m_FindFileHandler -> FindFirst(m_Path + spec2, flags);
         node = node->GetNext();

-    } 
+    }

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


@@ -367,9 +409,9 @@ wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
         if (m_FindFileHandler -> CanOpen(spec2))
             return m_FindFileHandler -> FindFirst(spec2, flags);
         node = node->GetNext();
         if (m_FindFileHandler -> CanOpen(spec2))
             return m_FindFileHandler -> FindFirst(spec2, flags);
         node = node->GetNext();

-    } 
-    
-    return wxEmptyString;   
+    }
+
+    return wxEmptyString;

 }
 
 
 }
 
 


@@ -390,11 +432,84 @@ void wxFileSystem::AddHandler(wxFileSystemHandler *handler)
 
 void wxFileSystem::CleanUpHandlers()
 {
 
 void wxFileSystem::CleanUpHandlers()
 {

-    m_Handlers.DeleteContents(TRUE);
-    m_Handlers.Clear();
+    WX_CLEAR_LIST(wxList, m_Handlers);
+}
+
+const static wxString g_unixPathString(wxT("/"));
+const static 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 = 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:


@@ -407,19 +522,58 @@ class wxFileSystemModule : public wxModule
         virtual bool OnInit()
         {
             wxFileSystem::AddHandler(new wxLocalFSHandler);
         virtual bool OnInit()
         {
             wxFileSystem::AddHandler(new wxLocalFSHandler);

+
+        #if wxUSE_MIMETYPE
+            gs_FSMimeFallbacks = new wxFileTypeInfo[6];
+            gs_FSMimeFallbacks[0] =
+            wxFileTypeInfo(_T("image/jpeg"),
+                           _T(""),
+                           _T(""),
+                           _T("JPEG image (from fallback)"),
+                           _T("jpg"), _T("jpeg"), _T("JPG"), _T("JPEG"), NULL);
+            gs_FSMimeFallbacks[1] =
+            wxFileTypeInfo(_T("image/gif"),
+                           _T(""),
+                           _T(""),
+                           _T("GIF image (from fallback)"),
+                           _T("gif"), _T("GIF"), NULL);
+            gs_FSMimeFallbacks[2] =
+            wxFileTypeInfo(_T("image/png"),
+                           _T(""),
+                           _T(""),
+                           _T("PNG image (from fallback)"),
+                           _T("png"), _T("PNG"), NULL);
+            gs_FSMimeFallbacks[3] =
+            wxFileTypeInfo(_T("image/bmp"),
+                           _T(""),
+                           _T(""),
+                           _T("windows bitmap image (from fallback)"),
+                           _T("bmp"), _T("BMP"), NULL);
+            gs_FSMimeFallbacks[4] =
+            wxFileTypeInfo(_T("text/html"),
+                           _T(""),
+                           _T(""),
+                           _T("HTML document (from fallback)"),
+                           _T("htm"), _T("html"), _T("HTM"), _T("HTML"), NULL);
+            gs_FSMimeFallbacks[5] =
+            // must terminate the table with this!
+            wxFileTypeInfo();
+        #endif

             return TRUE;
         }
         virtual void OnExit()
             return TRUE;
         }
         virtual void OnExit()

-       {
-           wxFileSystemHandler::CleanUpStatics();
+        {
+        #if wxUSE_MIMETYPE
+            delete [] gs_FSMimeFallbacks;
+        #endif

             wxFileSystem::CleanUpHandlers();
             wxFileSystem::CleanUpHandlers();

-       }
+        }

 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)
 
 #endif
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)
 
 #endif

-  // (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+  // wxUSE_FILESYSTEM