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