X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55e18dbe2faca047b2008734782d52a6eb140115..4f8ffae1099d921986411f59bdbd62b764b0491f:/include/wx/mac/bitmap.h?ds=sidebyside diff --git a/include/wx/mac/bitmap.h b/include/wx/mac/bitmap.h index 0a0537bb6f..759cccfe1b 100644 --- a/include/wx/mac/bitmap.h +++ b/include/wx/mac/bitmap.h @@ -12,7 +12,7 @@ #ifndef _WX_BITMAP_H_ #define _WX_BITMAP_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "bitmap.h" #endif @@ -94,6 +94,7 @@ public: WXHBITMAP m_hBitmap; WXHICON m_hIcon ; wxMask * m_bitmapMask; // Optional mask + bool m_hasAlpha; }; #define M_BITMAPDATA ((wxBitmapRefData *)m_refData) @@ -199,7 +200,7 @@ public: static void InitStandardHandlers(); - // raw bitmap access support functions + // raw bitmap access support functions, for internal use only void *GetRawData(wxPixelDataBase& data, int bpp); void UngetRawData(wxPixelDataBase& data);