]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/mimecmn.cpp
Sun CC doesn't allow calling static function from template instantiations so rename...
[wxWidgets.git] / src / common / mimecmn.cpp
index 1db9b7176cdba07982261324fbeb6f68057bc082..21eb8f5c0f254264d83416dc1c92a31afaaa7057 100644 (file)
@@ -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,15 +112,12 @@ wxString wxMimeTypeCommands::GetVerbCmd(size_t n) const
 // wxFileTypeInfo
 // ----------------------------------------------------------------------------
 
-void wxFileTypeInfo::VarArgInit(const wxString& mimeType,
-                                const wxString& openCmd,
-                                const wxString& printCmd,
-                                const wxString& 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;
@@ -146,9 +144,46 @@ void wxFileTypeInfo::VarArgInit(const wxString& mimeType,
 
         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)