X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b60c6e9776cdadbc013b4bcc5a33c7e048ed554d..e3c55eb333d273693ed2aea23da909b33e9e5484:/include/wx/cocoa/bitmap.h

diff --git a/include/wx/cocoa/bitmap.h b/include/wx/cocoa/bitmap.h
index 6b3186d1b2..f1e4146d6b 100644
--- a/include/wx/cocoa/bitmap.h
+++ b/include/wx/cocoa/bitmap.h
@@ -24,38 +24,36 @@ class WXDLLEXPORT wxPixelDataBase;
 // ========================================================================
 // wxMask
 // ========================================================================
-/* DFE: wxMask is not implemented yet */
 
-// A mask is a mono bitmap used for drawing bitmaps
-// transparently.
+// A mask is a 1-bit alpha bitmap used for drawing bitmaps transparently.
 class WXDLLEXPORT wxMask: public wxObject
 {
     DECLARE_DYNAMIC_CLASS(wxMask)
 public:
-  wxMask();
+    wxMask();
 
-  // Construct a mask from a bitmap and a colour indicating
-  // the transparent area
-  wxMask(const wxBitmap& bitmap, const wxColour& colour);
+    // Construct a mask from a bitmap and a colour indicating
+    // the transparent area
+    wxMask(const wxBitmap& bitmap, const wxColour& colour);
 
-  // Construct a mask from a bitmap and a palette index indicating
-  // the transparent area
-  wxMask(const wxBitmap& bitmap, int paletteIndex);
+    // Construct a mask from a bitmap and a palette index indicating
+    // the transparent area
+    wxMask(const wxBitmap& bitmap, int paletteIndex);
 
-  // Construct a mask from a mono bitmap (copies the bitmap).
-  wxMask(const wxBitmap& bitmap);
+    // Construct a mask from a mono bitmap (copies the bitmap).
+    wxMask(const wxBitmap& bitmap);
 
-  ~wxMask();
+    ~wxMask();
 
-  bool Create(const wxBitmap& bitmap, const wxColour& colour);
-  bool Create(const wxBitmap& bitmap, int paletteIndex);
-  bool Create(const wxBitmap& bitmap);
+    bool Create(const wxBitmap& bitmap, const wxColour& colour);
+    bool Create(const wxBitmap& bitmap, int paletteIndex);
+    bool Create(const wxBitmap& bitmap);
 
-  // Implementation
-//  inline WXHBITMAP GetMaskBitmap() const { return m_maskBitmap; }
-//  inline void SetMaskBitmap(WXHBITMAP bmp) { m_maskBitmap = bmp; }
+    // wxCocoa
+    inline WX_NSBitmapImageRep GetNSBitmapImageRep()
+    {   return m_cocoaNSBitmapImageRep; }
 protected:
-//  WXHBITMAP m_maskBitmap;
+    WX_NSBitmapImageRep m_cocoaNSBitmapImageRep;
 };
 
 // ========================================================================
@@ -88,6 +86,9 @@ public:
     // Convert from wxImage:
     wxBitmap(const wxImage& image, int depth = -1)
     {   CreateFromImage(image, depth); }
+    // Convert from wxIcon
+    wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); }
+
     // destructor
     ~wxBitmap();
   
@@ -127,6 +128,7 @@ public:
     // raw bitmap access support functions
     void *GetRawData(wxPixelDataBase& data, int bpp);
     void UngetRawData(wxPixelDataBase& data);
+    void UseAlpha();
 
     wxPalette* GetPalette() const;
     void SetPalette(const wxPalette& palette);
@@ -150,6 +152,7 @@ public:
     // wxCocoa
     WX_NSBitmapImageRep GetNSBitmapImageRep();
     void SetNSBitmapImageRep(WX_NSBitmapImageRep bitmapImageRep);
+    WX_NSImage GetNSImage(bool useMask) const;
 
     static void InitStandardHandlers() { }
     static void CleanUpHandlers() { }