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

Convert alpha (if any) to mask in wxBitmapToIconOrCursor. Note that

Browse Source 
it is possible to put alpha in the icon instead of using a mask, but I
don't have time to figure that out today.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2005-05-31 23:53:09 +00:00
parent 3b2a000ef5
commit 0806fc2071
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/msw/bitmap.cpp
View File

@@ -1639,7 +1639,23 @@ HICON wxBitmapToIconOrCursor(const wxBitmap& bmp,
return 0;
}
wxMask *mask = bmp.GetMask();
wxMask* mask;
wxBitmap newbmp;
if ( bmp.HasAlpha() )
{
// Convert alpha to a mask. NOTE: It would be better to actually put
// the alpha into the icon instead of making a mask, but I don't have
// time to figure that out today.
wxImage img = bmp.ConvertToImage();
img.ConvertAlphaToMask();
newbmp = wxBitmap(img);
mask = newbmp.GetMask();
}
else
{
mask = bmp.GetMask();
}
if ( !mask )
{
// we must have a mask for an icon, so even if it's probably incorrect,
@@ -1676,7 +1692,7 @@ HICON wxBitmapToIconOrCursor(const wxBitmap& bmp,
HICON hicon = ::CreateIconIndirect(&iconInfo);
if ( !bmp.GetMask() )
if ( !bmp.GetMask() && !bmp.HasAlpha() )
{
// we created the mask, now delete it
delete mask;