fixed warnings after GetFont prototype change

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

diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h
index 59071d6d30ddd039e25ea712eb5a603472073935..38ee6138a8e7327281913b8764fcb3252183645f 100644 (file)
--- a/include/wx/mimetype.h
+++ b/include/wx/mimetype.h
@@ -13,7 +13,7 @@
 #ifndef _WX_MIMETYPE_H_
 #define _WX_MIMETYPE_H_
 
 #ifndef _WX_MIMETYPE_H_
 #define _WX_MIMETYPE_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "mimetypebase.h"
 #endif // __GNUG__
 
     #pragma interface "mimetypebase.h"
 #endif // __GNUG__
 


@@ -212,6 +212,8 @@ public:
     bool GetExtensions(wxArrayString& extensions);
         // get the icon corresponding to this file type and of the given size
     bool GetIcon(wxIconLocation *iconloc) const;
     bool GetExtensions(wxArrayString& extensions);
         // get the icon corresponding to this file type and of the given size
     bool GetIcon(wxIconLocation *iconloc) const;

+    bool GetIcon(wxIconLocation *iconloc,
+                 const MessageParameters& params) const;

         // get a brief file type description ("*.txt" => "text document")
     bool GetDescription(wxString *desc) const;
 
         // get a brief file type description ("*.txt" => "text document")
     bool GetDescription(wxString *desc) const;
 


@@ -385,7 +387,7 @@ private:
 // global variables
 // ----------------------------------------------------------------------------
 
 // global variables
 // ----------------------------------------------------------------------------
 

-// the default mime manager for wxWindows programs
+// the default mime manager for wxWidgets programs

 WXDLLIMPEXP_DATA_BASE(extern wxMimeTypesManager *) wxTheMimeTypesManager;
 
 #endif // wxUSE_MIMETYPE
 WXDLLIMPEXP_DATA_BASE(extern wxMimeTypesManager *) wxTheMimeTypesManager;
 
 #endif // wxUSE_MIMETYPE