add wxMask::GetBitmap(), closes #9381

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-20 06:28:11 +00:00
parent 3e118784c7
commit 5ca21fe7bf
13 changed files with 95 additions and 47 deletions
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -1173,12 +1173,10 @@ wxMask *wxBitmap::GetMask() const
    return GetBitmapData() ? GetBitmapData()->GetMask() : NULL;
 }

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