Applied patch [ 740071 ] Make tiff errors/warnings use wxLog functions

[wxWidgets.git] / include / wx / x11 / icon.h

diff --git a/include/wx/x11/icon.h b/include/wx/x11/icon.h
index ee6e47fe75896b3483ab4b0acf374de19d5f2cf4..1f3314b6bdc27576c4f9b3e968863821401feb82 100644 (file)
--- a/include/wx/x11/icon.h
+++ b/include/wx/x11/icon.h
@@ -12,7 +12,7 @@
 #ifndef _WX_ICON_H_
 #define _WX_ICON_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "icon.h"
 #endif
 
@@ -31,7 +31,7 @@ public:
 
     // For compatibility with wxMSW where desired size is sometimes required to
     // distinguish between multiple icons in a resource.
-    wxIcon( const wxString& filename, int type = wxBITMAP_TYPE_XPM, 
+    wxIcon( const wxString& filename, wxBitmapType type = wxBITMAP_TYPE_XPM, 
             int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) :
         wxBitmap(filename, type)
     {