X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a11672a469f036436838911c268cb2f8d5da5bf8..0fc7f695cea35b94832e03cbf2a0e74998293ba2:/include/wx/x11/icon.h diff --git a/include/wx/x11/icon.h b/include/wx/x11/icon.h index ee6e47fe75..1f3314b6bd 100644 --- 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) {