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

- Revert 40628 as it breaks others applications menus.

Browse source 
svn path=/trunk/; revision=40629
This commit is contained in:
Michael Martin 2009-04-21 03:57:15 +00:00
parent a94de86ccc
commit 3e298b6351
2 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
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_MenuSelect(EDITSTATE *es, INT code, INT id, HWND conrtol); static void EDIT_WM_Command(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_MENUSELECT: case WM_COMMAND:
EDIT_WM_MenuSelect(es, HIWORD(wParam), LOWORD(wParam), (HWND)lParam); EDIT_WM_Command(es, HIWORD(wParam), LOWORD(wParam), (HWND)lParam);
break; break;
case WM_CONTEXTMENU: case WM_CONTEXTMENU:
@ -4224,17 +4224,12 @@ static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c)
* WM_COMMAND * WM_COMMAND
* *
*/ */
static void EDIT_WM_MenuSelect(EDITSTATE *es, INT code, INT id, HWND control) static void EDIT_WM_Command(EDITSTATE *es, INT code, INT id, HWND control)
{ {
if (code || control)
static INT MenuSelected;
if (id != 0) {
MenuSelected = id;
return; return;
}
switch (MenuSelected) { switch (id) {
case EM_UNDO: case EM_UNDO:
SendMessageW(es->hwndSelf, WM_UNDO, 0, 0); SendMessageW(es->hwndSelf, WM_UNDO, 0, 0);
break; 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, PostMessageW(Mt->OwnerWnd, WM_MENUCOMMAND,
MenuInfo->FocusedItem, MenuInfo->FocusedItem,
(LPARAM)MenuInfo->Self); (LPARAM)MenuInfo->Self);
else if (GetParent(Mt->OwnerWnd) == GetDesktopWindow()) else
PostMessageW(Mt->OwnerWnd, WM_COMMAND, ItemInfo.wID, 0); PostMessageW(Mt->OwnerWnd, WM_COMMAND, ItemInfo.wID, 0);
} }
} }