X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e32eea148dafadbdd0712377c1b5038406ffde5..f11af0933155f94c7de5934738b0407c89e16e3f:/include/wx/mimetype.h

diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h
index ced6b00150..2a38d413ca 100644
--- a/include/wx/mimetype.h
+++ b/include/wx/mimetype.h
@@ -13,10 +13,6 @@
 #ifndef _WX_MIMETYPE_H_
 #define _WX_MIMETYPE_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "mimetypebase.h"
-#endif // __GNUG__
-
 // ----------------------------------------------------------------------------
 // headers and such
 // ----------------------------------------------------------------------------
@@ -28,6 +24,7 @@
 // the things we really need
 #include "wx/string.h"
 #include "wx/dynarray.h"
+#include "wx/arrstr.h"
 
 // fwd decls
 class WXDLLIMPEXP_BASE wxIconLocation;
@@ -70,6 +67,47 @@ public:
 
 */
 
+// wxMimeTypeCommands stores the verbs defined for the given MIME type with
+// their values
+class WXDLLIMPEXP_BASE wxMimeTypeCommands
+{
+public:
+    wxMimeTypeCommands() {}
+
+    wxMimeTypeCommands(const wxArrayString& verbs,
+                       const wxArrayString& commands)
+        : m_verbs(verbs),
+          m_commands(commands)
+    {
+    }
+
+    // add a new verb with the command or replace the old value
+    void AddOrReplaceVerb(const wxString& verb, const wxString& cmd);
+    void Add(const wxString& s)
+    {
+        m_verbs.Add(s.BeforeFirst(wxT('=')));
+        m_commands.Add(s.AfterFirst(wxT('=')));
+    }
+
+    // access the commands
+    size_t GetCount() const { return m_verbs.GetCount(); }
+    const wxString& GetVerb(size_t n) const { return m_verbs[n]; }
+    const wxString& GetCmd(size_t n) const { return m_commands[n]; }
+
+    bool HasVerb(const wxString& verb) const
+        { return m_verbs.Index(verb) != wxNOT_FOUND; }
+
+    // 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;
+
+private:
+    wxArrayString m_verbs;
+    wxArrayString m_commands;
+};
+
 // ----------------------------------------------------------------------------
 // wxFileTypeInfo: static container of information accessed via wxFileType.
 //
@@ -78,16 +116,44 @@ public:
 
 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
+                    ...);
 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 NULL terminated list of
+    //               // extensions
+    //               ...);
+    WX_DEFINE_VARARG_FUNC_CTOR(wxFileTypeInfo,
+                               4, (const wxString&, const wxString&,
+                                   const wxString&, const wxString&),
+                               VarArgInit)
+#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)
+#endif
 
         // the array elements correspond to the parameters of the ctor above in
         // the same order
@@ -98,7 +164,7 @@ public:
     wxFileTypeInfo() { }
 
     // test if this object can be used
-    bool IsValid() const { return !m_mimeType.IsEmpty(); }
+    bool IsValid() const { return !m_mimeType.empty(); }
 
     // setters
         // set the icon info
@@ -123,7 +189,7 @@ public:
     const wxString& GetDescription() const { return m_desc; }
         // get the array of all extensions
     const wxArrayString& GetExtensions() const { return m_exts; }
-    int GetExtensionsCount() const {return m_exts.GetCount(); }
+    size_t GetExtensionsCount() const {return m_exts.GetCount(); }
         // get the icon info
     const wxString& GetIconFile() const { return m_iconFile; }
     int GetIconIndex() const { return m_iconIndex; }
@@ -273,6 +339,25 @@ private:
     wxFileTypeImpl *m_impl;
 };
 
+//----------------------------------------------------------------------------
+// wxMimeTypesManagerFactory
+//----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxMimeTypesManagerFactory
+{
+public:
+    wxMimeTypesManagerFactory() {}
+    virtual ~wxMimeTypesManagerFactory() {}
+
+    virtual wxMimeTypesManagerImpl *CreateMimeTypesManagerImpl();
+
+    static void Set( wxMimeTypesManagerFactory *factory );
+    static wxMimeTypesManagerFactory *Get();
+    
+private:
+    static wxMimeTypesManagerFactory *m_factory;
+};
+
 // ----------------------------------------------------------------------------
 // wxMimeTypesManager: interface to system MIME database.
 //
@@ -320,7 +405,7 @@ public:
     wxFileType *GetFileTypeFromMimeType(const wxString& mimeType);
 
     // other operations: return true if there were no errors or false if there
-    // were some unreckognized entries (the good entries are always read anyhow)
+    // were some unrecognized entries (the good entries are always read anyhow)
     //
     // FIXME: These ought to be private ??
 
@@ -388,7 +473,7 @@ private:
 // ----------------------------------------------------------------------------
 
 // the default mime manager for wxWidgets programs
-WXDLLIMPEXP_DATA_BASE(extern wxMimeTypesManager *) wxTheMimeTypesManager;
+extern WXDLLIMPEXP_DATA_BASE(wxMimeTypesManager *) wxTheMimeTypesManager;
 
 #endif // wxUSE_MIMETYPE