AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed some OS/2 specific problems: EMX defines __UNIX__, which is what good

Browse Source 
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
This commit is contained in:
Stefan Neis 2001-05-20 16:16:27 +00:00
parent 3958ae62ba
commit e4ad24c9d3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/mimecmn.cpp
View File

@ -385,7 +385,7 @@ bool wxFileType::Unassociate()
{ {
#if defined(__WXMSW__) #if defined(__WXMSW__)
return m_impl->Unassociate(); return m_impl->Unassociate();
#elif defined(__UNIX__) #elif defined(__UNIX__) && !defined(__WXPM__)
return m_impl->Unassociate(this); return m_impl->Unassociate(this);
#else #else
wxFAIL_MSG( _T("not implemented") ); // TODO wxFAIL_MSG( _T("not implemented") ); // TODO
@ -471,7 +471,7 @@ wxMimeTypesManager::~wxMimeTypesManager()
bool wxMimeTypesManager::Unassociate(wxFileType *ft) bool wxMimeTypesManager::Unassociate(wxFileType *ft)
{ {
#if defined(__UNIX__) #if defined(__UNIX__) && !defined(__WXPM__)
return m_impl->Unassociate(ft); return m_impl->Unassociate(ft);
#else #else
return ft->Unassociate(); return ft->Unassociate();
@ -484,7 +484,7 @@ wxMimeTypesManager::Associate(const wxFileTypeInfo& ftInfo)
{ {
EnsureImpl(); EnsureImpl();
#if defined(__WXMSW__) || defined(__UNIX__) #if defined(__WXMSW__) || (defined(__UNIX__) && !defined(__WXPM__))
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
@ -581,7 +581,7 @@ size_t wxMimeTypesManager::EnumAllFileTypes(wxArrayString& mimetypes)
void wxMimeTypesManager::Initialize(int mcapStyle, void wxMimeTypesManager::Initialize(int mcapStyle,
const wxString& sExtraDir) const wxString& sExtraDir)
{ {
#ifdef __UNIX__ #if defined(__UNIX__) && !defined(__WXPM__)
EnsureImpl(); EnsureImpl();
m_impl->Initialize(mcapStyle, sExtraDir); m_impl->Initialize(mcapStyle, sExtraDir);
@ -594,7 +594,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()
{ {
#ifdef __UNIX__ #if defined(__UNIX__) && !defined(__WXPM__)
EnsureImpl(); EnsureImpl();
m_impl->ClearData(); m_impl->ClearData();