Giuseppe Bilotta : comctl32/toolbar: Skip iString field for separators.
Alexandre Julliard
julliard at winehq.org
Thu May 7 09:25:38 CDT 2009
Module: wine
Branch: master
Commit: fcc9b57c7aee38fa9d47ed55b7e274188cdb76f5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcc9b57c7aee38fa9d47ed55b7e274188cdb76f5
Author: Giuseppe Bilotta <giuseppe.bilotta at gmail.com>
Date: Thu May 7 11:13:15 2009 +0200
comctl32/toolbar: Skip iString field for separators.
---
dlls/comctl32/toolbar.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index c3add77..c5aa8f4 100644
--- 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 );
More information about the wine-cvs
mailing list