X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a893b65e6282e4b96126b3fd22eeab43d446be4b..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/mimetype.h diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h index 59369ba565..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 + // 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() @@ -82,20 +84,7 @@ public: } // add a new verb with the command or replace the old value - void 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; - } - } - + void AddOrReplaceVerb(const wxString& verb, const wxString& cmd); void Add(const wxString& s) { m_verbs.Add(s.BeforeFirst(wxT('='))); @@ -110,31 +99,11 @@ public: bool HasVerb(const wxString& verb) const { return m_verbs.Index(verb) != wxNOT_FOUND; } - wxString GetCommandForVerb(const wxString& verb, size_t *idx = NULL) 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; - } + // returns empty string and wxNOT_FOUND in idx if no such verb + wxString GetCommandForVerb(const wxString& verb, size_t *idx = NULL) const; // get a "verb=command" string - wxString GetVerbCmd(size_t n) const - { - return m_verbs[n] + wxT('=') + m_commands[n]; - } + wxString GetVerbCmd(size_t n) const; private: wxArrayString m_verbs; @@ -149,16 +118,95 @@ private: class WXDLLIMPEXP_BASE wxFileTypeInfo { +private: + 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 - wxFileTypeInfo(const wxChar *mimeType, - const wxChar *openCmd, - const wxChar *printCmd, - const wxChar *desc, - // the other parameters form a NULL terminated list of - // extensions - ...); + + // wxFileTypeInfo(const wxString& mimeType, + // const wxString& openCmd, + // const wxString& printCmd, + // const wxString& desc, + // // 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, + // 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_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 // the same order @@ -236,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