X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e52f60e65236befe1a509cc3c1823607be0d2b3c..5d6c4365363f84bf587c7f5f916e5830ef8a11e3:/src/gtk1/icon.cpp diff --git a/src/gtk1/icon.cpp b/src/gtk1/icon.cpp index 37ce52b757..05c1089158 100644 --- a/src/gtk1/icon.cpp +++ b/src/gtk1/icon.cpp @@ -19,34 +19,34 @@ IMPLEMENT_DYNAMIC_CLASS(wxIcon,wxBitmap) -wxIcon::wxIcon( const 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( char **bits, int WXUNUSED(width), int WXUNUSED(height) ) : - wxBitmap( bits ) + +wxIcon::wxIcon( char **bits, int WXUNUSED(width), int WXUNUSED(height) ) : + wxBitmap( bits ) { } - -wxIcon::wxIcon() : wxBitmap() -{ -} -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; +{ + if (*this == icon) return (*this); + Ref(icon); + return *this; } +void wxIcon::CopyFromBitmap(const wxBitmap& bmp) +{ + wxIcon *icon = (wxIcon*)(&bmp); + *this = *icon; +}