support for wxUSE_PALETTE = 0

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

diff --git a/include/wx/mac/bitmap.h b/include/wx/mac/bitmap.h
index 0f0543202ccd258e1e9657e4d61b355293e6a82d..a8e24393623d4ca3bd05f8c7553b194c54ef3073 100644 (file)
--- a/include/wx/mac/bitmap.h
+++ b/include/wx/mac/bitmap.h
@@ -6,28 +6,30 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BITMAP_H_
 #define _WX_BITMAP_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #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
   #pragma interface "bitmap.h"
 #endif
 
 #include "wx/palette.h"
 
 // Bitmap

-class WXDLLEXPORT wxDC;
-class WXDLLEXPORT wxControl;

 class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxBitmapHandler;
 class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxBitmapHandler;

-class WXDLLEXPORT wxIcon;
+class WXDLLEXPORT wxControl;

 class WXDLLEXPORT wxCursor;
 class WXDLLEXPORT wxCursor;

+class WXDLLEXPORT wxDC;
+class WXDLLEXPORT wxIcon;

 class WXDLLEXPORT wxImage;
 class WXDLLEXPORT wxImage;

+class WXDLLEXPORT wxPixelDataBase;

 
 

-// A mask is a mono bitmap used for drawing bitmaps
+// 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

 // transparently.
 class WXDLLEXPORT wxMask: public wxObject
 {
 // transparently.
 class WXDLLEXPORT wxMask: public wxObject
 {


@@ -58,8 +60,11 @@ public:
   bool PointMasked(int x, int y);
   inline WXHBITMAP GetMaskBitmap() const { return m_maskBitmap; }
   inline void SetMaskBitmap(WXHBITMAP bmp) { m_maskBitmap = bmp; }
   bool PointMasked(int x, int y);
   inline WXHBITMAP GetMaskBitmap() const { return m_maskBitmap; }
   inline void SetMaskBitmap(WXHBITMAP bmp) { m_maskBitmap = bmp; }

+  int GetDepth() const { return m_depth ; }
+  void SetDepth( int depth ) { m_depth = depth ; }

 protected:
   WXHBITMAP m_maskBitmap;
 protected:
   WXHBITMAP m_maskBitmap;

+  int m_depth ;

 };
 
 enum { kMacBitmapTypeUnknownType , kMacBitmapTypeGrafWorld, kMacBitmapTypePict , kMacBitmapTypeIcon } ;
 };
 
 enum { kMacBitmapTypeUnknownType , kMacBitmapTypeGrafWorld, kMacBitmapTypePict , kMacBitmapTypeIcon } ;


@@ -81,14 +86,17 @@ public:
   int           m_depth;
   bool          m_ok;
   int           m_numColors;
   int           m_depth;
   bool          m_ok;
   int           m_numColors;

+#if wxUSE_PALETTE

   wxPalette     m_bitmapPalette;
   wxPalette     m_bitmapPalette;

+#endif // wxUSE_PALETTE

   int           m_quality;
 
   int           m_quality;
 

-  int          m_bitmapType ;
-  WXHMETAFILE  m_hPict ;
+  int            m_bitmapType ;
+  WXHMETAFILE    m_hPict ;

   WXHBITMAP     m_hBitmap;
   WXHICON       m_hIcon ;
   wxMask *      m_bitmapMask; // Optional mask
   WXHBITMAP     m_hBitmap;
   WXHICON       m_hIcon ;
   wxMask *      m_bitmapMask; // Optional mask

+  bool          m_hasAlpha;

 };
 
 #define M_BITMAPDATA ((wxBitmapRefData *)m_refData)
 };
 
 #define M_BITMAPDATA ((wxBitmapRefData *)m_refData)


@@ -180,8 +188,10 @@ public:
   void SetQuality(int q);
   void SetOk(bool isOk);
 
   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) ;
 
   wxMask *GetMask() const;
   void SetMask(wxMask *mask) ;


@@ -193,6 +203,13 @@ public:
   inline bool operator != (const wxBitmap& bitmap) const { return m_refData != bitmap.m_refData; }
 
   static void InitStandardHandlers();
   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); }
 public:
   WXHBITMAP GetHBITMAP() const;
   inline WXHICON GetHICON() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_hIcon : 0); }