applied Otto Wyss' patch to extend wxHelpController::KeywordSearch with mode argument...

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

diff --git a/include/wx/mac/mimetype.h b/include/wx/mac/mimetype.h
index 35e1ba7b9b81673fb2b30ba8d5a5c5e1fdb78ae4..a65acd964ce948d7cf40a26e4960e11cfd09b54d 100644 (file)
--- a/include/wx/mac/mimetype.h
+++ b/include/wx/mac/mimetype.h
@@ -12,7 +12,7 @@
 #ifndef _MIMETYPE_IMPL_H
 #define _MIMETYPE_IMPL_H
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "mimetype.h"
 #endif
 
@@ -83,7 +83,7 @@ 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(wxIconLocation *iconLoc) const;
     bool GetDescription(wxString *desc) const;
     bool GetOpenCommand(wxString *openCmd,
                         const wxFileType::MessageParameters&) const