From c0a142ccee1c66a16bbbe936cf16633985b601ba Mon Sep 17 00:00:00 2001
From: Thorsten Kani <beebix@gmx.net>
Date: Thu, 21 Oct 2004 20:58:43 +0000
Subject: [PATCH] Don't add extra OFFSET_X/Y to the calculation of
 rcBitmap.top/left, just use GetSystemMetrics.

---
 dlls/comctl32/toolbar.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index d171732f345..d968eafae1a 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -868,12 +868,12 @@ TOOLBAR_DrawButton (HWND hwnd, TBUTTON_INFO *btnPtr, HDC hdc)
 
     /* Center the bitmap horizontally and vertically */
     if (dwStyle & TBSTYLE_LIST)
-        rcBitmap.left += GetSystemMetrics(SM_CXEDGE) + OFFSET_X;
+        rcBitmap.left += GetSystemMetrics(SM_CXEDGE);
     else
         rcBitmap.left+=(infoPtr->nButtonWidth - infoPtr->nBitmapWidth) / 2;
 
     if(lpText)
-        rcBitmap.top+= GetSystemMetrics(SM_CYEDGE) + OFFSET_Y;
+        rcBitmap.top+= GetSystemMetrics(SM_CYEDGE);
     else
         rcBitmap.top+=(infoPtr->nButtonHeight - infoPtr->nBitmapHeight) / 2;