X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58614078c466cffaf0e5d0369741706f130fb793..e46286351dbfa7ae98e8341e4fc328b134601e87:/include/wx/gtk/icon.h diff --git a/include/wx/gtk/icon.h b/include/wx/gtk/icon.h index ee31769568..e306018665 100644 --- a/include/wx/gtk/icon.h +++ b/include/wx/gtk/icon.h @@ -4,7 +4,7 @@ // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -35,9 +35,16 @@ class wxIcon: public wxBitmap public: - wxIcon(void); - wxIcon(const wxIcon& icon); - wxIcon(const wxIcon* icon); + 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, int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ): + wxBitmap(filename, type) + { + } wxIcon( char **bits, int width=-1, int height=-1 ); wxIcon& operator = (const wxIcon& icon);