Use wxWebKitCtrlNameStr to adhere to the convention used by other wx classes.

[wxWidgets.git] / include / wx / mimetype.h

diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h
index 588b010b9ad7bc4d8b78c8cc549f3e0d3b5bf481..e47eda9a3c4f2eb03d23be74c3a8a47cdf0d2e5f 100644 (file)
--- a/include/wx/mimetype.h
+++ b/include/wx/mimetype.h
@@ -53,12 +53,12 @@ class WXDLLIMPEXP_BASE wxMimeType : public wxString
 public:
     // all string ctors here
 
 public:
     // all string ctors here
 

-    wxString GetType() const { return BeforeFirst(_T('/')); }
-    wxString GetSubType() const { return AfterFirst(_T('/')); }
+    wxString GetType() const { return BeforeFirst(wxT('/')); }
+    wxString GetSubType() const { return AfterFirst(wxT('/')); }

 
     void SetSubType(const wxString& subtype)
     {
 
     void SetSubType(const wxString& subtype)
     {

-        *this = GetType() + _T('/') + subtype;
+        *this = GetType() + wxT('/') + subtype;

     }
 
     bool Matches(const wxMimeType& wildcard)
     }
 
     bool Matches(const wxMimeType& wildcard)


@@ -125,25 +125,32 @@ private:
                       const wxString& desc,
                       va_list argptr);
 
                       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:
 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 wxScopedCharBuffer& str) : m_str(str) {}
+        CtorString(const wxScopedWCharBuffer& str) : m_str(str) {}
+
+        operator const wxString*() const { return &m_str; }
+
+        wxString m_str;
+    };
+

     // ctors
         // a normal item
 
     // ctors
         // a normal item
 


@@ -156,14 +163,11 @@ public:
     //               // just NULL!)
     //               ...);
     WX_DEFINE_VARARG_FUNC_CTOR(wxFileTypeInfo,
     //               // 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(
 #ifdef __WATCOMC__
     // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
     WX_VARARG_WATCOM_WORKAROUND_CTOR(


@@ -172,40 +176,40 @@ public:
                                     const wxString&,
                                     const wxString&,
                                     const wxString&),
                                     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&),
     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*),
     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*),
     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
 #endif
 
         // the array elements correspond to the parameters of the ctor above in


@@ -406,7 +410,7 @@ public:
 
     static void Set( wxMimeTypesManagerFactory *factory );
     static wxMimeTypesManagerFactory *Get();
 
     static void Set( wxMimeTypesManagerFactory *factory );
     static wxMimeTypesManagerFactory *Get();

-    
+

 private:
     static wxMimeTypesManagerFactory *m_factory;
 };
 private:
     static wxMimeTypesManagerFactory *m_factory;
 };


@@ -457,32 +461,13 @@ public:
         // get file type from MIME type (in format <category>/<format>)
     wxFileType *GetFileTypeFromMimeType(const wxString& mimeType);
 
         // 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
     // 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)
     //
     // The filetypes array should be terminated by either NULL entry or an
     // invalid wxFileTypeInfo (i.e. the one created with default ctor)