mirror of
https://github.com/reactos/reactos.git
synced 2024-12-28 01:55:19 +00:00
Implement DrawMenuBar.
svn path=/trunk/; revision=16514
This commit is contained in:
parent
91269f987b
commit
6b36fb6848
2 changed files with 17 additions and 6 deletions
|
@ -3534,14 +3534,12 @@ DestroyMenu(HMENU hMenu)
|
|||
|
||||
|
||||
/*
|
||||
* @unimplemented
|
||||
* @implemented
|
||||
*/
|
||||
BOOL STDCALL
|
||||
DrawMenuBar(HWND hWnd)
|
||||
{
|
||||
UNIMPLEMENTED
|
||||
/* FIXME - return NtUserCallHwndLock(hWnd, 0x55); */
|
||||
return FALSE;
|
||||
return (BOOL)NtUserCallHwndLock(hWnd, HWNDLOCK_ROUTINE_DRAWMENUBAR);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -651,8 +651,21 @@ NtUserCallHwndLock(
|
|||
break;
|
||||
|
||||
case HWNDLOCK_ROUTINE_DRAWMENUBAR:
|
||||
/* FIXME */
|
||||
break;
|
||||
{
|
||||
PMENU_OBJECT MenuObject;
|
||||
DPRINT1("HWNDLOCK_ROUTINE_DRAWMENUBAR\n");
|
||||
Ret = FALSE;
|
||||
if (!((Window->Style & (WS_CHILD | WS_POPUP)) != WS_CHILD)) break;
|
||||
MenuObject = IntGetMenuObject((HMENU) Window->IDMenu);
|
||||
if(MenuObject == NULL) break;
|
||||
MenuObject->MenuInfo.WndOwner = hWnd;
|
||||
MenuObject->MenuInfo.Height = 0;
|
||||
IntReleaseMenuObject(MenuObject);
|
||||
WinPosSetWindowPos(hWnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE |
|
||||
SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED );
|
||||
Ret = TRUE;
|
||||
break;
|
||||
}
|
||||
|
||||
case HWNDLOCK_ROUTINE_REDRAWFRAME:
|
||||
/* FIXME */
|
||||
|
|
Loading…
Reference in a new issue