added virtual dtor to wxDateTimeHolidayAuthority (patch 753947)

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

diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h
index 87c55befac2142e4daaca6fdc51480d4b07bbd6d..ee204f6de5ea57781e8ca39001330ac6f472fdc8 100644 (file)
--- a/include/wx/mimetype.h
+++ b/include/wx/mimetype.h
@@ -7,7 +7,7 @@
 // Created:     23.09.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license (part of wxExtra library)
+// Licence:     wxWindows licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MIMETYPE_H_
@@ -46,6 +46,9 @@ enum wxMailcapStyle
     wxMAILCAP_ALL = 15
 };
 
+#define wxICON_LARGE 0
+#define wxICON_SMALL 1
+
 /*
     TODO: would it be more convenient to have this class?
 
@@ -81,10 +84,10 @@ class WXDLLEXPORT wxFileTypeInfo
 public:
     // ctors
         // a normal item
-    wxFileTypeInfo(const char *mimeType,
-                   const char *openCmd,
-                   const char *printCmd,
-                   const char *desc,
+    wxFileTypeInfo(const wxChar *mimeType,
+                   const wxChar *openCmd,
+                   const wxChar *printCmd,
+                   const wxChar *desc,
                    // the other parameters form a NULL terminated list of
                    // extensions
                    ...);
@@ -214,7 +217,8 @@ public:
         // in this file (Win-only) is in iconIndex
     bool GetIcon(wxIcon *icon,
                  wxString *iconFile = NULL,
-                 int *iconIndex = NULL) const;
+                 int *iconIndex = NULL,
+                 int iconSize = wxICON_LARGE) const;
         // get a brief file type description ("*.txt" => "text document")
     bool GetDescription(wxString *desc) const;
 
@@ -305,7 +309,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