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

Timestamp:

Jul 8, 2002, 12:51:01 PM (23 years ago)

Author:

sandervl

Message:

Added GetAncestor; SetFocus fix

File:

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

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.124 2002-07-08 10:21:55 sandervl Exp $ */
+/* $Id: window.cpp,v 1.125 2002-07-08 10:51:01 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -727 +727 @@
 //******************************************************************************
 //******************************************************************************
+HWND WINAPI GetAncestor( HWND hwnd, UINT type )
+{
+    HWND hwndAncestor = 0;
+
+    if (type == GA_PARENT)
+    {
+        LONG dwStyle = GetWindowLongW( hwnd, GWL_STYLE );
+        if(dwStyle & WS_CHILD) {
+            hwndAncestor = GetParent(hwnd);
+        }
+        //else no child -> no parent (GetParent returns owner otherwise!)
+        return hwndAncestor;
+    }
+    dprintf(("Unsupported type %d", type));
+    return 0;
+}
+//******************************************************************************
+//******************************************************************************
 HWND WIN32API SetFocus(HWND hwnd)
 {
@@ -741 +759 @@
     }
 
-    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
-    if(!window) {
-        dprintf(("SetFocus, window %x not found", hwnd));
-        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
-        return 0;
-    }
-
     //SetFocus is not allowed for minimized or disabled windows (this window
     //or any parent)
@@ -760 +771 @@
             return 0;
         }
-        parent = GetParent(hwndTop);
+        parent = GetAncestor(hwndTop, GA_PARENT);
         if (!parent || parent == GetDesktopWindow()) break;
         hwndTop = parent;
+    }
+
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if(!window) {
+        dprintf(("SetFocus, window %x not found", hwnd));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return 0;
     }