From 7c909cbc7c58484337ffa1a34f92449fcf2eb41e Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Fri, 28 Aug 2020 01:02:00 +0200 Subject: [PATCH] [COMCTL32] Addendum to last commit Sorry, something went terribly wrong with the CORE-ID in my head 2 times, one time in the commit comment and one time in the code! Addendum to 0.4.15-dev-663-g cd7db5df89d3f9e8ddce6e909debedc423e3e8a1 --- dll/win32/comctl32/toolbar.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/comctl32/toolbar.c b/dll/win32/comctl32/toolbar.c index e5ebf3211cc..e2b6193b663 100644 --- a/dll/win32/comctl32/toolbar.c +++ b/dll/win32/comctl32/toolbar.c @@ -1453,7 +1453,7 @@ TOOLBAR_WrapToolbar(TOOLBAR_INFO *infoPtr) if( !(infoPtr->dwStyle & TBSTYLE_WRAPABLE) && !(infoPtr->dwExStyle & TBSTYLE_EX_VERTICAL) ) return; -#ifdef __REACTOS__ /* workaround CORE-17244 part 1 of 2 */ +#ifdef __REACTOS__ /* workaround CORE-16169 part 1 of 2 */ /* if width is zero then return */ if (infoPtr->client_rect.right == 0) return; #endif @@ -3208,7 +3208,7 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) TRACE("auto sizing, style=%#x\n", infoPtr->dwStyle); TRACE("nRows: %d, infoPtr->nButtonHeight: %d\n", infoPtr->nRows, infoPtr->nButtonHeight); -#ifdef __REACTOS__ /* workaround CORE-17244 part 2 of 2 */ +#ifdef __REACTOS__ /* workaround CORE-16169 part 2 of 2 */ if ((infoPtr->dwStyle & TBSTYLE_WRAPABLE) || (infoPtr->dwExStyle & TBSTYLE_EX_VERTICAL)) { TOOLBAR_LayoutToolbar(infoPtr);