From: Václav Slavík Date: Sun, 26 Jan 2003 20:54:57 +0000 (+0000) Subject: use all MIME data sources on Unix, not only mailcap/mime.types X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/805f26b316f6e170226d9e91e93f8a3d82a79c70?ds=inline 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 241bdb34f9..744d112a39 100644 --- 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 07a88a5018..bfe5a7277f 100644 --- 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