New colour, font, theme and size code..

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

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 24e5687e6dd7951ceff86d16f86d5a94d4ac7073..e7b83b9b21fa5d4eb833b081ca7648e1d9ac01d0 100644 (file)
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -21,7 +21,7 @@
     #define wxUSE_FS_INET 0
 #endif
 
-#if (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+#if (wxUSE_HTML || wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
 
 #include "wx/wfstream.h"
 #include "wx/module.h"
@@ -97,8 +97,14 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
     }
 
     ft = m_MimeMng -> GetFileTypeFromExtension(ext);
-    if (ft && (ft -> GetMimeType(&mime))) return mime;
-    else return wxEmptyString;
+    if (ft && (ft -> GetMimeType(&mime))) {
+        delete ft; 
+        return mime;
+    }
+    else {
+        delete ft;
+        return wxEmptyString;
+    }
 }
 
 
@@ -155,11 +161,16 @@ wxString wxFileSystemHandler::GetAnchor(const wxString& location) const
 }
 
 
-wxString wxFileSystemHandler::FindFirst(const wxString& spec, int flags)  { return wxEmptyString; }
-
-wxString wxFileSystemHandler::FindNext() { return wxEmptyString; }
-
+wxString wxFileSystemHandler::FindFirst(const wxString& WXUNUSED(spec),
+                                        int WXUNUSED(flags))
+{
+    return wxEmptyString;
+}
 
+wxString wxFileSystemHandler::FindNext()
+{
+    return wxEmptyString;
+}
 
 //--------------------------------------------------------------------------------
 // wxLocalFSHandler
@@ -301,10 +312,10 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
         while (node)
        {
             wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();
-            if (h->CanOpen(m_Path + location))
+            if (h->CanOpen(m_Path + loc))
                {
-                s = h->OpenFile(*this, m_Path + location);
-                if (s) { m_LastName = m_Path + location; break; }
+                s = h->OpenFile(*this, m_Path + loc);
+                if (s) { m_LastName = m_Path + loc; break; }
             }
             node = node->GetNext();
         }
@@ -317,10 +328,10 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
         while (node)
        {
             wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData();
-            if (h->CanOpen(location))
+            if (h->CanOpen(loc))
            {
-                s = h->OpenFile(*this, location);
-                if (s) { m_LastName = location; break; }
+                s = h->OpenFile(*this, loc);
+                if (s) { m_LastName = loc; break; }
             }
             node = node->GetNext();
         }