Index: toolbar.c
===================================================================
--- toolbar.c	(revision 42407)
+++ toolbar.c	(working copy)
@@ -1044,7 +1044,7 @@
     }
 
     oldBkMode = SetBkMode (hdc, tbcd.nStringBkMode);
-    if (!(infoPtr->dwExStyle & TBSTYLE_EX_MIXEDBUTTONS) || (btnPtr->fsStyle & BTNS_SHOWTEXT))
+    if ((!(infoPtr->dwExStyle & TBSTYLE_EX_MIXEDBUTTONS) || (btnPtr->fsStyle & BTNS_SHOWTEXT)) && (infoPtr->nMaxTextRows > 0))
         TOOLBAR_DrawString (infoPtr, &rcText, lpText, &tbcd, dwItemCDFlag);
     SetBkMode (hdc, oldBkMode);