{
MENUITEMINFOW mii;
WCHAR szMenuStringBack[255];
- const WCHAR *ptrTab;
+ WCHAR *ptrTab;
HMENU hMenu = GetSystemMenu(hWnd, FALSE);
if (hMenu != NULL)
{
ptrTab = wcschr(szMenuStringBack, '\t');
if (ptrTab)
{
- mii.cch = (int)( ptrTab - szMenuStringBack);
- RtlZeroMemory((PVOID)ptrTab, mii.cch);
-
+ *ptrTab = '\0';
mii.cch = wcslen(szMenuStringBack);
SetMenuItemInfoW(hMenu, SC_CLOSE, FALSE, &mii);
break;
}
+ /* Detect Alt-Esc/Space/Tab presses defer to DefWindowProc */
+ if ( (HIWORD(lParam) & KF_ALTDOWN) && (wParam == VK_ESCAPE || wParam == VK_SPACE || wParam == VK_TAB))
+ {
+ return DefWindowProcW(hWnd, msg, wParam, lParam);
+ }
OnKey(GuiData, msg, wParam, lParam);
break;
if ((ShiftState & (RIGHT_ALT_PRESSED | LEFT_ALT_PRESSED) || KeyStateMenu & 0x80) &&
(VirtualKeyCode == VK_ESCAPE || VirtualKeyCode == VK_TAB || VirtualKeyCode == VK_SPACE))
{
- DefWindowProcW(msg->hwnd, msg->message, msg->wParam, msg->lParam);
- return TRUE;
+ DPRINT1("GuiProcessKeyCallback\n");
+ //DefWindowProcW(msg->hwnd, msg->message, msg->wParam, msg->lParam);
+ //return TRUE;
}
return FALSE;