Changeset 8846 for trunk/src

Timestamp:

Jul 8, 2002, 12:21:55 PM (23 years ago)

Author:

sandervl

Message:

Changed SetFocus fix; only disallow focus change for minimized and disabled windows.

File:

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

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.123 2002-07-05 18:15:11 sandervl Exp $ */
+/* $Id: window.cpp,v 1.124 2002-07-08 10:21:55 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -731 +731 @@
  Win32BaseWindow *window;
  Win32BaseWindow *oldfocuswnd;
- HWND lastFocus, lastFocus_W, hwnd_O, hwndTopParent;
+ HWND lastFocus, lastFocus_W, hwnd_O, hwndTopParent, hwndTop;
  BOOL activate, ret;
  TEB *teb;
@@ -740 +740 @@
         return 0;
     }
-   
-    if (!IsWindowVisible(hwnd)) 
-    {
-        dprintf(("SetFocus, %x not allowed on invisible window", hwnd));
-        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
-        return 0;
-    }
 
     window = Win32BaseWindow::GetWindowFromHandle(hwnd);
@@ -753 +746 @@
         SetLastError(ERROR_INVALID_WINDOW_HANDLE);
         return 0;
+    }
+
+    //SetFocus is not allowed for minimized or disabled windows (this window
+    //or any parent)
+    hwndTop = hwnd;
+    for (;;)
+    {
+        HWND parent;
+
+        LONG style = GetWindowLongW( hwndTop, GWL_STYLE );
+        if (style & (WS_MINIMIZE | WS_DISABLED)) {
+            dprintf(("SetFocus, %x not allowed on minimized or disabled window (%x)", hwnd, style));
+            return 0;
+        }
+        parent = GetParent(hwndTop);
+        if (!parent || parent == GetDesktopWindow()) break;
+        hwndTop = parent;
     }