Changeset 6972 for trunk/src/user32/win32wbase.cpp

Timestamp:

Oct 9, 2001, 7:18:05 AM (24 years ago)

Author:

phaller

Message:

enabled low-level keyboard hook

File:

• trunk/src/user32/win32wbase.cpp (modified) (4 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.288 2001-10-02 17:14:10 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.289 2001-10-09 05:18:03 phaller Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2745 +2745 @@
 BOOL Win32BaseWindow::DestroyWindow()
 {
- HWND hwnd = getWindowHandle();
+  HWND hwnd = getWindowHandle();
 
     dprintf(("DestroyWindow %x", hwnd));
@@ -2754 +2754 @@
         return FALSE;
     }
-
+  
     if(!(getStyle() & WS_CHILD) && getOwner() == NULL)
     {
@@ -2785 +2785 @@
     }
     dprintf(("DestroyWindow %x -> HIDDEN", hwnd));
-
+  
+    // check the handle for the last active popup window
+    Win32BaseWindow* owner = getOwner();
+    if (NULL != owner)
+    {
+      if (owner->getLastActive() == hwnd)
+        owner->setLastActive( owner->getWindowHandle() );
+    }
+  
     fDestroyWindowCalled = TRUE;
     return OSLibWinDestroyWindow(OS2HwndFrame);