X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/71451a6d16cdf35293089a4dfb235604769c18c6..6f026b5b63fe7ccb025e84509886f74772b9df13:/src/generic/icon.cpp?ds=inline diff --git a/src/generic/icon.cpp b/src/generic/icon.cpp index 0e79576a15..ffe0335ad0 100644 --- a/src/generic/icon.cpp +++ b/src/generic/icon.cpp @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: // Created: 17/09/98 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -24,15 +23,17 @@ IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap) -wxIcon::wxIcon( const char **bits, int WXUNUSED(width), int WXUNUSED(height) ) : +wxIcon::wxIcon(const char* const* bits) : wxBitmap( bits ) { } -wxIcon::wxIcon( char **bits, int WXUNUSED(width), int WXUNUSED(height) ) : +#ifdef wxNEEDS_CHARPP +wxIcon::wxIcon(char **bits) : wxBitmap( bits ) { } +#endif wxIcon::wxIcon() : wxBitmap() {