fixing osx_cocoa

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

diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp
index a760575ad9c93312d2739da809716bb43ef4ac1d..f159809a84b46db8c4e4fd9b235e2db690c98177 100644 (file)
--- a/src/common/mimecmn.cpp
+++ b/src/common/mimecmn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        common/mimecmn.cpp
+// Name:        src/common/mimecmn.cpp

 // Purpose:     classes and functions to manage MIME types
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     classes and functions to manage MIME types
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -7,7 +7,7 @@
 // Created:     23.09.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     23.09.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license (part of wxExtra library)
+// Licence:     wxWindows licence (part of wxExtra library)

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -18,10 +18,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef    __GNUG__
-    #pragma implementation "mimetypebase.h"
-#endif
-

 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -31,37 +27,34 @@
 
 #if wxUSE_MIMETYPE
 
 
 #if wxUSE_MIMETYPE
 

-#ifndef WX_PRECOMP
-    #include "wx/module.h"
-#endif
-// this one is needed for MSVC5
-#include "wx/module.h"
+#include "wx/mimetype.h"

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

-  #include "wx/string.h"
-  #if wxUSE_GUI
-    #include "wx/icon.h"
-  #endif
+    #include "wx/dynarray.h"
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/module.h"
+    #include "wx/crt.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/log.h"

 #include "wx/file.h"
 #include "wx/file.h"

-#include "wx/intl.h"
-#include "wx/dynarray.h"
+#include "wx/iconloc.h"

 #include "wx/confbase.h"
 
 #include "wx/confbase.h"
 

-#include "wx/mimetype.h"
-

 // other standard headers
 #include <ctype.h>
 
 // implementation classes:
 #if defined(__WXMSW__)
     #include "wx/msw/mimetype.h"
 // other standard headers
 #include <ctype.h>
 
 // implementation classes:
 #if defined(__WXMSW__)
     #include "wx/msw/mimetype.h"

-#elif defined(__WXMAC__)
-    #include "wx/mac/mimetype.h"
-#elif defined(__WXPM__)
+#elif ( defined(__WXMAC__) )
+    #include "wx/osx/mimetype.h"
+#elif defined(__WXPM__) || defined (__EMX__)

     #include "wx/os2/mimetype.h"
     #include "wx/os2/mimetype.h"

+    #undef __UNIX__
+#elif defined(__DOS__)
+    #include "wx/msdos/mimetype.h"

 #else // Unix
     #include "wx/unix/mimetype.h"
 #endif
 #else // Unix
     #include "wx/unix/mimetype.h"
 #endif


@@ -70,34 +63,99 @@
 // common classes
 // ============================================================================
 
 // common classes
 // ============================================================================
 

+// ----------------------------------------------------------------------------
+// wxMimeTypeCommands
+// ----------------------------------------------------------------------------
+
+void
+wxMimeTypeCommands::AddOrReplaceVerb(const wxString& verb, const wxString& cmd)
+{
+    int n = m_verbs.Index(verb, false /* ignore case */);
+    if ( n == wxNOT_FOUND )
+    {
+        m_verbs.Add(verb);
+        m_commands.Add(cmd);
+    }
+    else
+    {
+        m_commands[n] = cmd;
+    }
+}
+
+wxString
+wxMimeTypeCommands::GetCommandForVerb(const wxString& verb, size_t *idx) const
+{
+    wxString s;
+
+    int n = m_verbs.Index(verb);
+    if ( n != wxNOT_FOUND )
+    {
+        s = m_commands[(size_t)n];
+        if ( idx )
+            *idx = n;
+    }
+    else if ( idx )
+    {
+        // different from any valid index
+        *idx = (size_t)-1;
+    }
+
+    return s;
+}
+
+wxString wxMimeTypeCommands::GetVerbCmd(size_t n) const
+{
+    return m_verbs[n] + wxT('=') + m_commands[n];
+}
+

 // ----------------------------------------------------------------------------
 // wxFileTypeInfo
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxFileTypeInfo
 // ----------------------------------------------------------------------------
 

