Fixed my sloppy fix for redundant path separators

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

diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp
index e28e6f9272385dac86bb1b0fe4ad9333501b6311..a760575ad9c93312d2739da809716bb43ef4ac1d 100644 (file)
--- a/src/common/mimecmn.cpp
+++ b/src/common/mimecmn.cpp
@@ -34,6 +34,8 @@
 #ifndef WX_PRECOMP
     #include "wx/module.h"
 #endif
+// this one is needed for MSVC5
+#include "wx/module.h"
 
 #ifndef WX_PRECOMP
   #include "wx/string.h"
@@ -472,7 +474,7 @@ wxMimeTypesManager::~wxMimeTypesManager()
 
 bool wxMimeTypesManager::Unassociate(wxFileType *ft)
 {
-#if defined(__UNIX__) && !defined(__WXPM__)
+#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__)
     return m_impl->Unassociate(ft);
 #else
     return ft->Unassociate();
@@ -582,7 +584,7 @@ size_t wxMimeTypesManager::EnumAllFileTypes(wxArrayString& mimetypes)
 void wxMimeTypesManager::Initialize(int mcapStyle,
                                     const wxString& sExtraDir)
 {
-#if defined(__UNIX__) && !defined(__WXPM__)
+#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__)
     EnsureImpl();
 
     m_impl->Initialize(mcapStyle, sExtraDir);
@@ -595,7 +597,7 @@ void wxMimeTypesManager::Initialize(int mcapStyle,
 // and this function clears all the data from the manager
 void wxMimeTypesManager::ClearData()
 {
-#if defined(__UNIX__) && !defined(__WXPM__)
+#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__)
     EnsureImpl();
 
     m_impl->ClearData();
@@ -624,6 +626,7 @@ public:
         {
             delete gs_mimeTypesManager.m_impl;
             gs_mimeTypesManager.m_impl = NULL;
+            gs_mimeTypesManager.m_fallbacks.Clear();
         }
     }