removed relic: GetMaxLineWidth

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

diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h
index 70d3342c60044d1f9902fdfccca98ae86ab4f952..ca17706d16e5b944cf684dbb1d97d080842f862e 100644 (file)
--- a/include/wx/mimetype.h
+++ b/include/wx/mimetype.h
@@ -32,11 +32,7 @@ class wxMimeTypesManagerImpl;
 // the accessors *must* be checked!
 class WXDLLEXPORT wxFileType
 {
 // the accessors *must* be checked!
 class WXDLLEXPORT wxFileType
 {

-#ifdef __MWERKS__
-friend class wxMimeTypesManagerImpl;  // it has access to m_impl
-#else
-friend wxMimeTypesManagerImpl;  // it has access to m_impl
-#endif
+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
 
 public:
     // An object of this class must be passed to Get{Open|Print}Command. The


@@ -194,6 +190,11 @@ public:
         // read in additional file in mime.types format
     bool ReadMimeTypes(const wxString& filename);
 
         // 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
     // 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