X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e52f60e65236befe1a509cc3c1823607be0d2b3c..1978421a6d8b81c1f8a961da4b8ddf544fec7b1b:/src/gtk/icon.cpp?ds=inline diff --git a/src/gtk/icon.cpp b/src/gtk/icon.cpp index 37ce52b757..ef9780a56c 100644 --- a/src/gtk/icon.cpp +++ b/src/gtk/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,34 +22,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; +}