X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a81258bee4e20d3fa9b3d2f6bf3bcd1200d1e5e0..d8809820cc7aa3a38355b65cd4cb1d4040cfb499:/src/gtk1/icon.cpp diff --git a/src/gtk1/icon.cpp b/src/gtk1/icon.cpp index 94952e31ff..ef9780a56c 100644 --- a/src/gtk1/icon.cpp +++ b/src/gtk1/icon.cpp @@ -7,10 +7,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "icon.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/icon.h" //----------------------------------------------------------------------------- @@ -19,29 +22,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; +}