Author: gadamopoulos Date: Tue Jun 6 12:19:17 2017 New Revision: 74931 URL: http://svn.reactos.org/svn/reactos?rev=74931&view=rev Log: [COMCTL32] -Fix a lot of tests for the v5 toolbar without braking the behavior of the v6 one (that needs to be tested).
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.c?rev=74931&r1=74930&r2=74931&view=diff ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Tue Jun 6 12:19:17 2017 @@ -253,12 +253,11 @@ static inline int default_top_margin(const TOOLBAR_INFO *infoPtr) { -#ifndef __REACTOS__ +#ifdef __REACTOS__ + if (infoPtr->iVersion == 6) + return 0; +#endif return (infoPtr->dwStyle & TBSTYLE_FLAT ? 0 : TOP_BORDER); -#else /* r65766 */ - /* This is the behaviour in comctl32 v6 */ - return 0; -#endif } static inline BOOL TOOLBAR_HasDropDownArrows(DWORD exStyle)