Skip to content

W
wine-cw
Commit 6c954455 authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard
Browse files
Options

comctl32: Set the default separator width when notifying a -ve cmd id.

parent 89655119
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
dlls/comctl32/tests/toolbar.c
View file @ 6c954455
...@@ -195,10 +195,10 @@ static LRESULT parent_wnd_notify(LPARAM lParam) ...@@ -195,10 +195,10 @@ static LRESULT parent_wnd_notify(LPARAM lParam)
} }
else else
{ {
ok( restore->tbButton.iBitmap == -1, "got %08x\n", restore->tbButton.iBitmap );
ok( *restore->pCurrent == 0xcafe0000 + restore->iItem, "got %08x\n", *restore->pCurrent ); ok( *restore->pCurrent == 0xcafe0000 + restore->iItem, "got %08x\n", *restore->pCurrent );
if (restore->iItem < 7 || restore->iItem == 10) if (restore->iItem < 7 || restore->iItem == 10)
{ {
ok( restore->tbButton.iBitmap == -1, "got %08x\n", restore->tbButton.iBitmap );
if (restore->iItem < 7) if (restore->iItem < 7)
ok( restore->tbButton.idCommand == restore->iItem * 2 + 1, "%d: got %08x\n", restore->iItem, restore->tbButton.idCommand ); ok( restore->tbButton.idCommand == restore->iItem * 2 + 1, "%d: got %08x\n", restore->iItem, restore->tbButton.idCommand );
else else
...@@ -208,6 +208,7 @@ static LRESULT parent_wnd_notify(LPARAM lParam) ...@@ -208,6 +208,7 @@ static LRESULT parent_wnd_notify(LPARAM lParam)
} }
else else
{ {
ok( restore->tbButton.iBitmap == 8, "got %08x\n", restore->tbButton.iBitmap );
ok( restore->tbButton.idCommand == 0, "%d: got %08x\n", restore->iItem, restore->tbButton.idCommand ); ok( restore->tbButton.idCommand == 0, "%d: got %08x\n", restore->iItem, restore->tbButton.idCommand );
if (restore->iItem == 7) if (restore->iItem == 7)
ok( restore->tbButton.fsState == 0, "%d: got %02x\n", restore->iItem, restore->tbButton.fsState ); ok( restore->tbButton.fsState == 0, "%d: got %02x\n", restore->iItem, restore->tbButton.fsState );
......
dlls/comctl32/toolbar.c
View file @ 6c954455
...@@ -4201,8 +4201,9 @@ TOOLBAR_Restore(TOOLBAR_INFO *infoPtr, const TBSAVEPARAMSW *lpSave) ...@@ -4201,8 +4201,9 @@ TOOLBAR_Restore(TOOLBAR_INFO *infoPtr, const TBSAVEPARAMSW *lpSave)
if (*nmtbr.pCurrent & 0x80000000) if (*nmtbr.pCurrent & 0x80000000)
{ {
/* separator */ /* separator */
nmtbr.tbButton.iBitmap = SEPARATOR_WIDTH;
nmtbr.tbButton.idCommand = 0; nmtbr.tbButton.idCommand = 0;
nmtbr.tbButton.fsStyle = TBSTYLE_SEP; nmtbr.tbButton.fsStyle = BTNS_SEP;
if (*nmtbr.pCurrent != (DWORD)-1) if (*nmtbr.pCurrent != (DWORD)-1)
nmtbr.tbButton.fsState = TBSTATE_HIDDEN; nmtbr.tbButton.fsState = TBSTATE_HIDDEN;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment