X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..51f5e2822cdcb8b433b1d117f186dfd8bb06e240:/include/wx/gtk1/icon.h diff --git a/include/wx/gtk1/icon.h b/include/wx/gtk1/icon.h index f55707a19c..f93b45ac12 100644 --- a/include/wx/gtk1/icon.h +++ b/include/wx/gtk1/icon.h @@ -1,20 +1,15 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: icon.h +// Name: wx/gtk1/icon.h // Purpose: // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef __GTKICONH__ #define __GTKICONH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface -#endif - #include "wx/defs.h" #include "wx/object.h" #include "wx/bitmap.h" @@ -23,22 +18,21 @@ // classes //----------------------------------------------------------------------------- -class wxIcon; +class WXDLLIMPEXP_CORE wxIcon; //----------------------------------------------------------------------------- // wxIcon //----------------------------------------------------------------------------- -class wxIcon: public wxBitmap +class WXDLLIMPEXP_CORE wxIcon: public wxBitmap { public: wxIcon(); - wxIcon( const wxIcon& icon); wxIcon( const char **bits, int width=-1, int height=-1 ); // 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) { @@ -50,7 +44,6 @@ public: { } - wxIcon& operator=(const wxIcon& icon); bool operator==(const wxIcon& icon) const { return m_refData == icon.m_refData; } bool operator!=(const wxIcon& icon) const { return !(*this == icon); }