system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 12:54:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix WM_MDIREFRESHMENU for the case when separator is at the position

Browse source 
0.
This commit is contained in:
Dmitry Timoshkov 2004-09-21 20:04:10 +00:00 committed by Alexandre Julliard
parent 0af18186b2
commit 4dd296180a
1 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
windows/mdi.c
View file

@ -296,10 +296,13 @@ static LRESULT MDISetMenu( HWND hwnd, HMENU hmenuFrame,
if (!(ci = get_client_info( hwnd ))) return 0;
if (hmenuFrame == ci->hFrameMenu) return (LRESULT)hmenuFrame;
if (hmenuFrame)
{
if (hmenuFrame == ci->hFrameMenu) return (LRESULT)hmenuFrame;
if( IsZoomed(ci->hwndActiveChild) && hmenuFrame && hmenuFrame!= ci->hFrameMenu )
MDI_RestoreFrameMenu( hwndFrame, ci->hwndActiveChild );
if( IsZoomed(ci->hwndActiveChild) && hmenuFrame != ci->hFrameMenu )
MDI_RestoreFrameMenu( hwndFrame, ci->hwndActiveChild );
}
if( hmenuWindow && hmenuWindow != ci->hWindowMenu )
{
@ -358,7 +361,7 @@ static LRESULT MDISetMenu( HWND hwnd, HMENU hmenuFrame,
*/
static LRESULT MDI_RefreshMenu(MDICLIENTINFO *ci)
{
UINT i, count, visible, separator_pos, id;
UINT i, count, visible, id;
WCHAR buf[MDI_MAXTITLELENGTH];
TRACE("children %u, window menu %p\n", ci->nActiveChildren, ci->hWindowMenu);
@ -376,8 +379,6 @@ static LRESULT MDI_RefreshMenu(MDICLIENTINFO *ci)
* there is a menu item with MDI magic ID removes all existing
* menu items after it, and then adds visible MDI children.
*/
id = (UINT)-1;
separator_pos = 0;
count = GetMenuItemCount(ci->hWindowMenu);
for (i = 0; i < count; i++)
{
@ -390,24 +391,25 @@ static LRESULT MDI_RefreshMenu(MDICLIENTINFO *ci)
{
if (mii.fType & MF_SEPARATOR)
{
separator_pos = i;
/* Windows checks only ID of the menu item */
memset(&mii, 0, sizeof(mii));
mii.cbSize = sizeof(mii);
mii.fMask = MIIM_ID;
if (GetMenuItemInfoW(ci->hWindowMenu, i + 1, TRUE, &mii))
id = mii.wID;
{
if (mii.wID == ci->idFirstChild)
{
TRACE("removing %u items including separator\n", count - i);
while (RemoveMenu(ci->hWindowMenu, i, MF_BYPOSITION))
/* nothing */;
break;
}
}
}
}
}
if (separator_pos && id == ci->idFirstChild)
{
for (i = separator_pos; i < count; i++)
RemoveMenu(ci->hWindowMenu, separator_pos, MF_BYPOSITION);
}
visible = 0;
for (i = 0; i < ci->nActiveChildren; i++)
{
@ -1022,7 +1024,8 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message,
if (!hBmpClose) hBmpClose = CreateMDIMenuBitmap();
TRACE("Client created - hwnd = %p, idFirst = %u\n", hwnd, ci->idFirstChild );
TRACE("Client created: hwnd %p, Window menu %p, idFirst = %u\n",
hwnd, ci->hWindowMenu, ci->idFirstChild );
return 0;
}