Digital Mars compilation warnings and Unicode fixes (patch 884587)

[wxWidgets.git] / include / wx / mac / bitmap.h

diff --git a/include/wx/mac/bitmap.h b/include/wx/mac/bitmap.h
index 0a0537bb6f50724f0248d08c732943fd07e2cba8..759cccfe1bcc13ede9198ebbf06eb3833c79b0f3 100644 (file)
--- 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);