adding metafile and clipboard support

[wxWidgets.git] / src / mac / carbon / mimetmac.cpp

diff --git a/src/mac/carbon/mimetmac.cpp b/src/mac/carbon/mimetmac.cpp
index 296c7a81baebad9a1b5b0f6a37569c63055fe88b..29449a6b60b45012af074abd2191b46f3a738f58 100644 (file)
--- a/src/mac/carbon/mimetmac.cpp
+++ b/src/mac/carbon/mimetmac.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
 

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

 #pragma implementation "mimetype.h"
 #endif
 
 #pragma implementation "mimetype.h"
 #endif
 


@@ -20,10 +20,6 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-  #include "wx/defs.h"
-#endif
-

 #ifndef WX_PRECOMP
   #include "wx/string.h"
   #if wxUSE_GUI
 #ifndef WX_PRECOMP
   #include "wx/string.h"
   #if wxUSE_GUI


@@ -92,7 +88,7 @@ bool wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const
         return FALSE;
 }
 
         return FALSE;
 }
 

-bool wxFileTypeImpl::GetIcon(wxIcon *icon,  wxString *sCommand, int *iIndex) const
+bool wxFileTypeImpl::GetIcon(wxIconLocation *WXUNUSED(icon)) const

 {
     // no such file type or no value or incorrect icon entry
     return FALSE;
 {
     // no such file type or no value or incorrect icon entry
     return FALSE;