# HG changeset patch # User bsmith@81767d24-ef19-dc11-ae90-00e081727c95 # Date 1081663123 0 # Node ID d940dc1ff46242b2fcad198c525e80d13f33278f # Parent 7564772060069014f71ccc495b1a5c51b533f52e Initial code to support icons in dw_bitmapbutton_new() but it doesn't seem to like my 20x20 icons. :( diff -r 756477206006 -r d940dc1ff462 win/dw.c --- a/win/dw.c Sun Apr 11 04:39:04 2004 +0000 +++ b/win/dw.c Sun Apr 11 05:58:43 2004 +0000 @@ -4501,6 +4501,7 @@ HWND tmp; BubbleButton *bubble = calloc(1, sizeof(BubbleButton)); HBITMAP hbitmap = LoadBitmap(DWInstance, MAKEINTRESOURCE(id)); + HICON icon = LoadIcon(DWInstance, MAKEINTRESOURCE(id)); tmp = CreateWindow(BUTTONCLASSNAME, "", @@ -4520,9 +4521,18 @@ SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)bubble); - SendMessage(tmp, BM_SETIMAGE, - (WPARAM) IMAGE_BITMAP, - (LPARAM) hbitmap); + if(icon) + { + SendMessage(tmp, BM_SETIMAGE, + (WPARAM) IMAGE_ICON, + (LPARAM) icon); + } + else if(hbitmap) + { + SendMessage(tmp, BM_SETIMAGE, + (WPARAM) IMAGE_BITMAP, + (LPARAM) hbitmap); + } return tmp; }