X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd85921189610501e38fb501801b1eb6b9560fe7..31eefb998d894e3b566e13714fa53186101829a1:/include/wx/gtk1/bitmap.h?ds=sidebyside diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h index a6c24d9c06..0e5b85c9d7 100644 --- a/include/wx/gtk1/bitmap.h +++ b/include/wx/gtk1/bitmap.h @@ -11,7 +11,7 @@ #ifndef __GTKBITMAPH__ #define __GTKBITMAPH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface #endif @@ -84,6 +84,9 @@ public: wxImage ConvertToImage() const; + // copies the contents and mask of the given (colour) icon to the bitmap + virtual bool CopyFromIcon(const wxIcon& icon); + wxMask *GetMask() const; void SetMask( wxMask *mask );