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

Timestamp:

Feb 29, 2000, 8:16:12 PM (25 years ago)

Author:

sandervl

Message:

kdb hook change

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.169 2000-02-24 19:19:08 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.170 2000-02-29 19:16:12 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2569 +2569 @@
 {
  HWND hwndActive;
- Win32BaseWindow  *win32wnd;
- ULONG         magic;
 
     dprintf(("SetActiveWindow %x", getWindowHandle()));
-    hwndActive = OSLibWinSetActiveWindow(OS2HwndFrame);
-    win32wnd = (Win32BaseWindow *)OSLibWinGetWindowULong(hwndActive, OFFSET_WIN32WNDPTR);
-    magic    = OSLibWinGetWindowULong(hwndActive, OFFSET_WIN32PM_MAGIC);
-    if(CheckMagicDword(magic) && win32wnd)
-    {
-        return win32wnd->getWindowHandle();
-    }
-    return windowDesktop->getWindowHandle(); //pretend the desktop was active
+    if(OSLibWinSetActiveWindow(OS2HwndFrame) == FALSE) {
+        dprintf(("OSLibWinSetActiveWindow %x returned FALSE!", OS2HwndFrame));
+    }
+    hwndActive = GetActiveWindow();
+    return (hwndActive) ? hwndActive : windowDesktop->getWindowHandle(); //pretend the desktop was active
 }
 //******************************************************************************