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

Timestamp:

Dec 24, 2000, 3:54:07 PM (25 years ago)

Author:

sandervl

Message:

MDI + SetParent + activation fixes

File:

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

trunk/src/user32/win32wmdiclient.cpp

@@ -1 @@
-/* $Id: win32wmdiclient.cpp,v 1.31 2000-12-17 15:04:12 sandervl Exp $ */
+/* $Id: win32wmdiclient.cpp,v 1.32 2000-12-24 14:54:07 sandervl Exp $ */
 /*
  * Win32 MDI Client Window Class for OS/2
@@ -566 +566 @@
         AppendMenuA( hmenuWindow, MF_SEPARATOR, 0, NULL);
 
+#if 1
+        if( nActiveChildren )
+        {
+            INT j = i - nActiveChildren + 1;
+            char buffer[100];
+            UINT id,state;
+
+            for( ; i >= j ; i-- )
+            {
+                id = GetMenuItemID(hWindowMenu,i );
+                state = GetMenuState(hWindowMenu,i,MF_BYPOSITION);
+
+                GetMenuStringA(hWindowMenu, i, buffer, 100, MF_BYPOSITION);
+
+                DeleteMenu(hWindowMenu, i , MF_BYPOSITION);
+                InsertMenuA(hmenuWindow, pos, MF_BYPOSITION | MF_STRING,
+                              id, buffer);
+                CheckMenuItem(hmenuWindow ,pos , MF_BYPOSITION | (state & MF_CHECKED));
+            }
+        }
+#else
+//doesn't work:
         if( nActiveChildren )
         {
@@ -603 +625 @@
             }
         }
-
+#endif
         /* remove separator */
         DeleteMenu(hWindowMenu, i, MF_BYPOSITION);