X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bde733b0c646954653799d75d839960af3bd0d39..69659fd770f615210efac4b4fa741b3ad6223616:/src/common/mimecmn.cpp?ds=sidebyside

diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp
index 9325fb81c3..bbd1d1e86d 100644
--- a/src/common/mimecmn.cpp
+++ b/src/common/mimecmn.cpp
@@ -35,6 +35,7 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/module.h"
+    #include "wx/crt.h"
 #endif //WX_PRECOMP
 
 #include "wx/file.h"
@@ -111,18 +112,16 @@ wxString wxMimeTypeCommands::GetVerbCmd(size_t n) const
 // wxFileTypeInfo
 // ----------------------------------------------------------------------------
 
-wxFileTypeInfo::wxFileTypeInfo(const wxChar *mimeType,
-                               const wxChar *openCmd,
-                               const wxChar *printCmd,
-                               const wxChar *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 ( ;; )
     {
@@ -132,7 +131,7 @@ wxFileTypeInfo::wxFileTypeInfo(const wxChar *mimeType,
     #pragma warning(disable: 1684)
 #endif
 
-        const wxChar *ext = va_arg(argptr, const wxChar *);
+        wxArgNormalizedString ext(WX_VA_ARG_STRING(argptr));
 
 #ifdef __INTELC__
     #pragma warning(pop)
@@ -143,11 +142,48 @@ wxFileTypeInfo::wxFileTypeInfo(const wxChar *mimeType,
             break;
         }
 
-        m_exts.Add(ext);
+        m_exts.Add(ext.GetString());
     }
+}
+
+// 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,
+                                    ...)
+{
+    va_list argptr;
+    va_start(argptr, desc);
+
+    DoVarArgInit(mimeType, openCmd, printCmd, desc, argptr);
+
+    va_end(argptr);
+}
+#endif // wxUSE_UNICODE_UTF8
 
 
 wxFileTypeInfo::wxFileTypeInfo(const wxArrayString& sArray)
@@ -600,7 +636,18 @@ wxFileType *
 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, _T("extension can't be empty") );
+
+    wxFileType *ft = m_impl->GetFileTypeFromExtension(extWithoutDot);
 
     if ( !ft ) {
         // check the fallbacks