Mercurial > dwindows
comparison win/dw.c @ 1822:8d231cab845d
Fixed the Windows toolbar code to actually work... had some leftovers
from a copy and paste that were clobbering the image list variables.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Fri, 26 Oct 2012 04:54:48 +0000 |
parents | ece7befa9f3d |
children | 10c59bb2c47f |
comparison
equal
deleted
inserted
replaced
1821:69f9aa1e1b1e | 1822:8d231cab845d |
---|---|
6650 BITMAP bmi = { 0 }; | 6650 BITMAP bmi = { 0 }; |
6651 | 6651 |
6652 if(hbitmap) | 6652 if(hbitmap) |
6653 { | 6653 { |
6654 GetObject(hbitmap, sizeof(BITMAP), &bmi); | 6654 GetObject(hbitmap, sizeof(BITMAP), &bmi); |
6655 imlist = ImageList_Create(bmi.bmWidth, bmi.bmHeight, ILC_COLOR32, 1, 0); | |
6656 ImageList_Replace(imlist, 0, hbitmap, NULL); | 6655 ImageList_Replace(imlist, 0, hbitmap, NULL); |
6657 dimlist = ImageList_Create(bmi.bmWidth, bmi.bmHeight, ILC_COLOR32, 1, 0); | |
6658 _to_grayscale(hbitmap, bmi.bmWidth, bmi.bmHeight); | 6656 _to_grayscale(hbitmap, bmi.bmWidth, bmi.bmHeight); |
6659 ImageList_Replace(dimlist, 0, hbitmap, NULL); | 6657 ImageList_Replace(dimlist, 0, hbitmap, NULL); |
6660 DeleteObject(hbitmap); | 6658 DeleteObject(hbitmap); |
6661 } | 6659 } |
6662 else if(icon) | 6660 else if(icon) |
6663 { | 6661 { |
6664 ICONINFO iconinfo; | 6662 ICONINFO iconinfo; |
6665 | 6663 |
6666 GetIconInfo(icon, &iconinfo); | 6664 GetIconInfo(icon, &iconinfo); |
6667 GetObject(iconinfo.hbmColor, sizeof(BITMAP), &bmi); | 6665 GetObject(iconinfo.hbmColor, sizeof(BITMAP), &bmi); |
6668 imlist = ImageList_Create(bmi.bmWidth, bmi.bmHeight, ILC_COLOR32 | ILC_MASK, 1, 0); | |
6669 ImageList_ReplaceIcon(imlist, 0, icon); | 6666 ImageList_ReplaceIcon(imlist, 0, icon); |
6670 dimlist = ImageList_Create(bmi.bmWidth, bmi.bmHeight, ILC_COLOR32 | ILC_MASK, 1, 0); | |
6671 _to_grayscale(iconinfo.hbmColor, bmi.bmWidth, bmi.bmHeight); | 6667 _to_grayscale(iconinfo.hbmColor, bmi.bmWidth, bmi.bmHeight); |
6672 ImageList_Replace(dimlist, 0, iconinfo.hbmColor, iconinfo.hbmMask); | 6668 ImageList_Replace(dimlist, 0, iconinfo.hbmColor, iconinfo.hbmMask); |
6673 DeleteObject(iconinfo.hbmColor); | 6669 DeleteObject(iconinfo.hbmColor); |
6674 DeleteObject(iconinfo.hbmMask); | 6670 DeleteObject(iconinfo.hbmMask); |
6675 DestroyIcon(icon); | 6671 DestroyIcon(icon); |