Changeset 5965 for trunk/src/user32

Timestamp:

Jun 11, 2001, 5:05:44 PM (24 years ago)

Author:

sandervl

Message:

mdi activate bugfix

File:

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

trunk/src/user32/win32wmdiclient.cpp

@@ -1 @@
-/* $Id: win32wmdiclient.cpp,v 1.35 2001-06-09 14:50:23 sandervl Exp $ */
+/* $Id: win32wmdiclient.cpp,v 1.36 2001-06-11 15:05:44 sandervl Exp $ */
 /*
  * Win32 MDI Client Window Class for OS/2
@@ -347 +347 @@
     /* Don't activate if it is already active. Might happen 
        since ShowWindow DOES activate MDI children */
-    if(activeChild == child->getWindowHandle())
+    if((child && activeChild == child->getWindowHandle()) ||
+       (child == 0 && activeChild == 0))
     {
         if(prevActive) RELEASE_WNDOBJ(prevActive);
@@ -383 +384 @@
 
     dprintf(("childActivate: %x %x", this, (child) ? child->getWindowHandle() : 0));
-    activeChild = child->getWindowHandle();
+    activeChild = (child) ? child->getWindowHandle() : 0;
 
     /* check if we have any children left */