undo the last change as it results in buildbot configuration error

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

diff --git a/interface/wx/mimetype.h b/interface/wx/mimetype.h
index ae5abb790eebf0f7420e54f53f0b9f0586ed910b..dc2244c1d5946769826878873db1ad415ddf6ffe 100644 (file)
--- a/interface/wx/mimetype.h
+++ b/interface/wx/mimetype.h
@@ -68,7 +68,7 @@
 
 
     @library{wxbase}
-    @category{misc}
+    @category{cfg}
 
     @see wxFileType
 */
@@ -228,19 +228,25 @@ wxMimeTypesManager* wxTheMimeTypesManager;
 
 
     @library{wxbase}
-    @category{misc}
+    @category{data}
 
     @see wxMimeTypesManager
 */
 class wxFileType
 {
-public:
+private:
     /**
         The default constructor is private because you should never create objects of
         this type: they are only returned by wxMimeTypesManager methods.
     */
     wxFileType();
 
+public:
+    /**
+        Copy ctor.
+    */
+    wxFileType(const wxFileTypeInfo& ftInfo);
+
     /**
         The destructor of this class is not virtual, so it should not be derived from.
     */
@@ -265,7 +271,7 @@ public:
         function.
     */
     static wxString ExpandCommand(const wxString& command,
-                                  MessageParameters& params);
+                                  const MessageParameters& params);
 
     /**
         If the function returns @true, the string pointed to by @a desc is filled
@@ -318,7 +324,7 @@ public:
         This happens when one file extension is mapped to different MIME types
         by KDE, mailcap and mime.types.
     */
-    bool GetMimeType(wxArrayString& mimeTypes);
+    bool GetMimeTypes(wxArrayString& mimeTypes) const;
 
     //@{
     /**
@@ -334,8 +340,8 @@ public:
         indicate that an error occurred (typically meaning that there is no standard way
         to open this kind of files).
     */
-    bool GetOpenCommand(wxString* command, MessageParameters& params);
-    wxString GetOpenCommand(const wxString& filename);
+    bool GetOpenCommand(wxString* command, const MessageParameters& params);
+    wxString GetOpenCommand(const wxString& filename) const;
     //@}
 
     /**
@@ -345,6 +351,7 @@ public:
 
         The name of the file is retrieved from the MessageParameters class.
     */
-    bool GetPrintCommand(wxString* command, MessageParameters& params);
+    bool GetPrintCommand(wxString* command,
+                         const MessageParameters& params) const;
 };