commit 197a8e163ee5f5db9bb2ceae25c658cf9f1ebe82
author Francois Boisvert <francois@macadamian.com> Sat Feb 13 09:10:17 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Feb 13 09:10:17 1999 +0000
tree e8da40f8f2f9aac81434aa60222439d65e7af396
parent b67af9cd54d1a6f9b07abe22b67068f6f2a26b6b

Implemented the WIN31 Look mdi buttons and also some defines for the
magic menu items.

windows/mdi.c

diff --git a/windows/mdi.c b/windows/mdi.c
index f6ea50b..c07288e 100644
--- a/windows/mdi.c
+++ b/windows/mdi.c
@@ -25,6 +25,7 @@
 #include "resource.h"
 #include "struct32.h"
 #include "sysmetrics.h"
+#include "tweak.h"
 #include "debug.h"
 
 #define MDIF_NEEDUPDATE		0x0001
@@ -775,20 +776,24 @@
     TRACE(mdi,"\tgot popup %04x in sysmenu %04x\n", 
 		hSysPopup, child->hSysMenu);
  
+     AppendMenu32A(frame->wIDmenu,MF_HELP | MF_BITMAP,
+                   SC_MINIMIZE, (LPSTR)(DWORD)MAGIC_REDUCE ) ;
+     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 ))
     {  
+             TRACE(mdi,"not inserted\n");
 	DestroyMenu32(hSysPopup); 
 	return 0; 
     }
-
-    // Using the magic menu id's to insert system buttons in the menu bar
     AppendMenu32A(frame->wIDmenu,MF_HELP | MF_BITMAP,
-                   SC_MINIMIZE, (LPSTR)(DWORD)3 ) ;
-    AppendMenu32A(frame->wIDmenu,MF_HELP | MF_BITMAP,
-                   SC_RESTORE, (LPSTR)(DWORD)2 );
-    AppendMenu32A(frame->wIDmenu,MF_HELP | MF_BITMAP,
-                    SC_CLOSE, (LPSTR)(DWORD)5 );
+                       SC_CLOSE, (LPSTR)(DWORD)MAGIC_CLOSE );
+     }
 
     EnableMenuItem32(hSysPopup, SC_SIZE, MF_BYCOMMAND | MF_GRAYED);
     EnableMenuItem32(hSysPopup, SC_MOVE, MF_BYCOMMAND | MF_GRAYED);
@@ -806,25 +811,31 @@
 static BOOL32 MDI_RestoreFrameMenu( WND *frameWnd, HWND32 hChild )
 {
     INT32 nItems = GetMenuItemCount32(frameWnd->wIDmenu) - 1;
+    UINT32 iId = GetMenuItemID32(frameWnd->wIDmenu,nItems) ;
 
-    TRACE(mdi,"for child %04x\n",hChild);
+    TRACE(mdi,"frameWnd %p,child %04x\n",frameWnd,hChild);
 
-    if( GetMenuItemID32(frameWnd->wIDmenu,nItems) != SC_CLOSE )
+    if(!(iId == SC_RESTORE || iId == SC_CLOSE) )
 	return 0; 
 
+    if(TWEAK_WineLook > WIN31_LOOK)
+    {
+        // app button
     RemoveMenu32(frameWnd->wIDmenu,0,MF_BYPOSITION);
-
+        // close
     DeleteMenu32(frameWnd->wIDmenu,GetMenuItemCount32(frameWnd->wIDmenu) - 1,MF_BYPOSITION);
+    }
+    // restore
     DeleteMenu32(frameWnd->wIDmenu,GetMenuItemCount32(frameWnd->wIDmenu) - 1,MF_BYPOSITION);
+    // minimize
     DeleteMenu32(frameWnd->wIDmenu,GetMenuItemCount32(frameWnd->wIDmenu) - 1,MF_BYPOSITION);
 
-
-
     DrawMenuBar32(frameWnd->hwndSelf);
 
     return 1;
 }
 
+
 /**********************************************************************
  *				        MDI_UpdateFrameText
  *