nItems = GetMenuItemCount(menu) - 1;
iId = GetMenuItemID(menu,nItems) ;
if (iId == SC_RESTORE || iId == SC_CLOSE)
+ {
+ ERR("system buttons already exist\n");
return 0;
-
+ }
+//// End
/* create a copy of sysmenu popup and insert it into frame menu bar */
if (!(hSysPopup = GetSystemMenu(hChild, FALSE)))
{
}
AppendMenuW(menu, MF_HELP | MF_BITMAP,
- SC_MINIMIZE, (LPCWSTR)HBMMENU_MBAR_MINIMIZE ) ;
+ SC_CLOSE, is_close_enabled(hChild, hSysPopup) ?
+ (LPCWSTR)HBMMENU_MBAR_CLOSE : (LPCWSTR)HBMMENU_MBAR_CLOSE_D );
AppendMenuW(menu, MF_HELP | MF_BITMAP,
SC_RESTORE, (LPCWSTR)HBMMENU_MBAR_RESTORE );
AppendMenuW(menu, MF_HELP | MF_BITMAP,
- SC_CLOSE, is_close_enabled(hChild, hSysPopup) ?
- (LPCWSTR)HBMMENU_MBAR_CLOSE : (LPCWSTR)HBMMENU_MBAR_CLOSE_D );
+ SC_MINIMIZE, (LPCWSTR)HBMMENU_MBAR_MINIMIZE ) ;
/* The system menu is replaced by the child icon */
-/* hIcon = (HICON)GetClassLongPtrW(hChild, GCLP_HICONSM);
- if (!hIcon)
- hIcon = (HICON)GetClassLongPtrW(hChild, GCLP_HICON);
- if (!hIcon)
- hIcon = LoadIconW(NULL, IDI_APPLICATION);
-*/
-//// End
hIcon = (HICON)SendMessageW(hChild, WM_GETICON, ICON_SMALL, 0);
if (!hIcon)
hIcon = (HICON)SendMessageW(hChild, WM_GETICON, ICON_BIG, 0);
nItems = GetMenuItemCount(menu) - 1;
iId = GetMenuItemID(menu,nItems) ;
if( !(iId == SC_RESTORE || iId == SC_CLOSE) )
+ {
+ ERR("no system buttons then nothing to do\n");
return 0;
+ }
/*
* Remove the system menu, If that menu is the icon of the window
case WM_CHILDACTIVATE:
case WM_SYSCOMMAND:
case WM_SHOWWINDOW:
-#ifndef __REACTOS__
case WM_SETVISIBLE:
-#endif
case WM_SIZE:
case WM_NEXTMENU:
case WM_SYSCHAR:
break;
case WM_SHOWWINDOW:
-#ifndef __REACTOS__
case WM_SETVISIBLE:
-#endif //// Commented out r57663
+ //// Commented out r57663
/*if (ci->hwndChildMaximized) ci->mdiFlags &= ~MDIF_NEEDUPDATE;
else*/ MDI_PostUpdate(client, ci, SB_BOTH+1);
break;