[ros-diffs] [cwittich] 62506: [comctl32] sync toolbar with wine head

Author: cwittich
Date: Sat Mar 15 21:13:25 2014
New Revision: 62506

URL: http://svn.reactos.org/svn/reactos?rev=62506&view=rev
Log:
[comctl32]
sync toolbar with wine head

Modified:
    trunk/reactos/dll/win32/comctl32/toolbar.c

Modified: trunk/reactos/dll/win32/comctl32/toolbar.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar....
==============================================================================
--- trunk/reactos/dll/win32/comctl32/toolbar.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comctl32/toolbar.c	[iso-8859-1] Sat Mar 15 21:13:25 2014
@@ -843,8 +843,11 @@
         /* empirical tests show that iBitmap can/will be non-zero    */
         /* when drawing the vertical bar...      */
         if ((dwStyle & TBSTYLE_FLAT) /* && (btnPtr->iBitmap == 0) */) {
-            if (dwStyle & CCS_VERT)
-               TOOLBAR_DrawFlatHorizontalSeparator (&rc, hdc, infoPtr);
+            if (dwStyle & CCS_VERT) {
+                RECT rcsep = rc;
+                InflateRect(&rcsep, -infoPtr->szPadding.cx, -infoPtr->szPadding.cy);
+                TOOLBAR_DrawFlatHorizontalSeparator (&rcsep, hdc, infoPtr);
+            }
        else
    	TOOLBAR_DrawFlatSeparator (&rc, hdc, infoPtr);
    }
@@ -1662,7 +1665,7 @@
    if (btnPtr->fsStyle & BTNS_SEP) {
        if (infoPtr->dwStyle & CCS_VERT) {
                 cy = (btnPtr->iBitmap > 0) ? btnPtr->iBitmap : SEPARATOR_WIDTH;
-                cx = (btnPtr->cx > 0) ? btnPtr->cx : infoPtr->nWidth;
+                cx = (btnPtr->cx > 0) ? btnPtr->cx : infoPtr->nButtonWidth;
        }
        else
                 cx = (btnPtr->cx > 0) ? btnPtr->cx :