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

correct a bug in the MSW code using wxMask

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Unknown (AN)
1998-12-10 22:41:43 +00:00
parent c9f8e0e22e
commit 650368d057
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/common/image.cpp
View File

@@ -1108,27 +1108,27 @@ wxBitmap wxImage::ConvertToBitmap() const
{ {
if( (*(ptdata++)!=r) | (*(ptdata++)!=g) | (*(ptdata++)!=b) ) if( (*(ptdata++)!=r) | (*(ptdata++)!=g) | (*(ptdata++)!=b) )
{ {
*(ptbits++) = zero; *(ptbits++) = one;
*(ptbits++) = zero; *(ptbits++) = one;
*(ptbits++) = zero; *(ptbits++) = one;
} }
else else
{ {
*(ptbits++) = one; *(ptbits++) = zero;
*(ptbits++) = one; *(ptbits++) = zero;
*(ptbits++) = one; *(ptbits++) = zero;
} }
} }
hbitmap = ::CreateBitmap( (WORD)width, (WORD)height, 1, 1, NULL ); hbitmap = ::CreateBitmap( (WORD)width, (WORD)height, 1, 1, NULL );
::SetDIBits( hdc, hbitmap, 0, (WORD)height, lpBits, lpDIBh, DIB_RGB_COLORS); ::SetDIBits( hdc, hbitmap, 0, (WORD)height, lpBits, lpDIBh, DIB_RGB_COLORS);
wxMask bmpmask; wxMask *mask = new wxMask();
bmpmask.SetMaskBitmap( (WXHBITMAP) hbitmap ); mask->SetMaskBitmap( (WXHBITMAP) hbitmap );
bitmap.SetMask( &bmpmask ); bitmap.SetMask( mask );
/* The following can also be used but is slow to run /* The following can also be used but is slow to run
wxColour colour( GetMaskRed(), GetMaskGreen(), GetMaskBlue()); wxColour colour( GetMaskRed(), GetMaskGreen(), GetMaskBlue());
wxMask bmpmask( bitmap, colour ); wxMask *mask = new wxMask( bitmap, colour );
bitmap.SetMask( &bmpmask ); bitmap.SetMask( mask );
*/ */
} }