wxDialUpManager fixes

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

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 38b29efa3c5020bdc3c2a0d0fab101356a1342ee..e166f1b2bf235c440141c38df54a66ea3f03a6eb 100644 (file)
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -17,9 +17,7 @@
 #endif
 
 #if !wxUSE_SOCKETS
 #endif
 
 #if !wxUSE_SOCKETS

-    #undef wxUSE_FS_ZIP

     #undef wxUSE_FS_INET
     #undef wxUSE_FS_INET

-    #define wxUSE_FS_ZIP 0

     #define wxUSE_FS_INET 0
 #endif
 
     #define wxUSE_FS_INET 0
 #endif
 


@@ -35,7 +33,13 @@
 
 IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
 

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

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


@@ -48,12 +52,51 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 
     l2 = l;
     for (int i = l-1; i >= 0; i--) {
 
     l2 = l;
     for (int i = l-1; i >= 0; i--) {

-        c = loc[i];
+        c = loc[(unsigned int) i];

         if (c == _T('#')) l2 = i + 1;
         if (c == _T('.')) {ext = loc.Right(l2-i-1); break;}
         if ((c == _T('/')) || (c == _T('\\')) || (c == _T(':'))) {return wxEmptyString;}
     }
         if (c == _T('#')) l2 = i + 1;
         if (c == _T('.')) {ext = loc.Right(l2-i-1); break;}
         if ((c == _T('/')) || (c == _T('\\')) || (c == _T(':'))) {return wxEmptyString;}
     }

-    ft = m_MimeMng.GetFileTypeFromExtension(ext);
+
+    if (m_MimeMng == NULL) {
+        m_MimeMng = new wxMimeTypesManager;
+
+        static const wxFileTypeInfo fallbacks[] =
+        {
+            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);
+    }
+
+    ft = m_MimeMng -> GetFileTypeFromExtension(ext);

     if (ft && (ft -> GetMimeType(&mime))) return mime;
     else return wxEmptyString;
 }
     if (ft && (ft -> GetMimeType(&mime))) return mime;
     else return wxEmptyString;
 }


@@ -156,47 +199,47 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
     m_Path = location;
 
     for (i = m_Path.Length()-1; i >= 0; i--)
     m_Path = location;
 
     for (i = m_Path.Length()-1; i >= 0; i--)

-        if (m_Path[i] == _T('\\')) m_Path.GetWritableChar(i) = _T('/');         // wanna be windows-safe
+        if (m_Path[(unsigned int) i] == _T('\\')) m_Path.GetWritableChar(i) = _T('/');         // wanna be windows-safe

 
 

-    if (is_dir == FALSE) 
+    if (is_dir == FALSE)

     {
     {

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

        {
        {

-            if (m_Path[i] == _T('/')) 
+            if (m_Path[(unsigned int) i] == _T('/'))

            {
            {

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

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

-                else 
+                else

                {
                {

-                    pathpos = i; 
+                    pathpos = i;

                     break;
                 }
             }
                     break;
                 }
             }

-        else if (m_Path[i] == _T(':')) {
+        else if (m_Path[(unsigned int) i] == _T(':')) {

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

-        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[i] == _T(':')) 
+                if (m_Path[(unsigned int) i] == _T(':'))

                {
                     //m_Path << _T('/');
                     m_Path.Remove(i+1);
                     break;
                 }
             }
                {
                     //m_Path << _T('/');
                     m_Path.Remove(i+1);
                     break;
                 }
             }

-            if (i == (int) m_Path.Length()) 
+            if (i == (int) m_Path.Length())

                m_Path = wxEmptyString;
         }
                m_Path = wxEmptyString;
         }

-        else 
+        else

        {
        {

-            if (m_Path[m_Path.Length()-1] != _T('/')) 
+            if (m_Path[m_Path.Length()-1] != _T('/'))

                m_Path << _T('/');
             m_Path.Remove(pathpos+1);
         }
                m_Path << _T('/');
             m_Path.Remove(pathpos+1);
         }


@@ -215,24 +258,24 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
 
     ln = loc.Length();
     meta = 0;
 
     ln = loc.Length();
     meta = 0;

-    for (i = 0; i < ln; i++) 
+    for (i = 0; i < ln; i++)

     {
     {

-        if (loc[i] == _T('\\')) loc.GetWritableChar(i) = _T('/');         // wanna be windows-safe
-        if (!meta) switch (loc[i]) 
+        if (loc[(unsigned int) i] == _T('\\')) loc.GetWritableChar(i) = _T('/');         // wanna be windows-safe
+        if (!meta) switch (loc[(unsigned int) i])

        {
        {

-            case _T('/') : case _T(':') : case _T('#') : meta = loc[i];
+            case _T('/') : case _T(':') : case _T('#') : meta = loc[(unsigned int) i];

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

-    if (meta != _T(':')) 
+    if (meta != _T(':'))

     {
         node = m_Handlers.GetFirst();
         while (node)
        {
             wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();
     {
         node = m_Handlers.GetFirst();
         while (node)
        {
             wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();

-            if (h->CanOpen(m_Path + location)) 
+            if (h->CanOpen(m_Path + location))

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


@@ -242,13 +285,13 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
     }
 
     // if failed, try absolute paths :
     }
 
     // if failed, try absolute paths :

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

     {
         node = m_Handlers.GetFirst();
         while (node)
        {
             wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData();
     {
         node = m_Handlers.GetFirst();
         while (node)
        {
             wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData();

-            if (h->CanOpen(location)) 
+            if (h->CanOpen(location))

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


@@ -266,6 +309,12 @@ void wxFileSystem::AddHandler(wxFileSystemHandler *handler)
 }
 
 
 }
 
 

+void wxFileSystem::CleanUpHandlers()
+{
+    m_Handlers.DeleteContents(TRUE);
+    m_Handlers.Clear();
+}
+

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


@@ -279,11 +328,17 @@ class wxFileSystemModule : public wxModule
             wxFileSystem::AddHandler(new wxLocalFSHandler);
             return TRUE;
         }
             wxFileSystem::AddHandler(new wxLocalFSHandler);
             return TRUE;
         }

-        virtual void OnExit() {}
+        virtual void OnExit()
+       {
+           wxFileSystemHandler::CleanUpStatics();
+            wxFileSystem::CleanUpHandlers();
+       }

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

-#endif 
+#endif

   // (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
 
   // (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
 

+
+