X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aaf7ab431b85d817af39d1a19b6d392ff5bd9379..6a8b0d458663e48152afcf6576a057f5b8ab8be3:/include/wx/x11/icon.h diff --git a/include/wx/x11/icon.h b/include/wx/x11/icon.h index 95ec79f429..c9f867a6a7 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_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "icon.h" #endif @@ -39,7 +39,7 @@ public: wxIcon( char **bits, int width=-1, int height=-1 ); wxIcon(const wxIconLocation& loc) - : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_XPM) + : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ANY) { }