[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
This commit is contained in:
Giannis Adamopoulos 2017-06-06 12:19:17 +00:00
parent 6fda346a25
commit 27c9570f9d

View file

@ -253,12 +253,11 @@ static LRESULT TOOLBAR_SetButtonInfo(TOOLBAR_INFO *infoPtr, INT Id,
static inline int default_top_margin(const TOOLBAR_INFO *infoPtr) static inline int default_top_margin(const TOOLBAR_INFO *infoPtr)
{ {
#ifndef __REACTOS__ #ifdef __REACTOS__
return (infoPtr->dwStyle & TBSTYLE_FLAT ? 0 : TOP_BORDER); if (infoPtr->iVersion == 6)
#else /* r65766 */ return 0;
/* This is the behaviour in comctl32 v6 */
return 0;
#endif #endif
return (infoPtr->dwStyle & TBSTYLE_FLAT ? 0 : TOP_BORDER);
} }
static inline BOOL TOOLBAR_HasDropDownArrows(DWORD exStyle) static inline BOOL TOOLBAR_HasDropDownArrows(DWORD exStyle)