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

comctl32/tab: Make WM_RBUTTONUP reach default window procedure.

This commit is contained in:
Nikolay Sivov 2011-07-03 10:19:21 +04:00 committed by Alexandre Julliard
parent fcd04e5987
commit 7d31d39f00
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/comctl32/tab.c
View File

@ -706,11 +706,10 @@ TAB_LButtonUp (const TAB_INFO *infoPtr)
return 0;
}
static inline LRESULT
static inline void
TAB_RButtonUp (const TAB_INFO *infoPtr)
{
TAB_SendSimpleNotify(infoPtr, NM_RCLICK);
return 0;
}
/******************************************************************************
@ -3430,7 +3429,8 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, wParam, lParam);
case WM_RBUTTONUP:
return TAB_RButtonUp (infoPtr);
TAB_RButtonUp (infoPtr);
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
case WM_MOUSEMOVE:
return TAB_MouseMove (infoPtr, wParam, lParam);

22
dlls/comctl32/tests/tab.c
View File

@ -286,6 +286,11 @@ static const struct message delete_focus_seq[] = {
{ 0 }
};
static const struct message rbuttonup_seq[] = {
{ WM_RBUTTONUP, sent|wparam|lparam, 0, 0 },
{ WM_CONTEXTMENU, sent|defwinproc },
{ 0 }
};
static HWND
create_tabcontrol (DWORD style, DWORD mask)
@ -1407,6 +1412,22 @@ static void test_TCS_OWNERDRAWFIXED(void)
DestroyWindow(hTab);
}
static void test_WM_CONTEXTMENU(void)
{
HWND hTab;
hTab = createFilledTabControl(parent_wnd, TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE, 4);
ok(hTab != NULL, "Failed to create tab control\n");
flush_sequences(sequences, NUM_MSG_SEQUENCES);
SendMessageA(hTab, WM_RBUTTONUP, 0, 0);
ok_sequence(sequences, TAB_SEQ_INDEX, rbuttonup_seq, "WM_RBUTTONUP response sequence", FALSE);
DestroyWindow(hTab);
}
START_TEST(tab)
{
LOGFONTA logfont;
@ -1443,6 +1464,7 @@ START_TEST(tab)
test_removeimage();
test_TCM_SETITEMEXTRA();
test_TCS_OWNERDRAWFIXED();
test_WM_CONTEXTMENU();
DestroyWindow(parent_wnd);
}