Skip to content

W
wine-winehq
Commit f1ae41c7 authored by Robert Shearman's avatar Robert Shearman Committed by Alexandre Julliard
Browse files
Options

Fix regression with IE's Menu Bar.

parent 174e6a5d
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
dlls/comctl32/toolbar.c
View file @ f1ae41c7
...@@ -891,7 +891,8 @@ TOOLBAR_DrawButton (HWND hwnd, TBUTTON_INFO *btnPtr, HDC hdc) ...@@ -891,7 +891,8 @@ TOOLBAR_DrawButton (HWND hwnd, TBUTTON_INFO *btnPtr, HDC hdc)
if (lpText) { if (lpText) {
rcText.left += GetSystemMetrics(SM_CXEDGE) + OFFSET_X; rcText.left += GetSystemMetrics(SM_CXEDGE) + OFFSET_X;
rcText.right -= 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) if (dwStyle & TBSTYLE_LIST)
rcText.left += infoPtr->nBitmapWidth + TOOLBAR_GetListTextOffset(infoPtr, infoPtr->iListGap); rcText.left += infoPtr->nBitmapWidth + TOOLBAR_GetListTextOffset(infoPtr, infoPtr->iListGap);
...@@ -4539,6 +4540,8 @@ TOOLBAR_SetDrawTextFlags (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -4539,6 +4540,8 @@ TOOLBAR_SetDrawTextFlags (HWND hwnd, WPARAM wParam, LPARAM lParam)
TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
DWORD dwTemp; DWORD dwTemp;
TRACE("hwnd = %p, dwMask = 0x%08lx, dwDTFlags = 0x%08lx\n", hwnd, (DWORD)wParam, (DWORD)lParam);
dwTemp = infoPtr->dwDTFlags; dwTemp = infoPtr->dwDTFlags;
infoPtr->dwDTFlags = infoPtr->dwDTFlags =
(infoPtr->dwDTFlags & (DWORD)wParam) | (DWORD)lParam; (infoPtr->dwDTFlags & (DWORD)wParam) | (DWORD)lParam;
...@@ -5339,7 +5342,7 @@ TOOLBAR_EraseBackground (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -5339,7 +5342,7 @@ TOOLBAR_EraseBackground (HWND hwnd, WPARAM wParam, LPARAM lParam)
case CDRF_SKIPDEFAULT: case CDRF_SKIPDEFAULT:
return TRUE; return TRUE;
default: 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); hwnd, ntfret);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment