Added tmake template for simple wxGTK makefile

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

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 2d4a8690dd3d433f621a6da7f62b6cf2ec4068f8..068024fa6a43e66046804c33dea82b06160d411f 100644 (file)
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -16,6 +16,13 @@
 #pragma hdrstop
 #endif
 
+#if !wxUSE_SOCKETS
+    #undef wxUSE_FS_ZIP
+    #undef wxUSE_FS_INET
+    #define wxUSE_FS_ZIP 0
+    #define wxUSE_FS_INET 0
+#endif
+
 #if (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
 
 #include "wx/wfstream.h"
@@ -28,7 +35,13 @@
 
 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)
@@ -46,7 +59,8 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
         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;
+    ft = m_MimeMng -> GetFileTypeFromExtension(ext);
     if (ft && (ft -> GetMimeType(&mime))) return mime;
     else return wxEmptyString;
 }
@@ -272,7 +286,10 @@ class wxFileSystemModule : public wxModule
             wxFileSystem::AddHandler(new wxLocalFSHandler);
             return TRUE;
         }
-        virtual void OnExit() {}
+        virtual void OnExit() 
+       {
+           wxFileSystemHandler::CleanUpStatics();
+       }
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)
@@ -280,3 +297,5 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)
 #endif 
   // (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
 
+
+