commit cb1c112dd69c1782ebd8209000d6be90a952b0e3
author Maxime Bellengé <maxime.bellenge@laposte.net> Sat Aug 23 23:18:48 2003 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Aug 23 23:18:48 2003 +0000
tree fd9847c9dbe93776773d0c54b652a7edf9ceb37d
parent 6af30d6994c2bb837d043905a5ccd71aadb14923

Fix the creation of treeview with checkboxes.

dlls/comctl32/treeview.c

diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index 23d9a0c..989629a 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -4825,14 +4825,18 @@
     {
 	RECT rc;
 	HBITMAP hbm, hbmOld;
-	HDC hdc;
+	HDC hdc,hdcScreen;
 	int nIndex;
 
 	infoPtr->himlState =
 	    ImageList_Create(16, 16, ILC_COLOR | ILC_MASK, 3, 0);
 
-	hdc = CreateCompatibleDC(0);
-	hbm = CreateCompatibleBitmap(hdc, 48, 16);
+	hdcScreen = CreateDCA("DISPLAY", NULL, NULL, NULL);
+
+	/* Create a coloured bitmap compatible with the screen depth
+	   because checkboxes are not black&white */
+	hdc = CreateCompatibleDC(hdcScreen);
+	hbm = CreateCompatibleBitmap(hdcScreen, 48, 16);
 	hbmOld = SelectObject(hdc, hbm);
 
 	rc.left  = 0;   rc.top    = 0;
@@ -4848,12 +4852,14 @@
 	DrawFrameControl(hdc, &rc, DFC_BUTTON,
 	                  DFCS_BUTTONCHECK|DFCS_FLAT|DFCS_CHECKED);
 
+	SelectObject(hdc, hbmOld);
 	nIndex = ImageList_AddMasked(infoPtr->himlState, hbm,
 	                              GetSysColor(COLOR_WINDOW));
-	TRACE("chckbox index %d\n", nIndex);
-	SelectObject(hdc, hbmOld);
+	TRACE("checkbox index %d\n", nIndex);
+
 	DeleteObject(hbm);
 	DeleteDC(hdc);
+	DeleteDC(hdcScreen);
 
 	infoPtr->stateImageWidth = 16;
 	infoPtr->stateImageHeight = 16;