Can now skip default manifest inclusion by defining wxUSE_NO_MANIFEST

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

diff --git a/include/wx/msw/mimetype.h b/include/wx/msw/mimetype.h
index 7de0730b2f359916705a3ad7fdc90c61478f7fd1..5170b63618e5c81301fd0d5b17df33f908a10830 100644 (file)
--- a/include/wx/msw/mimetype.h
+++ b/include/wx/msw/mimetype.h
@@ -6,7 +6,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 _MIMETYPE_IMPL_H
@@ -18,6 +18,8 @@
 
 #include "wx/defs.h"
 
+#if wxUSE_MIMETYPE
+
 #include "wx/mimetype.h"
 
 // ----------------------------------------------------------------------------
@@ -42,7 +44,8 @@ public:
     bool GetExtensions(wxArrayString& extensions);
     bool GetMimeType(wxString *mimeType) const;
     bool GetMimeTypes(wxArrayString& mimeTypes) const;
-    bool GetIcon(wxIcon *icon, wxString *sCommand = NULL, int *iIndex = NULL) const;
+    bool GetIcon(wxIcon *icon, wxString *sCommand = NULL, int *iIndex = NULL,
+                 int iconSize = wxICON_LARGE) const;
     bool GetDescription(wxString *desc) const;
     bool GetOpenCommand(wxString *openCmd,
                         const wxFileType::MessageParameters& params) const;
@@ -117,6 +120,7 @@ public:
     wxFileType *CreateFileType(const wxString& filetype, const wxString& ext);
 };
 
+#endif // wxUSE_MIMETYPE
 
 #endif
   //_MIMETYPE_IMPL_H