X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9d804ebea801ce6268b962999410c2b21fad617..c26dba42b75b2c19df5834417ffbe330bc375b20:/include/wx/mac/bitmap.h?ds=sidebyside

diff --git a/include/wx/mac/bitmap.h b/include/wx/mac/bitmap.h
index c1a98f8563..a8e2439362 100644
--- a/include/wx/mac/bitmap.h
+++ b/include/wx/mac/bitmap.h
@@ -12,20 +12,21 @@
 #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
 
 #include "wx/palette.h"
 
 // Bitmap
-class WXDLLEXPORT wxDC;
-class WXDLLEXPORT wxControl;
 class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxBitmapHandler;
-class WXDLLEXPORT wxIcon;
+class WXDLLEXPORT wxControl;
 class WXDLLEXPORT wxCursor;
+class WXDLLEXPORT wxDC;
+class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxImage;
+class WXDLLEXPORT wxPixelDataBase;
 
 // A mask is a bitmap used for drawing bitmaps
 // it can be a monochrome bitmap or a multi-bit bitmap which transfers to alpha channels
@@ -85,7 +86,9 @@ public:
   int           m_depth;
   bool          m_ok;
   int           m_numColors;
+#if wxUSE_PALETTE
   wxPalette     m_bitmapPalette;
+#endif // wxUSE_PALETTE
   int           m_quality;
 
   int            m_bitmapType ;
@@ -93,6 +96,7 @@ public:
   WXHBITMAP     m_hBitmap;
   WXHICON       m_hIcon ;
   wxMask *      m_bitmapMask; // Optional mask
+  bool          m_hasAlpha;
 };
 
 #define M_BITMAPDATA ((wxBitmapRefData *)m_refData)
@@ -184,8 +188,10 @@ public:
   void SetQuality(int q);
   void SetOk(bool isOk);
 
-  wxPalette* GetPalette() const;
-  void SetPalette(const wxPalette& palette);
+#if wxUSE_PALETTE
+   wxPalette* GetPalette() const;
+   void SetPalette(const wxPalette& palette);
+#endif // wxUSE_PALETTE
 
   wxMask *GetMask() const;
   void SetMask(wxMask *mask) ;
@@ -197,6 +203,13 @@ public:
   inline bool operator != (const wxBitmap& bitmap) const { return m_refData != bitmap.m_refData; }
 
   static void InitStandardHandlers();
+
+    // raw bitmap access support functions, for internal use only
+    void *GetRawData(wxPixelDataBase& data, int bpp);
+    void UngetRawData(wxPixelDataBase& data);
+
+    void UseAlpha();
+
 public:
   WXHBITMAP GetHBITMAP() const;
   inline WXHICON GetHICON() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_hIcon : 0); }