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

This commit is contained in:
Robert Shearman 2004-03-07 03:13:26 +00:00 committed by Alexandre Julliard
parent 13af489103
commit 490fbd84fb
1 changed files with 2 additions and 1 deletions

View File

@ -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)) )
{