Toolbar bitmap mask color fix.

[Rein Klazes]

Hi,

Fix for Agent 2.0 problem: toolbar button images are displayed with
wrong mask.

Changelog:
	dlls/comctl32	: toolbar.c
	Use button face color for the image mask when adding a bitmap to
	the toolbar, not the color of the top left pixel of the image.

Rein. 
-- 
Rein Klazes
rklazes at xs4all.nl
-------------- next part --------------
--- wine/dlls/comctl32/toolbar.c	2003-11-22 19:23:40.000000000 +0100
+++ mywine/dlls/comctl32/toolbar.c	2003-11-22 21:04:46.000000000 +0100
@@ -2276,7 +2276,7 @@
        DeleteDC (hdcImage);
        DeleteDC (hdcBitmap);
 
-       nIndex = ImageList_AddMasked (himlDef, hbmLoad, CLR_DEFAULT);
+       nIndex = ImageList_AddMasked (himlDef, hbmLoad, comctl32_color.clrBtnFace);
        DeleteObject (hbmLoad);
     }
     else if (lpAddBmp->hInst == HINST_COMMCTRL)
@@ -2288,7 +2288,7 @@
 		hbmLoad = LoadBitmapA (COMCTL32_hModule,
 				       MAKEINTRESOURCEA(IDB_STD_SMALL));
 		nIndex = ImageList_AddMasked (himlDef,
-					      hbmLoad, CLR_DEFAULT);
+					      hbmLoad, comctl32_color.clrBtnFace);
 		DeleteObject (hbmLoad);
 		break;
 
@@ -2296,7 +2296,7 @@
 		hbmLoad = LoadBitmapA (COMCTL32_hModule,
 				       MAKEINTRESOURCEA(IDB_STD_LARGE));
 		nIndex = ImageList_AddMasked (himlDef,
-					      hbmLoad, CLR_DEFAULT);
+					      hbmLoad, comctl32_color.clrBtnFace);
 		DeleteObject (hbmLoad);
 		break;
 
@@ -2304,7 +2304,7 @@
 		hbmLoad = LoadBitmapA (COMCTL32_hModule,
 				       MAKEINTRESOURCEA(IDB_VIEW_SMALL));
 		nIndex = ImageList_AddMasked (himlDef,
-					      hbmLoad, CLR_DEFAULT);
+					      hbmLoad, comctl32_color.clrBtnFace);
 		DeleteObject (hbmLoad);
 		break;
 
@@ -2312,7 +2312,7 @@
 		hbmLoad = LoadBitmapA (COMCTL32_hModule,
 				       MAKEINTRESOURCEA(IDB_VIEW_LARGE));
 		nIndex = ImageList_AddMasked (himlDef,
-					      hbmLoad, CLR_DEFAULT);
+					      hbmLoad, comctl32_color.clrBtnFace);
 		DeleteObject (hbmLoad);
 		break;
 
@@ -2320,7 +2320,7 @@
 		hbmLoad = LoadBitmapA (COMCTL32_hModule,
 				       MAKEINTRESOURCEA(IDB_HIST_SMALL));
 		nIndex = ImageList_AddMasked (himlDef,
-					      hbmLoad, CLR_DEFAULT);
+					      hbmLoad, comctl32_color.clrBtnFace);
 		DeleteObject (hbmLoad);
 		break;
 
@@ -2328,7 +2328,7 @@
 		hbmLoad = LoadBitmapA (COMCTL32_hModule,
 				       MAKEINTRESOURCEA(IDB_HIST_LARGE));
 		nIndex = ImageList_AddMasked (himlDef,
-					      hbmLoad, CLR_DEFAULT);
+					      hbmLoad, comctl32_color.clrBtnFace);
 		DeleteObject (hbmLoad);
 		break;
 
@@ -2341,7 +2341,7 @@
     else
     {
 	hbmLoad = LoadBitmapA (lpAddBmp->hInst, (LPSTR)lpAddBmp->nID);
-	nIndex = ImageList_AddMasked (himlDef, hbmLoad, CLR_DEFAULT);
+	nIndex = ImageList_AddMasked (himlDef, hbmLoad, comctl32_color.clrBtnFace);
 	DeleteObject (hbmLoad);
     }
 
@@ -3890,7 +3890,7 @@
        DeleteDC (hdcImage);
        DeleteDC (hdcBitmap);
 
-       ImageList_AddMasked (himlDef, hbmLoad, CLR_DEFAULT);
+       ImageList_AddMasked (himlDef, hbmLoad, comctl32_color.clrBtnFace);
        nNewBitmaps = ImageList_GetImageCount(himlDef);
        DeleteObject (hbmLoad);
     }