X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f12c2c9555e3498d5c27c9245f1bcaec2bcd2c2..2c01d33555e3125057f4575ca7d0d2aba93f421f:/include/wx/gtk1/icon.h diff --git a/include/wx/gtk1/icon.h b/include/wx/gtk1/icon.h index 93dd3b354b..00e65f06e6 100644 --- a/include/wx/gtk1/icon.h +++ b/include/wx/gtk1/icon.h @@ -7,14 +7,9 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef __GTKICONH__ #define __GTKICONH__ -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface -#endif - #include "wx/defs.h" #include "wx/object.h" #include "wx/bitmap.h" @@ -23,13 +18,13 @@ // classes //----------------------------------------------------------------------------- -class wxIcon; +class WXDLLIMPEXP_CORE wxIcon; //----------------------------------------------------------------------------- // wxIcon //----------------------------------------------------------------------------- -class wxIcon: public wxBitmap +class WXDLLIMPEXP_CORE wxIcon: public wxBitmap { public: wxIcon(); @@ -38,7 +33,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) {