ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comctl32/listview: Don't forward WM_COMMAND (EN_KILLFOCUS) from Edit to parent window.

This commit is contained in:
Nikolay Sivov 2009-11-21 12:23:05 +03:00 committed by Alexandre Julliard
parent c39268967d
commit f5f0763827
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/comctl32/listview.c
View File

@ -11409,6 +11409,7 @@ static LRESULT LISTVIEW_Command(LISTVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lP
case EN_KILLFOCUS: case EN_KILLFOCUS:
{ {
LISTVIEW_CancelEditLabel(infoPtr); LISTVIEW_CancelEditLabel(infoPtr);
break;
} }
default: default:

17
dlls/comctl32/tests/listview.c
View File

@ -271,6 +271,13 @@ static const struct message lvs_ex_transparentbkgnd_seq[] = {
{ 0 } { 0 }
}; };
static const struct message edit_end_nochange[] = {
{ WM_NOTIFY, sent|id, 0, 0, LVN_ENDLABELEDITA }, /* todo */
{ WM_NOTIFY, sent|id, 0, 0, NM_CUSTOMDRAW }, /* todo */
{ WM_NOTIFY, sent|id, 0, 0, NM_SETFOCUS },
{ 0 }
};
static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
static LONG defwndproc_counter = 0; static LONG defwndproc_counter = 0;
@ -3473,6 +3480,16 @@ static void test_editbox(void)
ok_sequence(sequences, EDITBOX_SEQ_INDEX, editbox_create_pos, ok_sequence(sequences, EDITBOX_SEQ_INDEX, editbox_create_pos,
"edit box create - sizing", FALSE); "edit box create - sizing", FALSE);
/* WM_COMMAND with EN_KILLFOCUS isn't forwared to parent */
SetFocus(hwnd);
hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0);
ok(IsWindow(hwndedit), "Expected Edit window to be created\n");
flush_sequences(sequences, NUM_MSG_SEQUENCES);
r = SendMessage(hwnd, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)hwndedit);
expect(0, r);
ok_sequence(sequences, PARENT_SEQ_INDEX, edit_end_nochange,
"edit box WM_COMMAND (EN_KILLFOCUS)", TRUE);
DestroyWindow(hwnd); DestroyWindow(hwnd);
} }