Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't treat OS/2 as a Unix-like system in this particular file.

Browse Source 
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
This commit is contained in:
Stefan Neis
2003-08-27 18:57:17 +00:00
parent ffca575c83
commit 6691d73700
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/mimecmn.cpp
View File

@@ -55,6 +55,7 @@
#include "wx/mac/mimetype.h" #include "wx/mac/mimetype.h"
#elif defined(__WXPM__) || defined (__EMX__) #elif defined(__WXPM__) || defined (__EMX__)
#include "wx/os2/mimetype.h" #include "wx/os2/mimetype.h"
#undef __UNIX__
#else // Unix #else // Unix
#include "wx/unix/mimetype.h" #include "wx/unix/mimetype.h"
#endif #endif
@@ -401,7 +402,7 @@ bool wxFileType::Unassociate()
{ {
#if defined(__WXMSW__) #if defined(__WXMSW__)
return m_impl->Unassociate(); return m_impl->Unassociate();
#elif defined(__UNIX__) && !defined(__WXPM__) #elif defined(__UNIX__)
return m_impl->Unassociate(this); return m_impl->Unassociate(this);
#else #else
wxFAIL_MSG( _T("not implemented") ); // TODO wxFAIL_MSG( _T("not implemented") ); // TODO
@@ -487,7 +488,7 @@ wxMimeTypesManager::~wxMimeTypesManager()
bool wxMimeTypesManager::Unassociate(wxFileType *ft) 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); return m_impl->Unassociate(ft);
#else #else
return ft->Unassociate(); return ft->Unassociate();
@@ -500,7 +501,7 @@ wxMimeTypesManager::Associate(const wxFileTypeInfo& ftInfo)
{ {
EnsureImpl(); EnsureImpl();
#if defined(__WXMSW__) || (defined(__UNIX__) && !defined(__WXPM__)) #if defined(__WXMSW__) || defined(__UNIX__)
return m_impl->Associate(ftInfo); return m_impl->Associate(ftInfo);
#else // other platforms #else // other platforms
wxFAIL_MSG( _T("not implemented") ); // TODO wxFAIL_MSG( _T("not implemented") ); // TODO
@@ -597,7 +598,7 @@ size_t wxMimeTypesManager::EnumAllFileTypes(wxArrayString& mimetypes)
void wxMimeTypesManager::Initialize(int mcapStyle, void wxMimeTypesManager::Initialize(int mcapStyle,
const wxString& sExtraDir) const wxString& sExtraDir)
{ {
#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__) && !defined(__WINE__) #if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__)
EnsureImpl(); EnsureImpl();
m_impl->Initialize(mcapStyle, sExtraDir); m_impl->Initialize(mcapStyle, sExtraDir);
@@ -610,7 +611,7 @@ void wxMimeTypesManager::Initialize(int mcapStyle,
// and this function clears all the data from the manager // and this function clears all the data from the manager
void wxMimeTypesManager::ClearData() void wxMimeTypesManager::ClearData()
{ {
#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__) && !defined(__WINE__) #if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__)
EnsureImpl(); EnsureImpl();
m_impl->ClearData(); m_impl->ClearData();