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

Timestamp:

Apr 25, 2001, 10:53:39 PM (24 years ago)

Author:

sandervl

Message:

IsWindowVisible & IsWindowEnabled updates + fixes

File:

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

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.93 2001-04-12 14:04:33 sandervl Exp $ */
+/* $Id: window.cpp,v 1.94 2001-04-25 20:53:39 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -653 +653 @@
 {
   Win32BaseWindow *window;
+  DWORD            dwStyle;
 
     window = Win32BaseWindow::GetWindowFromHandle(hwnd);
@@ -661 +662 @@
     }
     dprintf(("IsWindowEnabled %x", hwnd));
-    return window->IsWindowEnabled();
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API IsWindowVisible( HWND hwnd)
-{
-  Win32BaseWindow *window;
-  BOOL rc;
-
-    if (hwnd)
-      window = Win32BaseWindow::GetWindowFromHandle(hwnd);
-    else
-      window = windowDesktop;
+    dwStyle = GetWindowLongA(hwnd, GWL_STYLE);
+    if(dwStyle & WS_DISABLED) {
+        return FALSE;
+    }
+    return TRUE;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API IsWindowVisible(HWND hwnd)
+{
+  Win32BaseWindow *window;
+  BOOL             ret;
+  HWND             hwndParent;
+  DWORD            dwStyle;
+
+    if(!hwnd) {//TODO: verify in NT!
+        dprintf(("IsWindowVisible DESKTOP returned TRUE"));
+        return TRUE;    //desktop is always visible
+    }
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+
     if(!window) {
         dprintf(("IsWindowVisible, window %x not found", hwnd));
@@ -679 +688 @@
         return 0;
     }
-    rc = window->IsWindowVisible();
-    dprintf(("IsWindowVisible %x returned %d", hwnd, rc));
-    return rc;
-}
-//******************************************************************************
-//******************************************************************************
-HWND WIN32API SetFocus (HWND hwnd)
+    //check visibility of this window
+    dwStyle = GetWindowLongA(hwnd, GWL_STYLE);
+    if(!(dwStyle & WS_VISIBLE)) {
+        ret = FALSE;
+        goto end;
+    }
+    ret = TRUE;
+
+    //check visibility of parents
+    hwndParent = GetParent(hwnd);
+    while(hwndParent) {
+        dwStyle = GetWindowLongA(hwndParent, GWL_STYLE);
+        if(!(dwStyle & WS_VISIBLE)) {
+            dprintf(("IsWindowVisible %x returned FALSE (parent %x invisible)", hwnd, hwndParent));
+            return FALSE;
+        }
+        hwndParent = GetParent(hwndParent);
+    }
+
+end:
+    dprintf(("IsWindowVisible %x returned %d", hwnd, ret));
+    return ret;
+}
+//******************************************************************************
+//******************************************************************************
+HWND WIN32API SetFocus(HWND hwnd)
 {
  HWND lastFocus, lastFocus_W, hwnd_O;