Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-08 19:27:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Improved fix for edit control context menu. Send appropriate message based on return value of TrackPopupMenu

Browse source 
and remove handling of WM_MENUSELECT as its no longer needed. Patch sent to wine-patches@winehq.org.

svn path=/trunk/; revision=40677
This commit is contained in:
Michael Martin 2009-04-24 12:13:07 +00:00
parent d425e6c2ee
commit cdae2e8831
1 changed files with 31 additions and 48 deletions

79
reactos/dll/win32/user32/controls/edit.c
View file

@ -255,7 +255,6 @@ static BOOL EDIT_EM_Undo(EDITSTATE *es);
* WM_XXX message handlers * WM_XXX message handlers
*/ */
static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c); static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c);
static void EDIT_WM_MenuSelect(EDITSTATE *es, INT code, INT id, HWND conrtol);
static void EDIT_WM_ContextMenu(EDITSTATE *es, INT x, INT y); static void EDIT_WM_ContextMenu(EDITSTATE *es, INT x, INT y);
static void EDIT_WM_Copy(EDITSTATE *es); static void EDIT_WM_Copy(EDITSTATE *es);
static LRESULT EDIT_WM_Create(EDITSTATE *es, LPCWSTR name); static LRESULT EDIT_WM_Create(EDITSTATE *es, LPCWSTR name);
@ -947,10 +946,6 @@ static LRESULT EditWndProc_common( HWND hwnd, UINT msg,
EDIT_WM_Clear(es); EDIT_WM_Clear(es);
break; break;
case WM_MENUSELECT:
EDIT_WM_MenuSelect(es, HIWORD(wParam), LOWORD(wParam), (HWND)lParam);
break;
case WM_CONTEXTMENU: case WM_CONTEXTMENU:
EDIT_WM_ContextMenu(es, (short)LOWORD(lParam), (short)HIWORD(lParam)); EDIT_WM_ContextMenu(es, (short)LOWORD(lParam), (short)HIWORD(lParam));
break; break;
@ -4219,48 +4214,6 @@ static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c)
} }
/*********************************************************************
*
* WM_COMMAND
*
*/
static void EDIT_WM_MenuSelect(EDITSTATE *es, INT code, INT id, HWND control)
{
static INT MenuSelected;
if (id != 0) {
MenuSelected = id;
return;
}
switch (MenuSelected) {
case EM_UNDO:
SendMessageW(es->hwndSelf, WM_UNDO, 0, 0);
break;
case WM_CUT:
SendMessageW(es->hwndSelf, WM_CUT, 0, 0);
break;
case WM_COPY:
SendMessageW(es->hwndSelf, WM_COPY, 0, 0);
break;
case WM_PASTE:
SendMessageW(es->hwndSelf, WM_PASTE, 0, 0);
break;
case WM_CLEAR:
SendMessageW(es->hwndSelf, WM_CLEAR, 0, 0);
break;
case EM_SETSEL:
EDIT_EM_SetSel(es, 0, (UINT)-1, FALSE);
EDIT_EM_ScrollCaret(es);
break;
default:
ERR("unknown menu item, please report\n");
break;
}
}
/********************************************************************* /*********************************************************************
* *
* WM_CONTEXTMENU * WM_CONTEXTMENU
@ -4288,6 +4241,8 @@ static void EDIT_WM_ContextMenu(EDITSTATE *es, INT x, INT y)
UINT start = es->selection_start; UINT start = es->selection_start;
UINT end = es->selection_end; UINT end = es->selection_end;
BOOL selectedItem;
ORDER_UINT(start, end); ORDER_UINT(start, end);
/* undo */ /* undo */
@ -4313,7 +4268,35 @@ static void EDIT_WM_ContextMenu(EDITSTATE *es, INT x, INT y)
y = rc.top + (rc.bottom - rc.top) / 2; y = rc.top + (rc.bottom - rc.top) / 2;
} }
TrackPopupMenu(popup, TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD, x, y, 0, es->hwndSelf, NULL); selectedItem = TrackPopupMenu(popup, TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD, x, y, 0, es->hwndSelf, NULL);
switch (selectedItem) {
case EM_UNDO:
SendMessageW(es->hwndSelf, WM_UNDO, 0, 0);
break;
case WM_CUT:
SendMessageW(es->hwndSelf, WM_CUT, 0, 0);
break;
case WM_COPY:
SendMessageW(es->hwndSelf, WM_COPY, 0, 0);
break;
case WM_PASTE:
SendMessageW(es->hwndSelf, WM_PASTE, 0, 0);
break;
case WM_CLEAR:
SendMessageW(es->hwndSelf, WM_CLEAR, 0, 0);
break;
case EM_SETSEL:
EDIT_EM_SetSel(es, 0, (UINT)-1, FALSE);
EDIT_EM_ScrollCaret(es);
break;
case 0:
break;
default:
ERR("unknown menu item, please report\n");
break;
}
DestroyMenu(menu); DestroyMenu(menu);
} }