commit d814bb657a998c153f50b149063afd2e6ee594de
author Pascal Lessard <pascal@macadamian.com> Sat Jul 31 13:02:02 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Jul 31 13:02:02 1999 +0000
tree 1a2393e29f91a50f7791d5cc1c54cd5fa54b856d
parent 1c08ac604e264cc4dec566afdb53b211a8ae071f

Implemented the system button behavior and associated it to the system
menu in win95. Also permit the SC_CLOSE item to be disabled.

controls/menu.c

diff --git a/controls/menu.c b/controls/menu.c
index 5b8d382..45d572d 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -75,6 +75,7 @@
     HBRUSH	hbrBack;	/* brush for menu background */
     DWORD	dwContextHelpID;
     DWORD	dwMenuData;	/* application defined value */
+    HMENU       hSysMenuOwner;  /* Handle to the dummy sys menu holder */
 } POPUPMENU, *LPPOPUPMENU;
 
 /* internal flags for menu tracking */
@@ -460,7 +461,10 @@
     gray = !(style & (WS_MAXIMIZE | WS_MINIMIZE));
     EnableMenuItem( hmenu, SC_RESTORE, (gray ? MF_GRAYED : MF_ENABLED) );
     gray = (clsStyle & CS_NOCLOSE) != 0;
-    EnableMenuItem( hmenu, SC_CLOSE, (gray ? MF_GRAYED : MF_ENABLED) );
+
+    /* The menu item must keep its state if it's disabled */
+    if(gray)
+	EnableMenuItem( hmenu, SC_CLOSE, MF_GRAYED);
 }
 
 
@@ -3191,15 +3195,39 @@
 {
     UINT    oldflags;
     MENUITEM *item;
+    POPUPMENU *menu;
 
     TRACE("(%04x, %04X, %04X) !\n", 
 		 hMenu, wItemID, wFlags);
 
+    /* Get the Popupmenu to access the owner menu */
+    if (!(menu = (POPUPMENU *) USER_HEAP_LIN_ADDR(hMenu))) 
+	return (UINT)-1;
+
     if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags )))
 	return (UINT)-1;
 
     oldflags = item->fState & (MF_GRAYED | MF_DISABLED);
     item->fState ^= (oldflags ^ wFlags) & (MF_GRAYED | MF_DISABLED);
+
+    /* In win95 if the close item in the system menu change update the close button */
+    if (TWEAK_WineLook == WIN95_LOOK)    
+	if((item->wID == SC_CLOSE) && (oldflags != wFlags))
+	{
+	    if (menu->hSysMenuOwner != 0)
+	    {
+		POPUPMENU* parentMenu;
+
+		/* Get the parent menu to access*/
+		if (!(parentMenu = (POPUPMENU *) USER_HEAP_LIN_ADDR(menu->hSysMenuOwner))) 
+		    return (UINT)-1;
+
+		/* Refresh the frame to reflect the change*/
+		SetWindowPos(parentMenu->hWnd, 0, 0, 0, 0, 0,
+			     SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER);
+	    }
+	}
+	   
     return oldflags;
 }
 
@@ -3777,6 +3805,12 @@
 	if( wndPtr->hSysMenu )
         {
             HMENU retvalue = GetSubMenu16(wndPtr->hSysMenu, 0);
+
+	    /* Store the dummy sysmenu handle to facilitate the refresh */
+	    /* of the close button if the SC_CLOSE item change */
+	    POPUPMENU *menu = (POPUPMENU*) USER_HEAP_LIN_ADDR(retvalue);
+	    menu->hSysMenuOwner = wndPtr->hSysMenu;
+
             WIN_ReleaseWndPtr(wndPtr);
             return retvalue;
         }