Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-28 09:29:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

- edit.c: Add TPM_RETURNCMD flag to TrackPopupMenu so that WM_COMMAND messages are not sent to the edit control.

Browse source 
Use WM_MENUSELECT vice WM_COMMAND to determine which clipboard message to send.
- Fixes vb apps edit context menu and maybe others. Bug #4404

svn path=/trunk/; revision=40630
This commit is contained in:
Michael Martin 2009-04-21 04:45:08 +00:00
parent 3e298b6351
commit e6661c0b54
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -255,7 +255,7 @@ 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_Command(EDITSTATE *es, INT code, INT id, HWND conrtol); 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,8 +947,8 @@ static LRESULT EditWndProc_common( HWND hwnd, UINT msg,
EDIT_WM_Clear(es); EDIT_WM_Clear(es);
break; break;
case WM_COMMAND: case WM_MENUSELECT:
EDIT_WM_Command(es, HIWORD(wParam), LOWORD(wParam), (HWND)lParam); EDIT_WM_MenuSelect(es, HIWORD(wParam), LOWORD(wParam), (HWND)lParam);
break; break;
case WM_CONTEXTMENU: case WM_CONTEXTMENU:
@ -4224,12 +4224,17 @@ static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c)
* WM_COMMAND * WM_COMMAND
* *
*/ */
static void EDIT_WM_Command(EDITSTATE *es, INT code, INT id, HWND control) static void EDIT_WM_MenuSelect(EDITSTATE *es, INT code, INT id, HWND control)
{ {
if (code || control)
return;
switch (id) { static INT MenuSelected;
if (id != 0) {
MenuSelected = id;
return;
}
switch (MenuSelected) {
case EM_UNDO: case EM_UNDO:
SendMessageW(es->hwndSelf, WM_UNDO, 0, 0); SendMessageW(es->hwndSelf, WM_UNDO, 0, 0);
break; break;
@ -4308,7 +4313,7 @@ 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, x, y, 0, es->hwndSelf, NULL); TrackPopupMenu(popup, TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD, x, y, 0, es->hwndSelf, NULL);
DestroyMenu(menu); DestroyMenu(menu);
} }