X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52cbfcf009d9f2ac995280bd6f5dcf584295b67d..c91a2f7e67fae4278e2f931209aa386b5d67ae9d:/src/gtk/icon.cpp?ds=inline diff --git a/src/gtk/icon.cpp b/src/gtk/icon.cpp index 33d85df2ac..05c1089158 100644 --- a/src/gtk/icon.cpp +++ b/src/gtk/icon.cpp @@ -2,9 +2,8 @@ // Name: icon.cpp // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem +// Id: $Id$ +// Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -20,29 +19,34 @@ IMPLEMENT_DYNAMIC_CLASS(wxIcon,wxBitmap) -wxIcon::wxIcon( char **bits, int WXUNUSED(width), int WXUNUSED(height) ) : - wxBitmap( bits ) +wxIcon::wxIcon( const char **bits, int WXUNUSED(width), int WXUNUSED(height) ) : + wxBitmap( bits ) { } - -wxIcon::wxIcon() : wxBitmap() -{ + +wxIcon::wxIcon( char **bits, int WXUNUSED(width), int WXUNUSED(height) ) : + wxBitmap( bits ) +{ } -wxIcon::wxIcon(const wxIcon& icon) : wxBitmap() -{ - Ref(icon); +wxIcon::wxIcon() : wxBitmap() +{ } -wxIcon::wxIcon(const wxIcon* icon) : wxBitmap() -{ - if (icon) Ref(*icon); +wxIcon::wxIcon( const wxIcon& icon ) : wxBitmap() +{ + Ref(icon); } -wxIcon& wxIcon::operator = (const wxIcon& icon) -{ - if (*this == icon) return (*this); - Ref(icon); - return *this; +wxIcon& wxIcon::operator = ( const wxIcon& icon ) +{ + if (*this == icon) return (*this); + Ref(icon); + return *this; } +void wxIcon::CopyFromBitmap(const wxBitmap& bmp) +{ + wxIcon *icon = (wxIcon*)(&bmp); + *this = *icon; +}