really fixed wxConfig bug

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

diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp
index a4785b974db5f31a1e6de9c6015ce5617472a84d..7da7bd3f64c70a1563d5af5cd6c2244e796a2240 100644 (file)
--- a/src/common/mimecmn.cpp
+++ b/src/common/mimecmn.cpp
@@ -385,10 +385,9 @@ bool wxFileType::Unassociate()
 {
 #if defined(__WXMSW__)
     return m_impl->Unassociate();
 {
 #if defined(__WXMSW__)
     return m_impl->Unassociate();

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

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

-

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


@@ -401,7 +400,6 @@ bool overwriteprompt)
     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
 }


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


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


@@ -583,17 +581,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();