projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
scroll of subwindow confined to rect param
[wxWidgets.git]
/
src
/
common
/
mimecmn.cpp
diff --git
a/src/common/mimecmn.cpp
b/src/common/mimecmn.cpp
index 1510e92b2fabf6311bd493f55de7e48ecc1e35f2..e04e17bc4755fa96e801f7c7b2c67ad7bb4d4d55 100644
(file)
--- a/
src/common/mimecmn.cpp
+++ b/
src/common/mimecmn.cpp
@@
-53,8
+53,9
@@
#include "wx/msw/mimetype.h"
#elif defined(__WXMAC__)
#include "wx/mac/mimetype.h"
#include "wx/msw/mimetype.h"
#elif defined(__WXMAC__)
#include "wx/mac/mimetype.h"
-#elif defined(__WXPM__)
+#elif defined(__WXPM__)
|| defined (__EMX__)
#include "wx/os2/mimetype.h"
#include "wx/os2/mimetype.h"
+ #undef __UNIX__
#else // Unix
#include "wx/unix/mimetype.h"
#endif
#else // Unix
#include "wx/unix/mimetype.h"
#endif
@@
-401,7
+402,7
@@
bool wxFileType::Unassociate()
{
#if defined(__WXMSW__)
return m_impl->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
return m_impl->Unassociate(this);
#else
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);
#else
return ft->Unassociate();
return m_impl->Unassociate(ft);
#else
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);
#else // other platforms
wxFAIL_MSG( _T("not implemented") ); // TODO
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)
{
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);
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()
{
// 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();
EnsureImpl();
m_impl->ClearData();