X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aaf7ab431b85d817af39d1a19b6d392ff5bd9379..d8fd7acb8b877599b410e07a4c26dde92a676a82:/include/wx/x11/icon.h diff --git a/include/wx/x11/icon.h b/include/wx/x11/icon.h index 95ec79f429..b9e749f2f8 100644 --- a/include/wx/x11/icon.h +++ b/include/wx/x11/icon.h @@ -12,17 +12,13 @@ #ifndef _WX_ICON_H_ #define _WX_ICON_H_ -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface "icon.h" -#endif - #include "wx/bitmap.h" //----------------------------------------------------------------------------- // wxIcon //----------------------------------------------------------------------------- -class wxIcon: public wxBitmap +class WXDLLIMPEXP_CORE wxIcon: public wxBitmap { public: wxIcon(); @@ -39,7 +35,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) { }