X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2523e9b70044baa92a1c63ffdfe179c28ad53536..7da37f2c5d7addc655e3c6bcd29a8877c360b35b:/include/wx/mimetype.h

diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h
index 2a38d413ca..588b010b9a 100644
--- a/include/wx/mimetype.h
+++ b/include/wx/mimetype.h
@@ -26,10 +26,12 @@
 #include "wx/dynarray.h"
 #include "wx/arrstr.h"
 
+#include <stdarg.h>
+
 // fwd decls
-class WXDLLIMPEXP_BASE wxIconLocation;
-class WXDLLIMPEXP_BASE wxFileTypeImpl;
-class WXDLLIMPEXP_BASE wxMimeTypesManagerImpl;
+class WXDLLIMPEXP_FWD_BASE wxIconLocation;
+class WXDLLIMPEXP_FWD_BASE wxFileTypeImpl;
+class WXDLLIMPEXP_FWD_BASE wxMimeTypesManagerImpl;
 
 // these constants define the MIME informations source under UNIX and are used
 // by wxMimeTypesManager::Initialize()
@@ -117,13 +119,30 @@ private:
 class WXDLLIMPEXP_BASE wxFileTypeInfo
 {
 private:
-    void VarArgInit(const wxString& mimeType,
-                    const wxString& openCmd,
-                    const wxString& printCmd,
-                    const wxString& desc,
-                    // the other parameters form a NULL terminated list of
-                    // extensions
-                    ...);
+    void DoVarArgInit(const wxString& mimeType,
+                      const wxString& openCmd,
+                      const wxString& printCmd,
+                      const wxString& desc,
+                      va_list argptr);
+
+#if !wxUSE_UTF8_LOCALE_ONLY
+    void VarArgInitWchar(const wxChar *mimeType,
+                         const wxChar *openCmd,
+                         const wxChar *printCmd,
+                         const wxChar *desc,
+                         // the other parameters form a NULL terminated list of
+                         // extensions
+                         ...);
+#endif
+#if wxUSE_UNICODE_UTF8
+    void VarArgInitUtf8(const char *mimeType,
+                        const char *openCmd,
+                        const char *printCmd,
+                        const char *desc,
+                        // the other parameters form a NULL terminated list of
+                        // extensions
+                        ...);
+#endif
 public:
     // ctors
         // a normal item
@@ -132,27 +151,61 @@ public:
     //               const wxString& openCmd,
     //               const wxString& printCmd,
     //               const wxString& desc,
-    //               // the other parameters form a NULL terminated list of
-    //               // extensions
+    //               // the other parameters form a list of extensions for this
+    //               // file type and should be terminated with wxNullPtr (not
+    //               // just NULL!)
     //               ...);
     WX_DEFINE_VARARG_FUNC_CTOR(wxFileTypeInfo,
-                               4, (const wxString&, const wxString&,
-                                   const wxString&, const wxString&),
-                               VarArgInit)
+                               // NB: these are not format strings, using
+                               //     wxFormatString here is a hack to get
+                               //     implicit conversion to wchar_t*/char*
+                               4, (const wxFormatString&,
+                                   const wxFormatString&,
+                                   const wxFormatString&,
+                                   const wxFormatString&),
+                               VarArgInitWchar, VarArgInitUtf8)
 #ifdef __WATCOMC__
     // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
-    WX_DEFINE_VARARG_FUNC_CTOR(wxFileTypeInfo,
-                               4, (const char*, const char*,
-                                   const char*, const char*),
-                               VarArgInit)
-    WX_DEFINE_VARARG_FUNC_CTOR(wxFileTypeInfo,
-                               4, (const wchar_t*, const wchar_t*,
-                                   const wchar_t*, const wchar_t*),
-                               VarArgInit)
-    WX_DEFINE_VARARG_FUNC_CTOR(wxFileTypeInfo,
-                               4, (const wxCStrData&, const wxCStrData&,
-                                   const wxCStrData&, const wxCStrData&),
-                               VarArgInit)
+    WX_VARARG_WATCOM_WORKAROUND_CTOR(
+                                wxFileTypeInfo,
+                                4, (const wxString&,
+                                    const wxString&,
+                                    const wxString&,
+                                    const wxString&),
+                                (wxFormatString(f1),
+                                 wxFormatString(f2),
+                                 wxFormatString(f3),
+                                 wxFormatString(f4)));
+    WX_VARARG_WATCOM_WORKAROUND_CTOR(
+                                wxFileTypeInfo,
+                                4, (const wxCStrData&,
+                                    const wxCStrData&,
+                                    const wxCStrData&,
+                                    const wxCStrData&),
+                                (wxFormatString(f1),
+                                 wxFormatString(f2),
+                                 wxFormatString(f3),
+                                 wxFormatString(f4)));
+    WX_VARARG_WATCOM_WORKAROUND_CTOR(
+                                wxFileTypeInfo,
+                                4, (const char*,
+                                    const char*,
+                                    const char*,
+                                    const char*),
+                                (wxFormatString(f1),
+                                 wxFormatString(f2),
+                                 wxFormatString(f3),
+                                 wxFormatString(f4)));
+    WX_VARARG_WATCOM_WORKAROUND_CTOR(
+                                wxFileTypeInfo,
+                                4, (const wchar_t*,
+                                    const wchar_t*,
+                                    const wchar_t*,
+                                    const wchar_t*),
+                                (wxFormatString(f1),
+                                 wxFormatString(f2),
+                                 wxFormatString(f3),
+                                 wxFormatString(f4)));
 #endif
 
         // the array elements correspond to the parameters of the ctor above in
@@ -231,7 +284,7 @@ WX_DECLARE_USER_EXPORTED_OBJARRAY(wxFileTypeInfo, wxArrayFileTypeInfo,
 
 class WXDLLIMPEXP_BASE wxFileType
 {
-friend class WXDLLIMPEXP_BASE wxMimeTypesManagerImpl;  // it has access to m_impl
+friend class WXDLLIMPEXP_FWD_BASE wxMimeTypesManagerImpl;  // it has access to m_impl
 
 public:
     // An object of this class must be passed to Get{Open|Print}Command. The