From 6691d73700e1bdb6ecbf4c81f563ddc78a29adb6 Mon Sep 17 00:00:00 2001 From: Stefan Neis Date: Wed, 27 Aug 2003 18:57:17 +0000 Subject: [PATCH] Don't treat OS/2 as a Unix-like system in this particular file. This also simplifies some of the #ifdef statments. :-) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/mimecmn.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp index 9638603658..e04e17bc47 100644 --- a/src/common/mimecmn.cpp +++ b/src/common/mimecmn.cpp @@ -55,6 +55,7 @@ #include "wx/mac/mimetype.h" #elif defined(__WXPM__) || defined (__EMX__) #include "wx/os2/mimetype.h" + #undef __UNIX__ #else // Unix #include "wx/unix/mimetype.h" #endif @@ -401,7 +402,7 @@ bool wxFileType::Unassociate() { #if defined(__WXMSW__) return m_impl->Unassociate(); -#elif defined(__UNIX__) && !defined(__WXPM__) +#elif defined(__UNIX__) return m_impl->Unassociate(this); #else wxFAIL_MSG( _T("not implemented") ); // TODO @@ -487,7 +488,7 @@ wxMimeTypesManager::~wxMimeTypesManager() bool wxMimeTypesManager::Unassociate(wxFileType *ft) { -#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__) && !defined(__WINE__) +#if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__) return m_impl->Unassociate(ft); #else return ft->Unassociate(); @@ -500,7 +501,7 @@ wxMimeTypesManager::Associate(const wxFileTypeInfo& ftInfo) { EnsureImpl(); -#if defined(__WXMSW__) || (defined(__UNIX__) && !defined(__WXPM__)) +#if defined(__WXMSW__) || defined(__UNIX__) return m_impl->Associate(ftInfo); #else // other platforms wxFAIL_MSG( _T("not implemented") ); // TODO @@ -597,7 +598,7 @@ size_t wxMimeTypesManager::EnumAllFileTypes(wxArrayString& mimetypes) void wxMimeTypesManager::Initialize(int mcapStyle, const wxString& sExtraDir) { -#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__) && !defined(__WINE__) +#if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__) EnsureImpl(); m_impl->Initialize(mcapStyle, sExtraDir); @@ -610,7 +611,7 @@ void wxMimeTypesManager::Initialize(int mcapStyle, // and this function clears all the data from the manager void wxMimeTypesManager::ClearData() { -#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__) && !defined(__WINE__) +#if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__) EnsureImpl(); m_impl->ClearData(); -- 2.45.2