#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()
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
+ void VarArgInit(const wxString *mimeType,
+ const wxString *openCmd,
+ const wxString *printCmd,
+ const wxString *desc,
+ // the other parameters form a NULL terminated list of
+ // extensions
+ ...);
+
public:
+ // NB: This is a helper to get implicit conversion of variadic ctor's
+ // fixed arguments into something that can be passed to VarArgInit().
+ // Do not use, it's used by the ctor only.
+ struct WXDLLIMPEXP_BASE CtorString
+ {
+ CtorString(const char *str) : m_str(str) {}
+ CtorString(const wchar_t *str) : m_str(str) {}
+ CtorString(const wxString& str) : m_str(str) {}
+ CtorString(const wxCStrData& str) : m_str(str) {}
+ CtorString(const wxCharBuffer& str) : m_str(str) {}
+ CtorString(const wxWCharBuffer& str) : m_str(str) {}
+
+ operator const wxString*() const { return &m_str; }
+
+ wxString m_str;
+ };
+
// ctors
// a normal item
// // 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)
+ 4, (const CtorString&,
+ const CtorString&,
+ const CtorString&,
+ const CtorString&),
+ VarArgInit, VarArgInit)
#ifdef __WATCOMC__
// workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
WX_VARARG_WATCOM_WORKAROUND_CTOR(
const wxString&,
const wxString&,
const wxString&),
- (wxFormatString(f1),
- wxFormatString(f2),
- wxFormatString(f3),
- wxFormatString(f4)));
+ (CtorString(f1),
+ CtorString(f2),
+ CtorString(f3),
+ CtorString(f4)));
WX_VARARG_WATCOM_WORKAROUND_CTOR(
wxFileTypeInfo,
4, (const wxCStrData&,
const wxCStrData&,
const wxCStrData&,
const wxCStrData&),
- (wxFormatString(f1),
- wxFormatString(f2),
- wxFormatString(f3),
- wxFormatString(f4)));
+ (CtorString(f1),
+ CtorString(f2),
+ CtorString(f3),
+ CtorString(f4)));
WX_VARARG_WATCOM_WORKAROUND_CTOR(
wxFileTypeInfo,
4, (const char*,
const char*,
const char*,
const char*),
- (wxFormatString(f1),
- wxFormatString(f2),
- wxFormatString(f3),
- wxFormatString(f4)));
+ (CtorString(f1),
+ CtorString(f2),
+ CtorString(f3),
+ CtorString(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)));
+ (CtorString(f1),
+ CtorString(f2),
+ CtorString(f3),
+ CtorString(f4)));
#endif
// the array elements correspond to the parameters of the ctor above in
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
// get file type from MIME type (in format <category>/<format>)
wxFileType *GetFileTypeFromMimeType(const wxString& mimeType);
- // other operations: return true if there were no errors or false if there
- // were some unrecognized entries (the good entries are always read anyhow)
- //
- // FIXME: These ought to be private ??
-
- // read in additional file (the standard ones are read automatically)
- // in mailcap format (see mimetype.cpp for description)
- //
- // 'fallback' parameter may be set to true to avoid overriding the
- // settings from other, previously parsed, files by this one: normally,
- // the files read most recently would override the older files, but with
- // fallback == true this won't happen
-
- bool ReadMailcap(const wxString& filename, bool fallback = false);
- // read in additional file in mime.types format
- bool ReadMimeTypes(const wxString& filename);
-
// enumerate all known MIME types
//
// returns the number of retrieved file types
size_t EnumAllFileTypes(wxArrayString& mimetypes);
// these functions can be used to provide default values for some of the
- // MIME types inside the program itself (you may also use
- // ReadMailcap(filenameWithDefaultTypes, true /* use as fallback */) to
- // achieve the same goal, but this requires having this info in a file).
+ // MIME types inside the program itself
//
// The filetypes array should be terminated by either NULL entry or an
// invalid wxFileTypeInfo (i.e. the one created with default ctor)
projects / wxWidgets.git / blobdiff