From e4ad24c9d3d595fa1adb4540fb684da1ca701c67 Mon Sep 17 00:00:00 2001 From: Stefan Neis Date: Sun, 20 May 2001 16:16:27 +0000 Subject: [PATCH] Fixed some OS/2 specific problems: EMX defines __UNIX__, which is what good for wxGTK/wxMotif, but sometimes a problem for the PM version. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/mimecmn.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp index 3ddea52b66..7da7bd3f64 100644 --- a/src/common/mimecmn.cpp +++ b/src/common/mimecmn.cpp @@ -385,7 +385,7 @@ bool wxFileType::Unassociate() { #if defined(__WXMSW__) return m_impl->Unassociate(); -#elif defined(__UNIX__) +#elif defined(__UNIX__) && !defined(__WXPM__) return m_impl->Unassociate(this); #else wxFAIL_MSG( _T("not implemented") ); // TODO @@ -471,7 +471,7 @@ wxMimeTypesManager::~wxMimeTypesManager() bool wxMimeTypesManager::Unassociate(wxFileType *ft) { -#if defined(__UNIX__) +#if defined(__UNIX__) && !defined(__WXPM__) return m_impl->Unassociate(ft); #else return ft->Unassociate(); @@ -484,7 +484,7 @@ wxMimeTypesManager::Associate(const wxFileTypeInfo& ftInfo) { EnsureImpl(); -#if defined(__WXMSW__) || defined(__UNIX__) +#if defined(__WXMSW__) || (defined(__UNIX__) && !defined(__WXPM__)) return m_impl->Associate(ftInfo); #else // other platforms wxFAIL_MSG( _T("not implemented") ); // TODO @@ -581,7 +581,7 @@ size_t wxMimeTypesManager::EnumAllFileTypes(wxArrayString& mimetypes) void wxMimeTypesManager::Initialize(int mcapStyle, const wxString& sExtraDir) { -#ifdef __UNIX__ +#if defined(__UNIX__) && !defined(__WXPM__) EnsureImpl(); m_impl->Initialize(mcapStyle, sExtraDir); @@ -594,7 +594,7 @@ void wxMimeTypesManager::Initialize(int mcapStyle, // and this function clears all the data from the manager void wxMimeTypesManager::ClearData() { -#ifdef __UNIX__ +#if defined(__UNIX__) && !defined(__WXPM__) EnsureImpl(); m_impl->ClearData(); -- 2.45.2