commit c9ca25aa1d64f8dbe2ec9c09039e81adc48608c6
author Mikołaj Zalewski <mikolaj@zalewski.pl> Mon Mar 19 10:40:53 2007 +0100
committer Alexandre Julliard <julliard@winehq.org> Mon Mar 19 13:08:23 2007 +0100
tree f841f32aa08c11d7b35ee27c1ad7c7adc3d5686c
parent 4893b157e215000ff76f358abbc912c4f4970a98

comctl32: CreateToolbarEx should send TB_SETBITMAPSIZE twice.

dlls/comctl32/commctrl.c

diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c
index c21cae3..7e44e03 100644
--- a/dlls/comctl32/commctrl.c
+++ b/dlls/comctl32/commctrl.c
@@ -693,12 +693,13 @@
        SendMessageW (hwndTB, TB_SETBITMAPSIZE, 0,
                      MAKELPARAM((WORD)dxBitmap, (WORD)dyBitmap));
 
-       if (dxButton <= 0)
-           dxButton = 24;
-       if (dyButton <= 0)
-           dyButton = 22;
-       SendMessageW (hwndTB, TB_SETBUTTONSIZE, 0,
-                     MAKELPARAM((WORD)dxButton, (WORD)dyButton));
+       if (dxButton < 0)
+           dxButton = dxBitmap;
+       if (dyButton < 0)
+           dyButton = dyBitmap;
+       /* TB_SETBUTTONSIZE -> TB_SETBITMAPSIZE bug introduced for Windows compatibility */
+       if (dxButton != 0 && dyButton != 0)
+            SendMessageW(hwndTB, TB_SETBITMAPSIZE, 0, MAKELPARAM(dxButton, dyButton));
 
 
 	/* add bitmaps */