use all MIME data sources on Unix, not only mailcap/mime.types

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h
index 241bdb34f9bc289b26caf123ed1fa41779c82fd8..744d112a39796a4f3d2216c4b5ea4b19afcea252 100644 (file)
--- a/include/wx/mimetype.h
+++ b/include/wx/mimetype.h
@@ -305,7 +305,7 @@ public:
     //
     // use the extraDir parameter if you want to look for files in another
     // directory
-    void Initialize(int mailcapStyle = wxMAILCAP_STANDARD,
+    void Initialize(int mailcapStyle = wxMAILCAP_ALL,
                     const wxString& extraDir = wxEmptyString);
 
     // and this function clears all the data from the manager

diff --git a/include/wx/unix/mimetype.h b/include/wx/unix/mimetype.h
index 07a88a50187f426350ba35393701e39907f98672..bfe5a7277f09f5b3ff1fbd3346527fb8e0b74bbd 100644 (file)
--- a/include/wx/unix/mimetype.h
+++ b/include/wx/unix/mimetype.h
@@ -33,7 +33,7 @@ public:
     ~wxMimeTypesManagerImpl();
 
     // load all data into memory - done when it is needed for the first time
-    void Initialize(int mailcapStyles = wxMAILCAP_STANDARD,
+    void Initialize(int mailcapStyles = wxMAILCAP_ALL,
                     const wxString& extraDir = wxEmptyString);
 
     // and delete the data here
@@ -98,9 +98,11 @@ private:
     wxString GetCommand(const wxString &verb, size_t nIndex) const;
 
     // read Gnome files
-    void LoadGnomeDataFromKeyFile(const wxString& filename);
+    void LoadGnomeDataFromKeyFile(const wxString& filename,
+                                  const wxArrayString& dirs);
     void LoadGnomeMimeTypesFromMimeFile(const wxString& filename);
-    void LoadGnomeMimeFilesFromDir(const wxString& dirbase);
+    void LoadGnomeMimeFilesFromDir(const wxString& dirbase,
+                                   const wxArrayString& dirs);
     void GetGnomeMimeInfo(const wxString& sExtraDir);
 
     // write gnome files