Commit 45e706a2 authored by Vincent Povirk's avatar Vincent Povirk Committed by Alexandre Julliard

comctl32/tests: Accept touchscreen-related messages in button tests.

parent bbc849df
...@@ -205,6 +205,7 @@ static const struct message setfocus_seq[] = ...@@ -205,6 +205,7 @@ static const struct message setfocus_seq[] =
{ {
{ WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, { WM_IME_SETCONTEXT, sent|wparam|optional, 1 },
{ WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 },
{ BM_GETSTATE, sent|optional }, /* when touchscreen is present */
{ WM_SETFOCUS, sent|wparam }, { WM_SETFOCUS, sent|wparam },
{ WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_SETFOCUS) }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_SETFOCUS) },
{ WM_APP, sent|wparam|lparam }, { WM_APP, sent|wparam|lparam },
...@@ -227,6 +228,7 @@ static const struct message setfocus_static_seq[] = ...@@ -227,6 +228,7 @@ static const struct message setfocus_static_seq[] =
{ {
{ WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, { WM_IME_SETCONTEXT, sent|wparam|optional, 1 },
{ WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 },
{ BM_GETSTATE, sent|optional }, /* when touchscreen is present */
{ WM_SETFOCUS, sent|wparam, 0 }, { WM_SETFOCUS, sent|wparam, 0 },
{ WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_SETFOCUS) }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_SETFOCUS) },
{ WM_COMMAND, sent|wparam|parent|optional, MAKEWPARAM(ID_BUTTON, BN_CLICKED) }, /* radio button */ { WM_COMMAND, sent|wparam|parent|optional, MAKEWPARAM(ID_BUTTON, BN_CLICKED) }, /* radio button */
...@@ -239,6 +241,7 @@ static const struct message setfocus_groupbox_seq[] = ...@@ -239,6 +241,7 @@ static const struct message setfocus_groupbox_seq[] =
{ {
{ WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, { WM_IME_SETCONTEXT, sent|wparam|optional, 1 },
{ WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 },
{ BM_GETSTATE, sent|optional }, /* when touchscreen is present */
{ WM_SETFOCUS, sent|wparam, 0 }, { WM_SETFOCUS, sent|wparam, 0 },
{ WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_SETFOCUS) }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_SETFOCUS) },
{ WM_COMMAND, sent|wparam|parent|optional, MAKEWPARAM(ID_BUTTON, BN_CLICKED) }, /* radio button */ { WM_COMMAND, sent|wparam|parent|optional, MAKEWPARAM(ID_BUTTON, BN_CLICKED) }, /* radio button */
...@@ -262,6 +265,7 @@ static const struct message setfocus_ownerdraw_seq[] = ...@@ -262,6 +265,7 @@ static const struct message setfocus_ownerdraw_seq[] =
{ {
{ WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, { WM_IME_SETCONTEXT, sent|wparam|optional, 1 },
{ WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 },
{ BM_GETSTATE, sent|optional }, /* when touchscreen is present */
{ WM_SETFOCUS, sent|wparam, 0 }, { WM_SETFOCUS, sent|wparam, 0 },
{ WM_DRAWITEM, sent|wparam|parent, ID_BUTTON }, { WM_DRAWITEM, sent|wparam|parent, ID_BUTTON },
{ WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_SETFOCUS) }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_SETFOCUS) },
...@@ -287,6 +291,7 @@ static const struct message lbuttondown_seq[] = ...@@ -287,6 +291,7 @@ static const struct message lbuttondown_seq[] =
{ WM_LBUTTONDOWN, sent|wparam|lparam, 0, 0 }, { WM_LBUTTONDOWN, sent|wparam|lparam, 0, 0 },
{ WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 },
{ WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 },
{ BM_GETSTATE, sent|defwinproc|optional }, /* when touchscreen is present */
{ WM_SETFOCUS, sent|wparam|defwinproc, 0 }, { WM_SETFOCUS, sent|wparam|defwinproc, 0 },
{ BM_SETSTATE, sent|wparam|defwinproc, TRUE }, { BM_SETSTATE, sent|wparam|defwinproc, TRUE },
{ 0 } { 0 }
......
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