X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..c43430bbacbf26414693fcf47fe54a8090c6bfcb:/src/common/mimecmn.cpp?ds=sidebyside diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp index e28e6f9272..6ee6a7a7fa 100644 --- 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();