-wxFileTypeInfo::wxFileTypeInfo(const char *mimeType,
-                               const char *openCmd,
-                               const char *printCmd,
-                               const char *desc,
-                               ...)
-              : m_mimeType(mimeType),
-                m_openCmd(openCmd),
-                m_printCmd(printCmd),
-                m_desc(desc)
+void wxFileTypeInfo::DoVarArgInit(const wxString& mimeType,
+                                  const wxString& openCmd,
+                                  const wxString& printCmd,
+                                  const wxString& desc,
+                                  va_list argptr)

 {
 {

-    va_list argptr;
-    va_start(argptr, desc);
+    m_mimeType = mimeType;
+    m_openCmd = openCmd;
+    m_printCmd = printCmd;
+    m_desc = desc;

 
     for ( ;; )
     {
 
     for ( ;; )
     {

-        const char *ext = va_arg(argptr, const char *);
+        // icc gives this warning in its own va_arg() macro, argh
+#ifdef __INTELC__
+    #pragma warning(push)
+    #pragma warning(disable: 1684)
+#endif
+
+        wxArgNormalizedString ext(WX_VA_ARG_STRING(argptr));
+
+#ifdef __INTELC__
+    #pragma warning(pop)
+#endif

         if ( !ext )
         {
             // NULL terminates the list
             break;
         }
 
         if ( !ext )
         {
             // NULL terminates the list
             break;
         }
 

-        m_exts.Add(ext);
+        m_exts.Add(ext.GetString());

     }
     }

+}
+
+void wxFileTypeInfo::VarArgInit(const wxString *mimeType,
+                                const wxString *openCmd,
+                                const wxString *printCmd,
+                                const wxString *desc,
+                                ...)
+{
+    va_list argptr;
+    va_start(argptr, desc);
+
+    DoVarArgInit(*mimeType, *openCmd, *printCmd, *desc, argptr);

 
     va_end(argptr);
 }
 
     va_end(argptr);
 }


@@ -118,7 +176,7 @@ wxFileTypeInfo::wxFileTypeInfo(const wxArrayString& sArray)
 }
 
 #include "wx/arrimpl.cpp"
 }
 
 #include "wx/arrimpl.cpp"

-WX_DEFINE_OBJARRAY(wxArrayFileTypeInfo);
+WX_DEFINE_OBJARRAY(wxArrayFileTypeInfo)

 
 // ============================================================================
 // implementation of the wrapper classes
 
 // ============================================================================
 // implementation of the wrapper classes


