Always calls SetMenu in MDISetMenu.
This commit is contained in:
parent
5f6da6b500
commit
a2e1b412cf
|
@ -282,14 +282,17 @@ static LRESULT MDISetMenu( HWND hwnd, HMENU hmenuFrame,
|
|||
ci->hWindowMenu = hmenuWindow;
|
||||
}
|
||||
|
||||
if( hmenuFrame && hmenuFrame!=oldFrameMenu)
|
||||
if (hmenuFrame)
|
||||
{
|
||||
SetMenu(hwndFrame, hmenuFrame);
|
||||
if( hmenuFrame!=oldFrameMenu )
|
||||
{
|
||||
if( ci->hwndChildMaximized )
|
||||
MDI_AugmentFrameMenu(ci, w->parent, ci->hwndChildMaximized );
|
||||
WIN_ReleaseWndPtr(w);
|
||||
return oldFrameMenu;
|
||||
}
|
||||
}
|
||||
WIN_ReleaseWndPtr(w);
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue