1. wxFileDialog patch for multiple selection applied (with some small changes),

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

diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h
index e71b6c3890edaa7fd99c48bb8cb257180f3f8217..ca17706d16e5b944cf684dbb1d97d080842f862e 100644 (file)
--- a/include/wx/mimetype.h
+++ b/include/wx/mimetype.h
@@ -32,7 +32,7 @@ class wxMimeTypesManagerImpl;
 // the accessors *must* be checked!
 class WXDLLEXPORT wxFileType
 {
-friend wxMimeTypesManagerImpl;  // it has access to m_impl
+friend class WXDLLEXPORT wxMimeTypesManagerImpl;  // it has access to m_impl
 
 public:
     // An object of this class must be passed to Get{Open|Print}Command. The
@@ -120,13 +120,25 @@ public:
                    // the other parameters form a NULL terminated list of
                    // extensions
                    ...);
-                   
+
         // invalid item - use this to terminate the array passed to
         // wxMimeTypesManager::AddFallbacks
     wxFileTypeInfo() { }
 
     bool IsValid() const { return !m_mimeType.IsEmpty(); }
 
+    // accessors
+        // get the MIME type
+    const wxString& GetMimeType() const { return m_mimeType; }
+        // get the open command
+    const wxString& GetOpenCommand() const { return m_openCmd; }
+        // get the print command
+    const wxString& GetPrintCommand() const { return m_printCmd; }
+        // get the description
+    const wxString& GetDescription() const { return m_desc; }
+        // get the array of all extensions
+    const wxArrayString& GetExtensions() const { return m_exts; }
+
 private:
     wxString m_mimeType,    // the MIME type in "type/subtype" form
              m_openCmd,     // command to use for opening the file (%s allowed)
@@ -178,6 +190,11 @@ public:
         // 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
@@ -187,7 +204,7 @@ public:
     // function.
     //
     // The filetypes array should be terminated by a NULL entry
-    bool AddFallbacks(const wxFileTypeInfo *filetypes);
+    void AddFallbacks(const wxFileTypeInfo *filetypes);
 
     // dtor (not virtual, shouldn't be derived from)
     ~wxMimeTypesManager();