get rid of wxMimeTypesManager::ReadMailcap and wxMimeTypesManager::ReadMimeTypes...

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

diff --git a/include/wx/msdos/mimetype.h b/include/wx/msdos/mimetype.h
index 9b084621398e1927952ea47b5a4c6eec3d5a1491..39a6ac6041d88e67f1e34291748591c7a577d134 100644 (file)
--- a/include/wx/msdos/mimetype.h
+++ b/include/wx/msdos/mimetype.h
@@ -35,10 +35,6 @@ public :
 
     size_t EnumAllFileTypes(wxArrayString& mimetypes);
 
-    // this are NOPs under MacOS
-    bool ReadMailcap(const wxString& WXUNUSED(filename), bool WXUNUSED(fallback) = TRUE) { return TRUE; }
-    bool ReadMimeTypes(const wxString& WXUNUSED(filename)) { return TRUE; }
-
     void AddFallback(const wxFileTypeInfo& ft) { m_fallbacks.Add(ft); }
 
     // create a new filetype association

diff --git a/include/wx/os2/mimetype.h b/include/wx/os2/mimetype.h
index 75000e99f6287b95ee2e657894201fee1775afaa..48f3a43a66b26ece650aabb9511230281647d0ca 100644 (file)
--- a/include/wx/os2/mimetype.h
+++ b/include/wx/os2/mimetype.h
@@ -96,12 +96,6 @@ public:
 
     size_t EnumAllFileTypes(wxArrayString& mimetypes);
 
-    // these are NOPs under OS/2
-    bool ReadMailcap(const wxString& WXUNUSED(filename), bool WXUNUSED(fallback) = true)
-        { return true; }
-    bool ReadMimeTypes(const wxString& WXUNUSED(filename))
-        { return true; }
-
     void AddFallback(const wxFileTypeInfo& ft) { m_fallbacks.Add(ft); }
 
 private:

diff --git a/include/wx/palmos/mimetype.h b/include/wx/palmos/mimetype.h
index a7065682f307d4c4503d7ad5502378c6b5ae4202..1f76d6ff567ab26e2db681029072eef2df92796c 100644 (file)
--- a/include/wx/palmos/mimetype.h
+++ b/include/wx/palmos/mimetype.h
@@ -102,12 +102,6 @@ public:
 
     size_t EnumAllFileTypes(wxArrayString& mimetypes);
 
-    // this are NOPs under Windows
-    bool ReadMailcap(const wxString& WXUNUSED(filename), bool WXUNUSED(fallback) = TRUE)
-        { return TRUE; }
-    bool ReadMimeTypes(const wxString& WXUNUSED(filename))
-        { return TRUE; }
-
     // create a new filetype association
     wxFileType *Associate(const wxFileTypeInfo& ftInfo);
 

diff --git a/interface/wx/mimetype.h b/interface/wx/mimetype.h
index dc2244c1d5946769826878873db1ad415ddf6ffe..ad6b738b24230354ee1c05cdcb3bfd315d1e19c7 100644 (file)
--- a/interface/wx/mimetype.h
+++ b/interface/wx/mimetype.h
@@ -9,21 +9,23 @@
 /**
     @class wxMimeTypesManager
 
-    This class allows the application to retrieve the information about all known
+    This class allows the application to retrieve informations about all known
     MIME types from a system-specific location and the filename extensions to the
-    MIME types and vice versa. After initialization the functions
-    GetFileTypeFromMimeType() and GetFileTypeFromExtension()
-    may be called: they will return a wxFileType object which may be further
-    queried for file description, icon and other attributes.
-
+    MIME types and vice versa. 
+    
+    MIME stands for "Multipurpose Internet Mail Extensions" and was originally
+    used in mail protocols. It's standardized by several RFCs.
+    
     Under Windows, the MIME type information is queried from registry.
     Under Linux and Unix, it is queried from the XDG data directories.
 
-    Currently, wxMimeTypesManager is limited to reading MIME type information.
+    Currently, wxMimeTypesManager is limited to @e reading MIME type information.
 
     The application should not construct its own manager: it should use the
-    object pointer ::wxTheMimeTypesManger.
-
+    object pointer ::wxTheMimeTypesManager.
+    The functions GetFileTypeFromMimeType() and GetFileTypeFromExtension()
+    return a wxFileType object which may be further queried for file description, 
+    icon and other attributes.
 
     @section mimetypemanager_helpers Helper functions
 
@@ -34,39 +36,16 @@
 
     - wxMimeTypesManager::IsOfType()
 
-
-    @section mimetypemanager_ctor Constructor and destructor
-
-    NB: You won't normally need to use more than one wxMimeTypesManager object
-    in a program.
-
-    - wxMimeTypesManager::wxMimeTypesManager()
-    - wxMimeTypesManager::~wxMimeTypesManager()
-
-
     @section mimetypemanager_query Query database
 
     These functions are the heart of this class: they allow to find a file type
     object from either file extension or MIME type.
     If the function is successful, it returns a pointer to the wxFileType object
-    which must be deleted by the caller, otherwise NULL will be returned.
+    which must be deleted by the caller, otherwise @NULL will be returned.
 
     - wxMimeTypesManager::GetFileTypeFromMimeType()
     - wxMimeTypesManager::GetFileTypeFromExtension()
 
-
-    @section mimetypemanager_init Initialization functions
-
-    Unix: These functions may be used to load additional files (except for the
-    default ones which are loaded automatically) containing MIME information in
-    either mailcap(5) or mime.types(5) format.
-
-    - wxMimeTypesManager::ReadMailcap()
-    - wxMimeTypesManager::ReadMimeTypes()
-    - wxMimeTypesManager::AddFallbacks()
-
-
-
     @library{wxbase}
     @category{cfg}