Changeset 2185 for trunk/src/user32/win32wmdiclient.cpp

Timestamp:

Dec 21, 1999, 6:03:46 PM (26 years ago)

Author:

cbratschi

Message:

WINE 991212, WM_SETREDRAW fix, MDI work

File:

• trunk/src/user32/win32wmdiclient.cpp (modified) (11 diffs)

trunk/src/user32/win32wmdiclient.cpp

@@ -1 @@
-/* $Id: win32wmdiclient.cpp,v 1.16 1999-12-18 16:31:51 cbratschi Exp $ */
+/* $Id: win32wmdiclient.cpp,v 1.17 1999-12-21 17:03:45 cbratschi Exp $ */
 /*
  * Win32 MDI Client Window Class for OS/2
@@ -573 +573 @@
     {
         ::SetMenu(hwndFrame, hmenuFrame);
-#if 0
-        if( ci->hwndChildMaximized )
-            MDI_AugmentFrameMenu(ci, w->parent, ci->hwndChildMaximized );
-#endif
+
+        if (maximizedChild)
+          augmentFrameMenu(maximizedChild);
+
         return oldFrameMenu;
     }
@@ -824 +824 @@
   return TRUE;
 }
-#if 0
+
 /* ----------------------- Frame window ---------------------------- */
 
@@ -830 +830 @@
  *                  MDI_AugmentFrameMenu
  */
-BOOL Win32MDIClientWindow::augmentFrameMenu(HWND hChild )
-{
+BOOL Win32MDIClientWindow::augmentFrameMenu(Win32MDIChildWindow *child)
+{
+/*
     WND*    child = WIN_FindWndPtr(hChild);
     HMENU   hSysPopup = 0;
@@ -843 +844 @@
     WIN_ReleaseWndPtr(child);
 
-    /* create a copy of sysmenu popup and insert it into frame menu bar */
+    // create a copy of sysmenu popup and insert it into frame menu bar
 
     if (!(hSysPopup = LoadMenuA(GetModuleHandleA("USER32"), "SYSMENU")))
     return 0;
 
-    TRACE("\tgot popup %04x in sysmenu %04x\n",
-        hSysPopup, child->hSysMenu);
+    //TRACE("\tgot popup %04x in sysmenu %04x\n",
+    //    hSysPopup, child->hSysMenu);
 
     AppendMenuA(frame->wIDmenu,MF_HELP | MF_BITMAP,
@@ -856 +857 @@
                    SC_RESTORE, (LPSTR)(DWORD)HBMMENU_MBAR_RESTORE );
 
-  /* In Win 95 look, the system menu is replaced by the child icon */
+  // In Win 95 look, the system menu is replaced by the child icon
 
   if(TWEAK_WineLook > WIN31_LOOK)
@@ -900 +901 @@
     }
 
-    /* The close button is only present in Win 95 look */
+    // The close button is only present in Win 95 look
     if(TWEAK_WineLook > WIN31_LOOK)
     {
@@ -912 +913 @@
     SetMenuDefaultItem(hSysPopup, SC_CLOSE, FALSE);
 
-    /* redraw menu */
+    // redraw menu
     DrawMenuBar(frame->hwndSelf);
-
+*/
     return 1;
 }
@@ -921 +922 @@
  *                  MDI_RestoreFrameMenu
  */
-static BOOL MDI_RestoreFrameMenu( WND *frameWnd, HWND hChild )
-{
+BOOL Win32MDIClientWindow::restoreFrameMenu(Win32MDIChildWindow *child)
+{
+/*
     MENUITEMINFOA menuInfo;
     INT nItems = GetMenuItemCount(frameWnd->wIDmenu) - 1;
@@ -936 +938 @@
      * as it is in win95, we have to delete the bitmap.
      */
+/*
     menuInfo.cbSize = sizeof(MENUITEMINFOA);
     menuInfo.fMask  = MIIM_DATA | MIIM_TYPE;
@@ -955 +958 @@
     if(TWEAK_WineLook > WIN31_LOOK)
     {
-        /* close */
+        // close
         DeleteMenu(frameWnd->wIDmenu,GetMenuItemCount(frameWnd->wIDmenu) - 1,MF_BYPOSITION);
     }
-    /* restore */
+    // restore
     DeleteMenu(frameWnd->wIDmenu,GetMenuItemCount(frameWnd->wIDmenu) - 1,MF_BYPOSITION);
-    /* minimize */
+    // minimize
     DeleteMenu(frameWnd->wIDmenu,GetMenuItemCount(frameWnd->wIDmenu) - 1,MF_BYPOSITION);
 
     DrawMenuBar(frameWnd->hwndSelf);
-
+*/
     return 1;
 }
-#endif
 
 /***********************************************************************