From 27c9570f9d05d10ed65b4e2e3371cc67261147ac Mon Sep 17 00:00:00 2001 From: Giannis Adamopoulos Date: Tue, 6 Jun 2017 12:19:17 +0000 Subject: [PATCH] [COMCTL32] -Fix a lot of tests for the v5 toolbar without braking the behavior of the v6 one (that needs to be tested). svn path=/trunk/; revision=74931 --- reactos/dll/win32/comctl32/toolbar.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/reactos/dll/win32/comctl32/toolbar.c b/reactos/dll/win32/comctl32/toolbar.c index c5a704f32e4..f5e1196a999 100644 --- a/reactos/dll/win32/comctl32/toolbar.c +++ b/reactos/dll/win32/comctl32/toolbar.c @@ -253,12 +253,11 @@ static LRESULT TOOLBAR_SetButtonInfo(TOOLBAR_INFO *infoPtr, INT Id, static inline int default_top_margin(const TOOLBAR_INFO *infoPtr) { -#ifndef __REACTOS__ - return (infoPtr->dwStyle & TBSTYLE_FLAT ? 0 : TOP_BORDER); -#else /* r65766 */ - /* This is the behaviour in comctl32 v6 */ - return 0; +#ifdef __REACTOS__ + if (infoPtr->iVersion == 6) + return 0; #endif + return (infoPtr->dwStyle & TBSTYLE_FLAT ? 0 : TOP_BORDER); } static inline BOOL TOOLBAR_HasDropDownArrows(DWORD exStyle) -- 2.17.1