X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b13d92d1c8840feca54b00e15ad558d77bda78df..c693edf3bc9539378a7ac56d90d41d89c7dc7579:/include/wx/mimetype.h

diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h
index d79caf78af..4f34fa8dcb 100644
--- a/include/wx/mimetype.h
+++ b/include/wx/mimetype.h
@@ -9,14 +9,18 @@
 // Licence:     wxWindows license (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef   _MIMETYPE_H
-#define   _MIMETYPE_H
+#ifndef _MIMETYPE_H
+#define _MIMETYPE_H
 
 // fwd decls
 class wxIcon;
 class wxFileTypeImpl;
 class wxMimeTypesManagerImpl;
 
+#include "wx/defs.h"
+
+#if wxUSE_FILE
+
 // the things we really need
 #include "wx/string.h"
 
@@ -50,7 +54,7 @@ public:
         const wxString& GetMimeType() const { return m_mimetype; }
 
         // override this function in derived class
-        virtual wxString GetParamValue(const wxString& paramName) const
+        virtual wxString GetParamValue(const wxString& WXUNUSED(paramName)) const
             { return ""; }
 
         // virtual dtor as in any base class
@@ -110,6 +114,15 @@ private:
 class wxMimeTypesManager
 {
 public:
+    // static helper functions
+    // -----------------------
+
+        // check if the given MIME type is the same as the other one: the second
+        // argument may contain wildcards ('*'), but not the first. If the
+        // types are equal or if the mimeType matches wildcard the function
+        // returns TRUE, otherwise it returns FALSE
+    static bool IsOfType(const wxString& mimeType, const wxString& wildcard);
+
     // ctor
     wxMimeTypesManager();
 
@@ -122,12 +135,18 @@ public:
         // get file type from MIME type (in format <category>/<format>)
     wxFileType *GetFileTypeFromMimeType(const wxString& mimeType);
 
-    // other operations
+    // other operations: return TRUE if there were no errors or FALSE if there
+    // were some unreckognized entries (the good entries are always read anyhow)
         // read in additional file (the standard ones are read automatically)
         // in mailcap format (see mimetype.cpp for description)
-    void ReadMailcap(const wxString& filename);
+        //
+        // '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
-    void ReadMimeTypes(const wxString& filename);
+    bool ReadMimeTypes(const wxString& filename);
 
     // dtor (not virtual, shouldn't be derived from)
     ~wxMimeTypesManager();
@@ -140,6 +159,10 @@ private:
     wxMimeTypesManagerImpl *m_impl;
 };
 
-#endif  //_MIMETYPE_H
+#endif
+  // wxUSE_FILE
+
+#endif  
+  //_MIMETYPE_H
 
 /* vi: set cin tw=80 ts=4 sw=4: */