From c37a639e3333c6dc1441d76cf16b2abdd0d597a7 Mon Sep 17 00:00:00 2001
From: Martin Fuchs <martin-fuchs@gmx.net>
Date: Mon, 24 Apr 2000 17:34:42 +0000
Subject: [PATCH] Fixed toolbar bitmap size handling.

---
 dlls/comctl32/commctrl.c | 6 +++---
 dlls/comctl32/toolbar.c  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c
index 95344ba6897..abae86d4af1 100644
--- a/dlls/comctl32/commctrl.c
+++ b/dlls/comctl32/commctrl.c
@@ -647,14 +647,14 @@ CreateToolbarEx (HWND hwnd, DWORD style, UINT wID, INT nBitmaps,
 	/* set bitmap and button size */
 	/*If CreateToolbarEx receive 0, windows set default values*/
 	if (dyBitmap < 0)
-	    dyBitmap = 16;
+	    dyBitmap = 15;
 	if (dxBitmap < 0)
 	    dxBitmap = 16;
 
 	    SendMessageA (hwndTB, TB_SETBITMAPSIZE, 0,
-			    MAKELPARAM((WORD)dyBitmap, (WORD)dxBitmap));
+			    MAKELPARAM((WORD)dxBitmap, (WORD)dyBitmap));
 	    SendMessageA (hwndTB, TB_SETBUTTONSIZE, 0,
-			    MAKELPARAM((WORD)dyButton, (WORD)dxButton));
+			    MAKELPARAM((WORD)dxButton, (WORD)dyButton));
 
 
 	/* add bitmaps */
diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index 19ad494b898..fef0150c79f 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -884,7 +884,7 @@ TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 		if (infoPtr)
 		    lpmis->itemHeight = infoPtr->nBitmapHeight + 8;
 		else
-		    lpmis->itemHeight = 16 + 8; /* default height */
+		    lpmis->itemHeight = 15 + 8; /* default height */
 
 		return TRUE;
 	    }
-- 
2.11.4.GIT