Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-26 08:30:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

- menu.c: Only send WM_COMMAND messages to the top parent window.

Browse source 
- edit.c: 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=40628
This commit is contained in:
Michael Martin 2009-04-21 03:24:24 +00:00
parent 602b3ffcf7
commit a94de86ccc
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -255,7 +255,7 @@ static BOOL EDIT_EM_Undo(EDITSTATE *es);
* WM_XXX message handlers
*/
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_Copy(EDITSTATE *es);
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);
break;
case WM_COMMAND:
EDIT_WM_Command(es, HIWORD(wParam), LOWORD(wParam), (HWND)lParam);
case WM_MENUSELECT:
EDIT_WM_MenuSelect(es, HIWORD(wParam), LOWORD(wParam), (HWND)lParam);
break;
case WM_CONTEXTMENU:
@ -4224,12 +4224,17 @@ static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c)
* 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:
SendMessageW(es->hwndSelf, WM_UNDO, 0, 0);
break;

2
reactos/dll/win32/user32/windows/menu.c
View file

@ -2375,7 +2375,7 @@ MenuExecFocusedItem(MTRACKER *Mt, PROSMENUINFO MenuInfo, UINT Flags)
PostMessageW(Mt->OwnerWnd, WM_MENUCOMMAND,
MenuInfo->FocusedItem,
(LPARAM)MenuInfo->Self);
else
else if (GetParent(Mt->OwnerWnd) == GetDesktopWindow())
PostMessageW(Mt->OwnerWnd, WM_COMMAND, ItemInfo.wID, 0);
}
}