Fix parameters for MDI_RestoreFrameMenu in WM_DESTROY msg.

This commit is contained in:
Gerard Patel 2000-01-23 03:19:44 +00:00 committed by Alexandre Julliard
parent 317c9d0ff6
commit e8a3d0713f
1 changed files with 4 additions and 2 deletions

View File

@ -921,7 +921,8 @@ static BOOL MDI_RestoreFrameMenu( WND *frameWnd, HWND hChild )
INT nItems = GetMenuItemCount(frameWnd->wIDmenu) - 1; INT nItems = GetMenuItemCount(frameWnd->wIDmenu) - 1;
UINT iId = GetMenuItemID(frameWnd->wIDmenu,nItems) ; UINT iId = GetMenuItemID(frameWnd->wIDmenu,nItems) ;
TRACE("frameWnd %p,child %04x\n",frameWnd,hChild); TRACE("frameWnd %p,(%04x),child %04x,nIt=%d,iId=%d\n",
frameWnd,frameWnd->hwndSelf,hChild,nItems,iId);
if(!(iId == SC_RESTORE || iId == SC_CLOSE) ) if(!(iId == SC_RESTORE || iId == SC_CLOSE) )
return 0; return 0;
@ -1126,7 +1127,8 @@ LRESULT WINAPI MDIClientWndProc( HWND hwnd, UINT message, WPARAM wParam,
goto END; goto END;
case WM_DESTROY: case WM_DESTROY:
if( ci->hwndChildMaximized ) MDI_RestoreFrameMenu(w, frameWnd->hwndSelf); if( ci->hwndChildMaximized )
MDI_RestoreFrameMenu(w->parent, ci->hwndChildMaximized);
if((nItems = GetMenuItemCount(ci->hWindowMenu)) > 0) if((nItems = GetMenuItemCount(ci->hWindowMenu)) > 0)
{ {
ci->idFirstChild = nItems - 1; ci->idFirstChild = nItems - 1;