From: Karsten Ballüder Date: Tue, 30 Jun 1998 12:42:46 +0000 (+0000) Subject: Removed the WXUNUSED() from size parameters in wxIcon(filename,width,height) X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fd02ae23c24c6a3a07de4e02c93cbfb9812199b4 Removed the WXUNUSED() from size parameters in wxIcon(filename,width,height) and added default values of -1,-1 to make it compatible with MSW behaviour. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/gtk/icon.h b/include/wx/gtk/icon.h index edb7ab07fe..57951a4e38 100644 --- a/include/wx/gtk/icon.h +++ b/include/wx/gtk/icon.h @@ -41,7 +41,7 @@ public: inline wxIcon(const wxIcon& icon) { Ref(icon); } inline wxIcon(const wxIcon* icon) { if (icon) Ref(*icon); } - wxIcon( char **bits, const int WXUNUSED(width), const int WXUNUSED(height) ) : + wxIcon( char **bits, const int width = -1, const int height = -1 ) : wxBitmap( bits ) {}; inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; } diff --git a/include/wx/gtk1/icon.h b/include/wx/gtk1/icon.h index edb7ab07fe..57951a4e38 100644 --- a/include/wx/gtk1/icon.h +++ b/include/wx/gtk1/icon.h @@ -41,7 +41,7 @@ public: inline wxIcon(const wxIcon& icon) { Ref(icon); } inline wxIcon(const wxIcon* icon) { if (icon) Ref(*icon); } - wxIcon( char **bits, const int WXUNUSED(width), const int WXUNUSED(height) ) : + wxIcon( char **bits, const int width = -1, const int height = -1 ) : wxBitmap( bits ) {}; inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }