once again forgot about this OS/2 strangeness

[wxWidgets.git] / src / common / mimecmn.cpp

diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp
index 89b0ab281d4d7ddd67731b3501ca6ee92c3c9aad..8a16ced893591f3c2bd0bfedbf94587588b1b72f 100644 (file)
--- a/src/common/mimecmn.cpp
+++ b/src/common/mimecmn.cpp
@@ -24,15 +24,18 @@
 
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"

-#include "wx/module.h"

 
 #ifdef __BORLANDC__
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_MIMETYPE
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-  #include "wx/defs.h"
+    #include "wx/module.h"

 #endif
 #endif

+// this one is needed for MSVC5
+#include "wx/module.h"

 
 #ifndef WX_PRECOMP
   #include "wx/string.h"
 
 #ifndef WX_PRECOMP
   #include "wx/string.h"


@@ -351,7 +354,7 @@ size_t wxFileType::GetAllCommands(wxArrayString *verbs,
     if ( commands )
         commands->Clear();
 
     if ( commands )
         commands->Clear();
 

-#if defined (__WXMSW__)  || (__UNIX__)
+#if defined (__WXMSW__)  || defined(__UNIX__)

     return m_impl->GetAllCommands(verbs, commands, params);
 #else // !__WXMSW__ || Unix
     // we don't know how to retrieve all commands, so just try the 2 we know
     return m_impl->GetAllCommands(verbs, commands, params);
 #else // !__WXMSW__ || Unix
     // we don't know how to retrieve all commands, so just try the 2 we know


@@ -385,25 +388,21 @@ bool wxFileType::Unassociate()
 {
 #if defined(__WXMSW__)
     return m_impl->Unassociate();
 {
 #if defined(__WXMSW__)
     return m_impl->Unassociate();

-#endif
-
-#if defined(__UNIX__)
+#elif defined(__UNIX__) && !defined(__WXPM__)

     return m_impl->Unassociate(this);
     return m_impl->Unassociate(this);

-#endif
-
+#else

     wxFAIL_MSG( _T("not implemented") ); // TODO
     return FALSE;
     wxFAIL_MSG( _T("not implemented") ); // TODO
     return FALSE;

-
+#endif

 }
 
 bool wxFileType::SetCommand(const wxString& cmd, const wxString& verb,
 bool overwriteprompt)
 {
 }
 
 bool wxFileType::SetCommand(const wxString& cmd, const wxString& verb,
 bool overwriteprompt)
 {

-#if defined (__WXMSW__)  || (__UNIX__)
+#if defined (__WXMSW__)  || defined(__UNIX__)

     return m_impl->SetCommand(cmd, verb, overwriteprompt);
 #else
     wxFAIL_MSG(_T("not implemented"));
     return m_impl->SetCommand(cmd, verb, overwriteprompt);
 #else
     wxFAIL_MSG(_T("not implemented"));

-

     return FALSE;
 #endif
 }
     return FALSE;
 #endif
 }


@@ -419,7 +418,7 @@ bool wxFileType::SetDefaultIcon(const wxString& cmd, int index)
 #endif
     wxCHECK_MSG( !sTmp.empty(), FALSE, _T("need the icon file") );
 
 #endif
     wxCHECK_MSG( !sTmp.empty(), FALSE, _T("need the icon file") );
 

-#if defined (__WXMSW__) || (__UNIX__)
+#if defined (__WXMSW__) || defined(__UNIX__)

     return m_impl->SetDefaultIcon (cmd, index);
 #else
     wxFAIL_MSG(_T("not implemented"));
     return m_impl->SetDefaultIcon (cmd, index);
 #else
     wxFAIL_MSG(_T("not implemented"));


@@ -475,7 +474,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);
 #else
     return ft->Unassociate();
     return m_impl->Unassociate(ft);
 #else
     return ft->Unassociate();


@@ -488,7 +487,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);
 #else // other platforms
     wxFAIL_MSG( _T("not implemented") ); // TODO
     return m_impl->Associate(ftInfo);
 #else // other platforms
     wxFAIL_MSG( _T("not implemented") ); // TODO


@@ -585,17 +584,20 @@ size_t wxMimeTypesManager::EnumAllFileTypes(wxArrayString& mimetypes)
 void wxMimeTypesManager::Initialize(int mcapStyle,
                                     const wxString& sExtraDir)
 {
 void wxMimeTypesManager::Initialize(int mcapStyle,
                                     const wxString& sExtraDir)
 {

-#ifdef __UNIX__
+#if defined(__UNIX__) && !defined(__WXPM__)

     EnsureImpl();
 
     m_impl->Initialize(mcapStyle, sExtraDir);
     EnsureImpl();
 
     m_impl->Initialize(mcapStyle, sExtraDir);

+#else
+       (void)mcapStyle;        
+       (void)sExtraDir;        

 #endif // Unix
 }
 
 // and this function clears all the data from the manager
 void wxMimeTypesManager::ClearData()
 {
 #endif // Unix
 }
 
 // and this function clears all the data from the manager
 void wxMimeTypesManager::ClearData()
 {

-#ifdef __UNIX__
+#if defined(__UNIX__) && !defined(__WXPM__)

     EnsureImpl();
 
     m_impl->ClearData();
     EnsureImpl();
 
     m_impl->ClearData();


@@ -631,3 +633,5 @@ public:
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxMimeTypeCmnModule, wxModule)
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxMimeTypeCmnModule, wxModule)

+
+#endif // wxUSE_MIMETYPE