1. fixed (?) blitting bitmaps with mask
2. fixed wxWindowBase compilation (oops) 3. fixed kbd handling in wxScrolledWindow under MSW git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -582,15 +582,15 @@ wxMask::~wxMask()
|
||||
// Create a mask from a mono bitmap (copies the bitmap).
|
||||
bool wxMask::Create(const wxBitmap& bitmap)
|
||||
{
|
||||
wxCHECK_MSG( bitmap.Ok() && bitmap.GetDepth() == 1, FALSE,
|
||||
_T("can't create mask from invalid or not monochrome bitmap") );
|
||||
|
||||
if ( m_maskBitmap )
|
||||
{
|
||||
::DeleteObject((HBITMAP) m_maskBitmap);
|
||||
m_maskBitmap = 0;
|
||||
}
|
||||
if (!bitmap.Ok() || bitmap.GetDepth() != 1)
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
m_maskBitmap = (WXHBITMAP) CreateBitmap(
|
||||
bitmap.GetWidth(),
|
||||
bitmap.GetHeight(),
|
||||
|
Reference in New Issue
Block a user