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

Timestamp:

May 11, 2001, 10:40:40 PM (24 years ago)

Author:

sandervl

Message:

fixes

File:

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

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.95 2001-05-11 08:39:46 sandervl Exp $ */
+/* $Id: window.cpp,v 1.96 2001-05-11 20:40:40 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -715 +715 @@
 HWND WIN32API SetFocus(HWND hwnd)
 {
+ Win32BaseWindow *window;
  HWND lastFocus, lastFocus_W, hwnd_O;
  BOOL activate;
@@ -725 +726 @@
     }
 
-    hwnd_O    = Win32ToOS2Handle (hwnd);
-    lastFocus = OSLibWinQueryFocus (OSLIB_HWND_DESKTOP);
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if(!window) {
+        dprintf(("SetFocus, window %x not found", hwnd));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return 0;
+    }
+
+    hwnd_O    = window->getOS2FrameWindowHandle();
+    if(teb->o.odin.hwndFocus) {
+         lastFocus = teb->o.odin.hwndFocus;
+    }
+    else lastFocus = OSLibWinQueryFocus (OSLIB_HWND_DESKTOP);
+
     activate  = ((hwnd_O == lastFocus) || OSLibWinIsChild (lastFocus, hwnd_O));
     lastFocus_W = OS2ToWin32Handle (lastFocus);
@@ -742 +754 @@
         return lastFocus_W;
     }
+    teb->o.odin.hwndFocus = 0;
     return (OSLibWinSetFocus (OSLIB_HWND_DESKTOP, hwnd_O, activate)) ? lastFocus_W : 0;
 }