* Implement the wxMask copy constructor to retain the source object's

  m_cocoaNSBitmapImageRep (fixes multiple release bug).
* Add some debug messages for unimplemented wxMask::Create overloads.
* Implement mask creation w/ key color from 8-bpp grayscale bitmap.
  This makes the mask image in the drawing sample's mask page work.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/cocoa/bitmap.h b/include/wx/cocoa/bitmap.h
index 866b51a984d7e22c4f97a4d86dd77f244e595d35..ca2b3b07759934b8bfb66c9f583af838c61ef175 100644 (file)
--- a/include/wx/cocoa/bitmap.h
+++ b/include/wx/cocoa/bitmap.h
@@ -43,6 +43,9 @@ public:
     // 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);
 

+    // Copy constructor
+    wxMask(const wxMask& src);
+

     virtual ~wxMask();
 
     bool Create(const wxBitmap& bitmap, const wxColour& colour);
     virtual ~wxMask();
 
     bool Create(const wxBitmap& bitmap, const wxColour& colour);

diff --git a/src/cocoa/bitmap.mm b/src/cocoa/bitmap.mm
index ff0cb8cd36aaf035a9d179ba5194f1cbf73d834e..b16ba01087db8b9b7b6902c3d7b331a067d967c8 100644 (file)
--- a/src/cocoa/bitmap.mm
+++ b/src/cocoa/bitmap.mm
@@ -519,6 +519,13 @@ wxMask::wxMask(const wxBitmap& bitmap)
     Create(bitmap);
 }
 
     Create(bitmap);
 }
 

+// Copy constructor
+wxMask::wxMask(const wxMask& src)
+:   wxObject(src)
+,   m_cocoaNSBitmapImageRep([src.m_cocoaNSBitmapImageRep retain])
+{
+}
+

 wxMask::~wxMask()
 {
     [m_cocoaNSBitmapImageRep release];
 wxMask::~wxMask()
 {
     [m_cocoaNSBitmapImageRep release];


@@ -528,6 +535,7 @@ wxMask::~wxMask()
 bool wxMask::Create(const wxBitmap& bitmap)
 {
 // TODO
 bool wxMask::Create(const wxBitmap& bitmap)
 {
 // TODO

+    wxLogDebug("Cannot yet create a mask from a mono bitmap");

     return FALSE;
 }
 
     return FALSE;
 }
 


@@ -536,6 +544,7 @@ bool wxMask::Create(const wxBitmap& bitmap)
 bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
 {
 // TODO
 bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
 {
 // TODO

+    wxLogDebug("Cannot yet create a mask from a palette bitmap");

     return FALSE;
 }
 
     return FALSE;
 }
 


@@ -642,6 +651,14 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
         wxCHECK_MSG(wxMask_CreateFromBitmapData(pixelData, colour, dstData),
             false, wxT("Unable to access raw data"));
     }
         wxCHECK_MSG(wxMask_CreateFromBitmapData(pixelData, colour, dstData),
             false, wxT("Unable to access raw data"));
     }

+    else if([srcBitmapRep bitsPerPixel]==8 && [srcBitmapRep bitsPerSample]==8 && [srcBitmapRep samplesPerPixel]==1 && [srcBitmapRep hasAlpha]==NO)
+    // 8-bpp Grayscale, no alpha
+    {   // Force all RGB to access the same grayscale component
+        typedef wxPixelFormat<unsigned char,8,0,0,0> PixelFormat;
+        wxPixelData<wxBitmap,PixelFormat> pixelData(const_cast<wxBitmap&>(bitmap));
+        wxCHECK_MSG(wxMask_CreateFromBitmapData(pixelData, colour, dstData),
+            false, wxT("Unable to access raw data"));
+    }

     else
     {   wxCHECK_MSG(false,false,wxT("Unimplemented pixel format")); }
 
     else
     {   wxCHECK_MSG(false,false,wxT("Unimplemented pixel format")); }