Refactored & cleaned up wxChoice & wxComboBox code, fixed client data

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

diff --git a/include/wx/mac/mimetype.h b/include/wx/mac/mimetype.h
index 409eb06d7aa67a1800415d199c7ff7116a387705..475267c7badd051279df5f29805b6120b20f2ee3 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
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "mimetype.h"
 #endif
 
@@ -24,7 +24,7 @@ class wxMimeTypesManagerImpl
 {
 public :
     wxMimeTypesManagerImpl() { }
-#ifdef __WXMAC_X__
+#ifdef __DARWIN__
     ~wxMimeTypesManagerImpl() { }
 #endif
  
@@ -43,8 +43,8 @@ public :
     size_t EnumAllFileTypes(wxArrayString& mimetypes);
 
     // this are NOPs under MacOS
-    bool ReadMailcap(const wxString& filename, bool fallback = TRUE) { return TRUE; }
-    bool ReadMimeTypes(const wxString& filename) { return TRUE; }
+    bool ReadMailcap(const wxString& WXUNUSED(filename), bool WXUNUSED(fallback) = TRUE) { return TRUE; }
+    bool ReadMimeTypes(const wxString& WXUNUSED(filename)) { return TRUE; }
 
     void AddFallback(const wxFileTypeInfo& ft) { m_fallbacks.Add(ft); }