forked from Mirrors/wine-wine
comctl32: Unset the toolbar's hot item when deleting a button.
Signed-off-by: Thomas Faber <thomas.faber@reactos.org> Signed-off-by: Alexandre Julliard <julliard@winehq.org>oldstable
parent
0b8219da5c
commit
4c57232962
|
@ -923,6 +923,16 @@ static void test_hotitem(void)
|
||||||
ok(ret == 1, "TB_GETHOTITEM returned %ld, expected 1\n", ret);
|
ok(ret == 1, "TB_GETHOTITEM returned %ld, expected 1\n", ret);
|
||||||
ok(g_fReceivedHotItemChange == FALSE, "Unexpected TBN_HOTITEMCHANGE\n");
|
ok(g_fReceivedHotItemChange == FALSE, "Unexpected TBN_HOTITEMCHANGE\n");
|
||||||
|
|
||||||
|
/* deleting a button unsets the hot item */
|
||||||
|
ret = SendMessageA(hToolbar, TB_SETHOTITEM, 0, 0);
|
||||||
|
ok(ret == 1, "TB_SETHOTITEM returned %ld, expected 1\n", ret);
|
||||||
|
g_fReceivedHotItemChange = FALSE;
|
||||||
|
ret = SendMessageA(hToolbar, TB_DELETEBUTTON, 1, 0);
|
||||||
|
ok(ret == TRUE, "TB_DELETEBUTTON returned %ld, expected TRUE\n", ret);
|
||||||
|
ret = SendMessageA(hToolbar, TB_GETHOTITEM, 0, 0);
|
||||||
|
ok(ret == -1, "TB_GETHOTITEM returned %ld, expected -1\n", ret);
|
||||||
|
ok(g_fReceivedHotItemChange == FALSE, "Unexpected TBN_HOTITEMCHANGE\n");
|
||||||
|
|
||||||
DestroyWindow(hToolbar);
|
DestroyWindow(hToolbar);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3233,6 +3233,7 @@ TOOLBAR_DeleteButton (TOOLBAR_INFO *infoPtr, INT nIndex)
|
||||||
|
|
||||||
TOOLBAR_TooltipDelTool(infoPtr, &infoPtr->buttons[nIndex]);
|
TOOLBAR_TooltipDelTool(infoPtr, &infoPtr->buttons[nIndex]);
|
||||||
|
|
||||||
|
infoPtr->nHotItem = -1;
|
||||||
if (infoPtr->nNumButtons == 1) {
|
if (infoPtr->nNumButtons == 1) {
|
||||||
TRACE(" simple delete\n");
|
TRACE(" simple delete\n");
|
||||||
free_string( infoPtr->buttons );
|
free_string( infoPtr->buttons );
|
||||||
|
|
Loading…
Reference in New Issue