Don't allocate space for text when nMaxTextRows = 0.

490fbd84 · Robert Shearman · Alexandre Julliard · 13af4891 · 490fbd84
Commit 490fbd84 authored Mar 07, 2004 by Robert Shearman Committed by Alexandre Julliard Mar 07, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

toolbar.c dlls/comctl32/toolbar.c +2 -1

No files found.
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -1120,7 +1120,8 @@ TOOLBAR_MeasureString(TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr,
    lpSize->cx = 0;
    lpSize->cy = 0;

-    if (!(btnPtr->fsState & TBSTATE_HIDDEN) &&
+    if (infoPtr->nMaxTextRows > 0 &&
+        !(btnPtr->fsState & TBSTATE_HIDDEN) &&
        (!(infoPtr->dwExStyle & TBSTYLE_EX_MIXEDBUTTONS) ||
        (btnPtr->fsStyle & BTNS_SHOWTEXT)) )
    {