Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no real changes, just move wxMask::GetBitmap() to wxMask section

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2013-01-20 06:38:43 +00:00
parent 5ca21fe7bf
commit feabb2ebeb
2 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/msw/bitmap.cpp
View File

@@ -1173,13 +1173,6 @@ wxMask *wxBitmap::GetMask() const
return GetBitmapData() ? GetBitmapData()->GetMask() : NULL;
}
wxBitmap wxMask::GetBitmap() const
{
wxBitmap bmp;
bmp.SetHBITMAP(m_maskBitmap);
return bmp;
}
wxDC *wxBitmap::GetSelectedInto() const
{
#if wxDEBUG_LEVEL
@@ -1547,6 +1540,13 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
#endif // __WXMICROWIN__/!__WXMICROWIN__
}
wxBitmap wxMask::GetBitmap() const
{
wxBitmap bmp;
bmp.SetHBITMAP(m_maskBitmap);
return bmp;
}
// ----------------------------------------------------------------------------
// wxBitmapHandler
// ----------------------------------------------------------------------------