added wxBitmap::GetMaskBitmap()

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

diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h
index 90bcc1e7f382d521c472e6daf3e299c0bf7e7486..b60793bbe4f3c75312ea6329145166af09afa970 100644 (file)
--- a/include/wx/msw/bitmap.h
+++ b/include/wx/msw/bitmap.h
@@ -145,6 +145,7 @@ public:
 #endif // wxUSE_PALETTE
 
     wxMask *GetMask() const;
 #endif // wxUSE_PALETTE
 
     wxMask *GetMask() const;

+    wxBitmap GetMaskBitmap() const;

     void SetMask(wxMask *mask);
 
     bool operator==(const wxBitmap& bitmap) const { return m_refData == bitmap.m_refData; }
     void SetMask(wxMask *mask);
 
     bool operator==(const wxBitmap& bitmap) const { return m_refData == bitmap.m_refData; }

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 3df871c59fa8e06aaec627e71ed2f4dff66a74ce..adb8e3f5ba33c0f45c1ec2f9074764734d19e247 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -1125,6 +1125,15 @@ wxMask *wxBitmap::GetMask() const
     return GetBitmapData() ? GetBitmapData()->GetMask() : (wxMask *) NULL;
 }
 
     return GetBitmapData() ? GetBitmapData()->GetMask() : (wxMask *) NULL;
 }
 

+wxBitmap wxBitmap::GetMaskBitmap() const
+{
+    wxBitmap bmp;
+    wxMask *mask = GetMask();
+    if ( mask )
+        bmp.SetHBITMAP(mask->GetMaskBitmap());
+    return bmp;
+}
+

 #ifdef __WXDEBUG__
 
 wxDC *wxBitmap::GetSelectedInto() const
 #ifdef __WXDEBUG__
 
 wxDC *wxBitmap::GetSelectedInto() const