X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f12c2c9555e3498d5c27c9245f1bcaec2bcd2c2..5fae57de3aac82d13204d825e2901cdd45c1adda:/include/wx/gtk1/icon.h diff --git a/include/wx/gtk1/icon.h b/include/wx/gtk1/icon.h index 93dd3b354b..0bcbf462c0 100644 --- a/include/wx/gtk1/icon.h +++ b/include/wx/gtk1/icon.h @@ -11,7 +11,7 @@ #ifndef __GTKICONH__ #define __GTKICONH__ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface #endif @@ -38,7 +38,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) {