Toolbar: Fix Regression with IE's Menu Bar
Robert Shearman
rob at codeweavers.com
Tue Aug 24 07:37:08 CDT 2004
Changelog:
Fix regression with IE's Menu Bar.
-------------- next part --------------
Index: wine/dlls/comctl32/toolbar.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/toolbar.c,v
retrieving revision 1.185
diff -u -p -r1.185 toolbar.c
--- wine/dlls/comctl32/toolbar.c 19 Aug 2004 19:58:49 -0000 1.185
+++ wine/dlls/comctl32/toolbar.c 24 Aug 2004 12:34:11 -0000
@@ -891,7 +891,8 @@ TOOLBAR_DrawButton (HWND hwnd, TBUTTON_I
if (lpText) {
rcText.left += GetSystemMetrics(SM_CXEDGE) + OFFSET_X;
rcText.right -= GetSystemMetrics(SM_CXEDGE) + OFFSET_X;
- if (TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap))
+ if (GETDEFIMAGELIST(infoPtr, GETHIMLID(infoPtr,btnPtr->iBitmap)) &&
+ TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap))
{
if (dwStyle & TBSTYLE_LIST)
rcText.left += infoPtr->nBitmapWidth + TOOLBAR_GetListTextOffset(infoPtr, infoPtr->iListGap);
@@ -4539,6 +4540,8 @@ TOOLBAR_SetDrawTextFlags (HWND hwnd, WPA
TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
DWORD dwTemp;
+ TRACE("hwnd = %p, dwMask = 0x%08lx, dwDTFlags = 0x%08lx\n", hwnd, (DWORD)wParam, (DWORD)lParam);
+
dwTemp = infoPtr->dwDTFlags;
infoPtr->dwDTFlags =
(infoPtr->dwDTFlags & (DWORD)wParam) | (DWORD)lParam;
@@ -5339,7 +5342,7 @@ TOOLBAR_EraseBackground (HWND hwnd, WPAR
case CDRF_SKIPDEFAULT:
return TRUE;
default:
- FIXME("[%p] response %ld not handled to NM_CUSTOMDRAW (CDDS_PREERASE)\n",
+ FIXME("[%p] response %ld not handled to NM_CUSTOMDRAW (CDDS_POSTERASE)\n",
hwnd, ntfret);
}
}
More information about the wine-patches
mailing list