WIN31 Look still needs a close button on the left of the menu bar.

This commit is contained in:
Huw D M Davies 1999-02-14 09:20:01 +00:00 committed by Alexandre Julliard
parent ae806896cb
commit bc1d1df097
1 changed files with 12 additions and 10 deletions

View File

@ -781,9 +781,6 @@ static BOOL32 MDI_AugmentFrameMenu( MDICLIENTINFO* ci, WND *frame,
AppendMenu32A(frame->wIDmenu,MF_HELP | MF_BITMAP,
SC_RESTORE, (LPSTR)(DWORD)MAGIC_RESTORE );
// The close button is only present in Win 95 look
if(TWEAK_WineLook > WIN31_LOOK)
{
if( !InsertMenu32A(frame->wIDmenu,0,MF_BYPOSITION | MF_BITMAP | MF_POPUP,
hSysPopup, (LPSTR)(DWORD)hBmpClose ))
{
@ -791,6 +788,10 @@ static BOOL32 MDI_AugmentFrameMenu( MDICLIENTINFO* ci, WND *frame,
DestroyMenu32(hSysPopup);
return 0;
}
// The close button is only present in Win 95 look
if(TWEAK_WineLook > WIN31_LOOK)
{
AppendMenu32A(frame->wIDmenu,MF_HELP | MF_BITMAP,
SC_CLOSE, (LPSTR)(DWORD)MAGIC_CLOSE );
}
@ -818,10 +819,11 @@ static BOOL32 MDI_RestoreFrameMenu( WND *frameWnd, HWND32 hChild )
if(!(iId == SC_RESTORE || iId == SC_CLOSE) )
return 0;
if(TWEAK_WineLook > WIN31_LOOK)
{
// app button
RemoveMenu32(frameWnd->wIDmenu,0,MF_BYPOSITION);
if(TWEAK_WineLook > WIN31_LOOK)
{
// close
DeleteMenu32(frameWnd->wIDmenu,GetMenuItemCount32(frameWnd->wIDmenu) - 1,MF_BYPOSITION);
}