Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

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

diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp
index bbd1d1e86d2e9605af180dde24b00fe28beb7311..f159809a84b46db8c4e4fd9b235e2db690c98177 100644 (file)
--- a/src/common/mimecmn.cpp
+++ b/src/common/mimecmn.cpp
@@ -48,8 +48,8 @@
 // implementation classes:
 #if defined(__WXMSW__)
     #include "wx/msw/mimetype.h"
 // implementation classes:
 #if defined(__WXMSW__)
     #include "wx/msw/mimetype.h"

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

 #elif defined(__WXPM__) || defined (__EMX__)
     #include "wx/os2/mimetype.h"
     #undef __UNIX__
 #elif defined(__WXPM__) || defined (__EMX__)
     #include "wx/os2/mimetype.h"
     #undef __UNIX__


@@ -146,44 +146,19 @@ void wxFileTypeInfo::DoVarArgInit(const wxString& mimeType,
     }
 }
 
     }
 }
 

-// NB: DoVarArgInit uses WX_VA_ARG_STRING macro to extract the string and this
-//     macro interprets the argument as char* or wchar_t* depending on build
-//     (and in UTF8 build, on the current locale). Because only one of the
-//     vararg forms below is called and the decision about which one gets
-//     called depends on the same conditions WX_VA_ARG_STRING uses, we can
-//     implement both of them in the exact same way:
-
-#if !wxUSE_UTF8_LOCALE_ONLY
-void wxFileTypeInfo::VarArgInitWchar(const wxChar *mimeType,
-                                     const wxChar *openCmd,
-                                     const wxChar *printCmd,
-                                     const wxChar *desc,
-                                     ...)
-{
-    va_list argptr;
-    va_start(argptr, desc);
-
-    DoVarArgInit(mimeType, openCmd, printCmd, desc, argptr);
-
-    va_end(argptr);
-}
-#endif // !wxUSE_UTF8_LOCALE_ONLY
-
-#if wxUSE_UNICODE_UTF8
-void wxFileTypeInfo::VarArgInitUtf8(const char *mimeType,
-                                    const char *openCmd,
-                                    const char *printCmd,
-                                    const char *desc,
-                                    ...)
+void wxFileTypeInfo::VarArgInit(const wxString *mimeType,
+                                const wxString *openCmd,
+                                const wxString *printCmd,
+                                const wxString *desc,
+                                ...)

 {
     va_list argptr;
     va_start(argptr, desc);
 
 {
     va_list argptr;
     va_start(argptr, desc);
 

-    DoVarArgInit(mimeType, openCmd, printCmd, desc, argptr);
+    DoVarArgInit(*mimeType, *openCmd, *printCmd, *desc, argptr);

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

-#endif // wxUSE_UNICODE_UTF8

 
 
 wxFileTypeInfo::wxFileTypeInfo(const wxArrayString& sArray)
 
 
 wxFileTypeInfo::wxFileTypeInfo(const wxArrayString& sArray)


@@ -217,22 +192,28 @@ wxString wxFileType::ExpandCommand(const wxString& command,
 {
     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();
+                    else
+                        str << params.GetFileName();

                     hasFilename = true;
                     break;
 
                     hasFilename = true;
                     break;
 


@@ -287,10 +268,16 @@ wxString wxFileType::ExpandCommand(const wxString& command,
     // test now carried out on reading file so test should never get here
     if ( !hasFilename && !str.empty()
 #ifdef __UNIX__
     // test now carried out on reading file so test should never get here
     if ( !hasFilename && !str.empty()
 #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;


@@ -327,7 +314,7 @@ 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 )
     {
 
     if ( m_info )
     {


@@ -391,7 +378,7 @@ wxFileType::GetIcon(wxIconLocation *iconloc,
 
 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 )
     {
 
     if ( m_info )
     {


@@ -407,7 +394,7 @@ 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 )
     {
 
     if ( m_info )
     {


@@ -435,7 +422,7 @@ bool
 wxFileType::GetPrintCommand(wxString *printCmd,
                             const wxFileType::MessageParameters& params) const
 {
 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 )
     {
 
     if ( m_info )
     {


@@ -467,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++;


@@ -476,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);
 


@@ -494,7 +481,7 @@ bool wxFileType::Unassociate()
 #elif defined(__UNIX__)
     return m_impl->Unassociate(this);
 #else
 #elif defined(__UNIX__)
     return m_impl->Unassociate(this);
 #else

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

     return false;
 #endif
 }
     return false;
 #endif
 }


@@ -509,7 +496,7 @@ bool wxFileType::SetCommand(const wxString& cmd,
     wxUnusedVar(cmd);
     wxUnusedVar(verb);
     wxUnusedVar(overwriteprompt);
     wxUnusedVar(cmd);
     wxUnusedVar(verb);
     wxUnusedVar(overwriteprompt);

-    wxFAIL_MSG(_T("not implemented"));
+    wxFAIL_MSG(wxT("not implemented"));

     return false;
 #endif
 }
     return false;
 #endif
 }


@@ -523,13 +510,13 @@ bool wxFileType::SetDefaultIcon(const wxString& cmd, int index)
     if ( sTmp.empty() )
         GetOpenCommand(&sTmp, wxFileType::MessageParameters(wxEmptyString, wxEmptyString));
 #endif
     if ( sTmp.empty() )
         GetOpenCommand(&sTmp, wxFileType::MessageParameters(wxEmptyString, wxEmptyString));
 #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
     wxUnusedVar(index);
 
 #if defined (__WXMSW__) || defined(__UNIX__)
     return m_impl->SetDefaultIcon (cmd, index);
 #else
     wxUnusedVar(index);

-    wxFAIL_MSG(_T("not implemented"));
+    wxFAIL_MSG(wxT("not implemented"));

     return false;
 #endif
 }
     return false;
 #endif
 }


@@ -627,7 +614,7 @@ wxMimeTypesManager::Associate(const wxFileTypeInfo& ftInfo)
     return m_impl->Associate(ftInfo);
 #else // other platforms
     wxUnusedVar(ftInfo);
     return m_impl->Associate(ftInfo);
 #else // other platforms
     wxUnusedVar(ftInfo);

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

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


@@ -645,7 +632,7 @@ wxMimeTypesManager::GetFileTypeFromExtension(const wxString& ext)
     else
         extWithoutDot = ext;
 
     else
         extWithoutDot = ext;
 

-    wxCHECK_MSG( !ext.empty(), NULL, _T("extension can't be empty") );
+    wxCHECK_MSG( !ext.empty(), NULL, wxT("extension can't be empty") );

 
     wxFileType *ft = m_impl->GetFileTypeFromExtension(extWithoutDot);
 
 
     wxFileType *ft = m_impl->GetFileTypeFromExtension(extWithoutDot);
 


@@ -692,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();


@@ -774,8 +749,7 @@ public:
 
         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();
         }
     }