comctl32/toolbar: Skip iString field for separators.

fcc9b57c · Giuseppe Bilotta · Alexandre Julliard · 8432ff70 · fcc9b57c
Commit fcc9b57c authored May 07, 2009 by Giuseppe Bilotta Committed by Alexandre Julliard May 07, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

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

No files found.
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -1841,7 +1841,9 @@ TOOLBAR_InternalInsertButtonsT(TOOLBAR_INFO *infoPtr, INT iIndex, UINT nAddButto
        btnPtr->fsState   = lpTbb[iButton].fsState;
        btnPtr->fsStyle   = lpTbb[iButton].fsStyle;
        btnPtr->dwData    = lpTbb[iButton].dwData;
-        if(HIWORD(lpTbb[iButton].iString) && lpTbb[iButton].iString != -1)
+        if (btnPtr->fsStyle & BTNS_SEP)
+            btnPtr->iString = -1;
+        else if(HIWORD(lpTbb[iButton].iString) && lpTbb[iButton].iString != -1)
        {
            if (fUnicode)
                Str_SetPtrW((LPWSTR*)&btnPtr->iString, (LPWSTR)lpTbb[iButton].iString );