@@ -132,25 +190,31 @@ WX_DEFINE_OBJARRAY(wxArrayFileTypeInfo);
 wxString wxFileType::ExpandCommand(const wxString& command,
                                    const wxFileType::MessageParameters& params)
 {
 wxString wxFileType::ExpandCommand(const wxString& command,
                                    const wxFileType::MessageParameters& params)
 {

-    bool hasFilename = FALSE;
+    bool hasFilename = false;
+
+    // We consider that only the file names with spaces in them need to be
+    // handled specially. This is not perfect, but this can be done easily
+    // under all platforms while handling the file names with quotes in them,
+    // for example, needs to be done differently.
+    const bool needToQuoteFilename = params.GetFileName().find_first_of(" \t")
+                                        != wxString::npos;

 
     wxString str;
     for ( const wxChar *pc = command.c_str(); *pc != wxT('\0'); pc++ ) {
         if ( *pc == wxT('%') ) {
             switch ( *++pc ) {
                 case wxT('s'):
 
     wxString str;
     for ( const wxChar *pc = command.c_str(); *pc != wxT('\0'); pc++ ) {
         if ( *pc == wxT('%') ) {
             switch ( *++pc ) {
                 case wxT('s'):

-                    // '%s' expands into file name (quoted because it might
-                    // contain spaces) - except if there are already quotes
-                    // there because otherwise some programs may get confused
-                    // by double double quotes
-#if 0
-                    if ( *(pc - 2) == wxT('"') )
-                        str << params.GetFileName();
-                    else
+                    // don't quote the file name if it's already quoted: notice
+                    // that we check for a quote following it and not preceding
+                    // it as at least under Windows we can have commands
+                    // containing "file://%s" (with quotes) in them so the
+                    // argument may be quoted even if there is no quote
+                    // directly before "%s" itself
+                    if ( needToQuoteFilename && pc[1] != '"' )

                         str << wxT('"') << params.GetFileName() << wxT('"');
                         str << wxT('"') << params.GetFileName() << wxT('"');

-#endif
-                    str << params.GetFileName();
-                    hasFilename = TRUE;
+                    else
+                        str << params.GetFileName();
+                    hasFilename = true;

                     break;
 
                 case wxT('t'):
                     break;
 
                 case wxT('t'):


@@ -202,12 +266,18 @@ wxString wxFileType::ExpandCommand(const wxString& command,
     // know of the correct solution, try to guess what we have to do.
 
     // test now carried out on reading file so test should never get here
     // know of the correct solution, try to guess what we have to do.
 
     // test now carried out on reading file so test should never get here

-    if ( !hasFilename && !str.IsEmpty()
+    if ( !hasFilename && !str.empty()

 #ifdef __UNIX__
 #ifdef __UNIX__

-                      && !str.StartsWith(_T("test "))
+                      && !str.StartsWith(wxT("test "))

 #endif // Unix
 #endif // Unix

-       ) {
-        str << wxT(" < '") << params.GetFileName() << wxT('\'');
+       )
+    {
+        str << wxT(" < ");
+        if ( needToQuoteFilename )
+            str << '"';
+        str << params.GetFileName();
+        if ( needToQuoteFilename )
+            str << '"';

     }
 
     return str;
     }
 
     return str;


@@ -236,7 +306,7 @@ bool wxFileType::GetExtensions(wxArrayString& extensions)
     if ( m_info )
     {
         extensions = m_info->GetExtensions();
     if ( m_info )
     {
         extensions = m_info->GetExtensions();

-        return TRUE;
+        return true;

     }
 
     return m_impl->GetExtensions(extensions);
     }
 
     return m_impl->GetExtensions(extensions);


@@ -244,13 +314,13 @@ bool wxFileType::GetExtensions(wxArrayString& extensions)
 
 bool wxFileType::GetMimeType(wxString *mimeType) const
 {
 
 bool wxFileType::GetMimeType(wxString *mimeType) const
 {

-    wxCHECK_MSG( mimeType, FALSE, _T("invalid parameter in GetMimeType") );
+    wxCHECK_MSG( mimeType, false, wxT("invalid parameter in GetMimeType") );

 
     if ( m_info )
     {
         *mimeType = m_info->GetMimeType();
 
 
     if ( m_info )
     {
         *mimeType = m_info->GetMimeType();
 

-        return TRUE;
+        return true;

     }
 
     return m_impl->GetMimeType(mimeType);
     }
 
     return m_impl->GetMimeType(mimeType);


@@ -263,50 +333,58 @@ bool wxFileType::GetMimeTypes(wxArrayString& mimeTypes) const
         mimeTypes.Clear();
         mimeTypes.Add(m_info->GetMimeType());
 
         mimeTypes.Clear();
         mimeTypes.Add(m_info->GetMimeType());
 

-        return TRUE;
+        return true;

     }
 
     return m_impl->GetMimeTypes(mimeTypes);
 }
 
     }
 
     return m_impl->GetMimeTypes(mimeTypes);
 }
 

-bool wxFileType::GetIcon(wxIcon *icon,
-                         wxString *iconFile,
-                         int *iconIndex) const
+bool wxFileType::GetIcon(wxIconLocation *iconLoc) const

 {
     if ( m_info )
     {
 {
     if ( m_info )
     {

-        if ( iconFile )
-            *iconFile = m_info->GetIconFile();
-        if ( iconIndex )
-            *iconIndex = m_info->GetIconIndex();
-
-#if wxUSE_GUI
-        if ( icon && !m_info->GetIconFile().empty() )
+        if ( iconLoc )

         {
         {

-            // FIXME: what about the index?
-            icon->LoadFile(m_info->GetIconFile());
+            iconLoc->SetFileName(m_info->GetIconFile());
+#ifdef __WXMSW__
+            iconLoc->SetIndex(m_info->GetIconIndex());
+#endif // __WXMSW__

         }
         }

-#endif // wxUSE_GUI

 
 

-        return TRUE;
+        return true;

     }
 
     }
 

-#if defined(__WXMSW__) || defined(__UNIX__)
-    return m_impl->GetIcon(icon, iconFile, iconIndex);
-#else
-    return m_impl->GetIcon(icon);
-#endif
+    return m_impl->GetIcon(iconLoc);
+}
+
+bool
+wxFileType::GetIcon(wxIconLocation *iconloc,
+                    const MessageParameters& params) const
+{
+    if ( !GetIcon(iconloc) )
+    {
+        return false;
+    }
+
+    // we may have "%s" in the icon location string, at least under Windows, so
+    // expand this
+    if ( iconloc )
+    {
+        iconloc->SetFileName(ExpandCommand(iconloc->GetFileName(), params));
+    }
+
+    return true;

 }
 
 bool wxFileType::GetDescription(wxString *desc) const
 {
 }
 
 bool wxFileType::GetDescription(wxString *desc) const
 {

-    wxCHECK_MSG( desc, FALSE, _T("invalid parameter in GetDescription") );
+    wxCHECK_MSG( desc, false, wxT("invalid parameter in GetDescription") );

 
     if ( m_info )
     {
         *desc = m_info->GetDescription();
 
 
     if ( m_info )
     {
         *desc = m_info->GetDescription();
 

-        return TRUE;
+        return true;

     }
 
     return m_impl->GetDescription(desc);
     }
 
     return m_impl->GetDescription(desc);


@@ -316,29 +394,41 @@ bool
 wxFileType::GetOpenCommand(wxString *openCmd,
                            const wxFileType::MessageParameters& params) const
 {
 wxFileType::GetOpenCommand(wxString *openCmd,
                            const wxFileType::MessageParameters& params) const
 {

-    wxCHECK_MSG( openCmd, FALSE, _T("invalid parameter in GetOpenCommand") );
+    wxCHECK_MSG( openCmd, false, wxT("invalid parameter in GetOpenCommand") );

 
     if ( m_info )
     {
         *openCmd = ExpandCommand(m_info->GetOpenCommand(), params);
 
 
     if ( m_info )
     {
         *openCmd = ExpandCommand(m_info->GetOpenCommand(), params);
 

-        return TRUE;
+        return true;

     }
 
     return m_impl->GetOpenCommand(openCmd, params);
 }
 
     }
 
     return m_impl->GetOpenCommand(openCmd, params);
 }
 

+wxString wxFileType::GetOpenCommand(const wxString& filename) const
+{
+    wxString cmd;
+    if ( !GetOpenCommand(&cmd, filename) )
+    {
+        // return empty string to indicate an error
+        cmd.clear();
+    }
+
+    return cmd;
+}
+

 bool
 wxFileType::GetPrintCommand(wxString *printCmd,
                             const wxFileType::MessageParameters& params) const
 {
 bool
 wxFileType::GetPrintCommand(wxString *printCmd,
                             const wxFileType::MessageParameters& params) const
 {

-    wxCHECK_MSG( printCmd, FALSE, _T("invalid parameter in GetPrintCommand") );
+    wxCHECK_MSG( printCmd, false, wxT("invalid parameter in GetPrintCommand") );

 
     if ( m_info )
     {
         *printCmd = ExpandCommand(m_info->GetPrintCommand(), params);
 
 
     if ( m_info )
     {
         *printCmd = ExpandCommand(m_info->GetPrintCommand(), params);
 

-        return TRUE;
+        return true;

     }
 
     return m_impl->GetPrintCommand(printCmd, params);
     }
 
     return m_impl->GetPrintCommand(printCmd, params);


@@ -364,7 +454,7 @@ size_t wxFileType::GetAllCommands(wxArrayString *verbs,
     if ( GetOpenCommand(&cmd, params) )
     {
         if ( verbs )
     if ( GetOpenCommand(&cmd, params) )
     {
         if ( verbs )

-            verbs->Add(_T("Open"));
+            verbs->Add(wxT("Open"));

         if ( commands )
             commands->Add(cmd);
         count++;
         if ( commands )
             commands->Add(cmd);
         count++;


@@ -373,7 +463,7 @@ size_t wxFileType::GetAllCommands(wxArrayString *verbs,
     if ( GetPrintCommand(&cmd, params) )
     {
         if ( verbs )
     if ( GetPrintCommand(&cmd, params) )
     {
         if ( verbs )

-            verbs->Add(_T("Print"));
+            verbs->Add(wxT("Print"));

         if ( commands )
             commands->Add(cmd);
 
         if ( commands )
             commands->Add(cmd);
 


@@ -388,22 +478,26 @@ 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
     return m_impl->Unassociate(this);
 #else

-    wxFAIL_MSG( _T("not implemented") ); // TODO
-    return FALSE;
+    wxFAIL_MSG( wxT("not implemented") ); // TODO
+    return false;

 #endif
 }
 
 #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__)  || defined(__UNIX__)
     return m_impl->SetCommand(cmd, verb, overwriteprompt);
 #else
 {
 #if defined (__WXMSW__)  || defined(__UNIX__)
     return m_impl->SetCommand(cmd, verb, overwriteprompt);
 #else

-    wxFAIL_MSG(_T("not implemented"));
-    return FALSE;
+    wxUnusedVar(cmd);
+    wxUnusedVar(verb);
+    wxUnusedVar(overwriteprompt);
+    wxFAIL_MSG(wxT("not implemented"));
+    return false;

 #endif
 }
 
 #endif
 }
 


@@ -414,19 +508,46 @@ bool wxFileType::SetDefaultIcon(const wxString& cmd, int index)
     // VZ: should we do this?
     // chris elliott : only makes sense in MS windows
     if ( sTmp.empty() )
     // VZ: should we do this?
     // chris elliott : only makes sense in MS windows
     if ( sTmp.empty() )

-        GetOpenCommand(&sTmp, wxFileType::MessageParameters("", ""));
+        GetOpenCommand(&sTmp, wxFileType::MessageParameters(wxEmptyString, wxEmptyString));

 #endif
 #endif

-    wxCHECK_MSG( !sTmp.empty(), FALSE, _T("need the icon file") );
+    wxCHECK_MSG( !sTmp.empty(), false, wxT("need the icon file") );

 
 #if defined (__WXMSW__) || defined(__UNIX__)
     return m_impl->SetDefaultIcon (cmd, index);
 #else
 
 #if defined (__WXMSW__) || defined(__UNIX__)
     return m_impl->SetDefaultIcon (cmd, index);
 #else

-    wxFAIL_MSG(_T("not implemented"));
-
-    return FALSE;
+    wxUnusedVar(index);
+    wxFAIL_MSG(wxT("not implemented"));
+    return false;

 #endif
 }
 
 #endif
 }
 

+// ----------------------------------------------------------------------------
+// wxMimeTypesManagerFactory
+// ----------------------------------------------------------------------------
+
+wxMimeTypesManagerFactory *wxMimeTypesManagerFactory::m_factory = NULL;
+
+/* static */
+void wxMimeTypesManagerFactory::Set(wxMimeTypesManagerFactory *factory)
+{
+    delete m_factory;
+
+    m_factory = factory;
+}
+
+/* static */
+wxMimeTypesManagerFactory *wxMimeTypesManagerFactory::Get()
+{
+    if ( !m_factory )
+        m_factory = new wxMimeTypesManagerFactory;
+
+    return m_factory;
+}
+
+wxMimeTypesManagerImpl *wxMimeTypesManagerFactory::CreateMimeTypesManagerImpl()
+{
+    return new wxMimeTypesManagerImpl;
+}

 
 // ----------------------------------------------------------------------------
 // wxMimeTypesManager
 
 // ----------------------------------------------------------------------------
 // wxMimeTypesManager


@@ -435,7 +556,7 @@ bool wxFileType::SetDefaultIcon(const wxString& cmd, int index)
 void wxMimeTypesManager::EnsureImpl()
 {
     if ( !m_impl )
 void wxMimeTypesManager::EnsureImpl()
 {
     if ( !m_impl )

-        m_impl = new wxMimeTypesManagerImpl;
+        m_impl = wxMimeTypesManagerFactory::Get()->CreateMimeTypesManagerImpl();

 }
 
 bool wxMimeTypesManager::IsOfType(const wxString& mimeType,
 }
 
 bool wxMimeTypesManager::IsOfType(const wxString& mimeType,


@@ -444,21 +565,21 @@ bool wxMimeTypesManager::IsOfType(const wxString& mimeType,
     wxASSERT_MSG( mimeType.Find(wxT('*')) == wxNOT_FOUND,
                   wxT("first MIME type can't contain wildcards") );
 
     wxASSERT_MSG( mimeType.Find(wxT('*')) == wxNOT_FOUND,
                   wxT("first MIME type can't contain wildcards") );
 

-    // all comparaisons are case insensitive (2nd arg of IsSameAs() is FALSE)
+    // all comparaisons are case insensitive (2nd arg of IsSameAs() is false)

     if ( wildcard.BeforeFirst(wxT('/')).
     if ( wildcard.BeforeFirst(wxT('/')).

-            IsSameAs(mimeType.BeforeFirst(wxT('/')), FALSE) )
+            IsSameAs(mimeType.BeforeFirst(wxT('/')), false) )

     {
         wxString strSubtype = wildcard.AfterFirst(wxT('/'));
 
         if ( strSubtype == wxT("*") ||
     {
         wxString strSubtype = wildcard.AfterFirst(wxT('/'));
 
         if ( strSubtype == wxT("*") ||

-             strSubtype.IsSameAs(mimeType.AfterFirst(wxT('/')), FALSE) )
+             strSubtype.IsSameAs(mimeType.AfterFirst(wxT('/')), false) )

         {
             // matches (either exactly or it's a wildcard)
         {
             // matches (either exactly or it's a wildcard)

-            return TRUE;
+            return true;

         }
     }
 
         }
     }
 

-    return FALSE;
+    return false;

 }
 
 wxMimeTypesManager::wxMimeTypesManager()
 }
 
 wxMimeTypesManager::wxMimeTypesManager()


@@ -474,7 +595,9 @@ wxMimeTypesManager::~wxMimeTypesManager()
 
 bool wxMimeTypesManager::Unassociate(wxFileType *ft)
 {
 
 bool wxMimeTypesManager::Unassociate(wxFileType *ft)
 {

-#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__)
+    EnsureImpl();
+
+#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();


@@ -487,10 +610,11 @@ 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
     return m_impl->Associate(ftInfo);
 #else // other platforms

-    wxFAIL_MSG( _T("not implemented") ); // TODO
+    wxUnusedVar(ftInfo);
+    wxFAIL_MSG( wxT("not implemented") ); // TODO

     return NULL;
 #endif // platforms
 }
     return NULL;
 #endif // platforms
 }


@@ -499,7 +623,18 @@ wxFileType *
 wxMimeTypesManager::GetFileTypeFromExtension(const wxString& ext)
 {
     EnsureImpl();
 wxMimeTypesManager::GetFileTypeFromExtension(const wxString& ext)
 {
     EnsureImpl();

-    wxFileType *ft = m_impl->GetFileTypeFromExtension(ext);
+
+    wxString::const_iterator i = ext.begin();
+    const wxString::const_iterator end = ext.end();
+    wxString extWithoutDot;
+    if ( i != end && *i == '.' )
+        extWithoutDot.assign(++i, ext.end());
+    else
+        extWithoutDot = ext;
+
+    wxCHECK_MSG( !ext.empty(), NULL, wxT("extension can't be empty") );
+
+    wxFileType *ft = m_impl->GetFileTypeFromExtension(extWithoutDot);

 
     if ( !ft ) {
         // check the fallbacks
 
     if ( !ft ) {
         // check the fallbacks


@@ -525,11 +660,11 @@ wxMimeTypesManager::GetFileTypeFromMimeType(const wxString& mimeType)
     EnsureImpl();
     wxFileType *ft = m_impl->GetFileTypeFromMimeType(mimeType);
 
     EnsureImpl();
     wxFileType *ft = m_impl->GetFileTypeFromMimeType(mimeType);
 

-    if ( ft ) {
+    if ( !ft ) {

         // check the fallbacks
         //
         // check the fallbacks
         //

-        // TODO linear search is potentially slow, perhaps we should use a sorted
-        //      array?
+        // TODO linear search is potentially slow, perhaps we should use a
+        //      sorted array?

         size_t count = m_fallbacks.GetCount();
         for ( size_t n = 0; n < count; n++ ) {
             if ( wxMimeTypesManager::IsOfType(mimeType,
         size_t count = m_fallbacks.GetCount();
         for ( size_t n = 0; n < count; n++ ) {
             if ( wxMimeTypesManager::IsOfType(mimeType,


@@ -544,18 +679,6 @@ wxMimeTypesManager::GetFileTypeFromMimeType(const wxString& mimeType)
     return ft;
 }
 
     return ft;
 }
 

-bool wxMimeTypesManager::ReadMailcap(const wxString& filename, bool fallback)
-{
-    EnsureImpl();
-    return m_impl->ReadMailcap(filename, fallback);
-}
-
-bool wxMimeTypesManager::ReadMimeTypes(const wxString& filename)
-{
-    EnsureImpl();
-    return m_impl->ReadMimeTypes(filename);
-}
-

 void wxMimeTypesManager::AddFallbacks(const wxFileTypeInfo *filetypes)
 {
     EnsureImpl();
 void wxMimeTypesManager::AddFallbacks(const wxFileTypeInfo *filetypes)
 {
     EnsureImpl();


@@ -584,20 +707,20 @@ 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__)
+#if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__)

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

-       (void)mcapStyle;        
-       (void)sExtraDir;        
+    (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()
 {

-#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__)
+#if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__)

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


@@ -618,14 +741,15 @@ class wxMimeTypeCmnModule: public wxModule
 {
 public:
     wxMimeTypeCmnModule() : wxModule() { }
 {
 public:
     wxMimeTypeCmnModule() : wxModule() { }

-    virtual bool OnInit() { return TRUE; }
+
+    virtual bool OnInit() { return true; }

     virtual void OnExit()
     {
     virtual void OnExit()
     {

-        // this avoids false memory leak allerts:
+        wxMimeTypesManagerFactory::Set(NULL);
+

         if ( gs_mimeTypesManager.m_impl != NULL )
         {
         if ( gs_mimeTypesManager.m_impl != NULL )
         {

-            delete gs_mimeTypesManager.m_impl;
-            gs_mimeTypesManager.m_impl = NULL;
+            wxDELETE(gs_mimeTypesManager.m_impl);

             gs_mimeTypesManager.m_fallbacks.Clear();
         }
     }
             gs_mimeTypesManager.m_fallbacks.Clear();
         }
     }