Started the work to handle checkboxes. For now, we draw just a red rectangle; when we do events this will change color dynamically. When I hook up the control to its parent, I will move from these rectangles to the actual checkbox images. In the meantime, fix some pointer bugs in imagelist_windows.c as well.

1 files changed, 3 insertions, 3 deletions

diff --git a/wintable/imagelist_windows.c b/wintable/imagelist_windows.c
index 2527d16..e194f49 100644
--- a/wintable/imagelist_windows.c
+++ b/wintable/imagelist_windows.c
@@ -157,14 +157,14 @@ static HIMAGELIST newCheckboxImageList(HWND hwnddc, void (*sizefunc)(HDC, int *,
 	dc = GetDC(hwnddc);
 	if (dc == NULL)
 		xpanic("error getting DC for making the checkbox image list", GetLastError());
-	(*sizefunc)(dc, &width, &height, theme);
-	il = ImageList_Create(width, height, ILC_COLOR32, 20, 20);		// should be reasonable
+	(*sizefunc)(dc, width, height, theme);
+	il = ImageList_Create(*width, *height, ILC_COLOR32, 20, 20);		// should be reasonable
 	if (il == NULL)
 		xpanic("error creating checkbox image list", GetLastError());
 	for (cbState = 0; cbState < checkboxnStates; cbState++) {
 		HBITMAP bitmap;
 
-		bitmap = makeCheckboxImageListEntry(dc, width, height, cbState, drawfunc, theme);
+		bitmap = makeCheckboxImageListEntry(dc, *width, *height, cbState, drawfunc, theme);
 		if (ImageList_Add(il, bitmap, NULL) == -1)
 			xpanic("error adding checkbox image to image list", GetLastError());
 		if (DeleteObject(bitmap) == 0)