Changeset 963 for trunk/src/user32/window.cpp

Timestamp:

Sep 17, 1999, 8:49:53 PM (26 years ago)

Author:

dengert

Message:

window focus management fixed

File:

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

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.2 1999-09-16 18:00:43 dengert Exp $ */
+/* $Id: window.cpp,v 1.3 1999-09-17 18:49:53 dengert Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -456 +456 @@
 //******************************************************************************
 //******************************************************************************
-HWND WIN32API SetFocus( HWND hwnd)
-{
- HWND lastFocus;
-
-    dprintf(("USER32:  SetFocus\n"));
-
-    lastFocus = GetFocus();
-    hwnd = Win32BaseWindow::Win32ToOS2Handle(hwnd);
-    return (OSLibWinSetFocus(OSLIB_HWND_DESKTOP,hwnd)) ? lastFocus:0;
+HWND WIN32API SetFocus (HWND hwnd)
+{
+    HWND lastFocus, lastFocus_W, hwnd_O;
+    BOOL activate;
+
+    hwnd_O    = Win32BaseWindow::Win32ToOS2Handle (hwnd);
+    lastFocus = OSLibWinQueryFocus (OSLIB_HWND_DESKTOP);
+    activate  = ((hwnd_O == lastFocus) || OSLibWinIsChild (lastFocus, hwnd_O));
+    lastFocus_W = Win32BaseWindow::OS2ToWin32Handle (lastFocus);
+
+    dprintf(("USER32:  SetFocus %x (%x) -> %x (%x)\n", lastFocus_W, lastFocus, hwnd, hwnd_O));
+
+    return (OSLibWinSetFocus (OSLIB_HWND_DESKTOP, hwnd_O, activate)) ? lastFocus_W : 0;
 }
 //******************************************************************************