Changeset 5586 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

IsWindowVisible & IsWindowEnabled updates + fixes

Location:

trunk/src/user32

Files:

• oslibmsgtranslate.cpp (modified) (4 diffs)
• win32wbase.cpp (modified) (6 diffs)
• win32wbase.h (modified) (3 diffs)
• window.cpp (modified) (4 diffs)

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.46 2001-04-02 09:52:01 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.47 2001-04-25 20:53:38 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -366 +366 @@
       winMsg->wParam  = 0;
       winMsg->lParam  = MAKELONG(winMsg->pt.x,winMsg->pt.y);
-      if(!win32wnd->IsWindowEnabled()) {
+      if(!IsWindowEnabled(win32wnd->getWindowHandle())) {
                 if(win32wnd->getParent()) {
                         winMsg->hwnd = win32wnd->getParent()->getWindowHandle();
@@ -407 +407 @@
 
         //if a window is disabled, it's parent receives the mouse messages
-        if(!win32wnd->IsWindowEnabled()) {
+        if(!IsWindowEnabled(win32wnd->getWindowHandle())) {
             if(win32wnd->getParent()) {
                 win32wnd = win32wnd->getParent();
@@ -492 +492 @@
 
         //if a window is disabled, it's parent receives the mouse messages
-        if(!win32wnd->IsWindowEnabled()) {
+        if(!IsWindowEnabled(win32wnd->getWindowHandle())) {
             if(win32wnd->getParent()) {
                 win32wnd = win32wnd->getParent();

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.251 2001-04-15 17:05:29 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.252 2001-04-25 20:53:38 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1349 +1349 @@
    */
   if ( (uFlags & PRF_CHECKVISIBLE) &&
-       !IsWindowVisible() )
+       !IsWindowVisible(getWindowHandle()) )
       return 0;
 
@@ -2482 +2482 @@
     swp.hwnd = OS2Hwnd;
 
-    if(fuFlags & SWP_SHOWWINDOW && !IsWindowVisible()) {
+    if(fuFlags & SWP_SHOWWINDOW && !IsWindowVisible(getWindowHandle())) {
         setStyle(getStyle() | WS_VISIBLE);
         if(hTaskList) {
@@ -2490 +2490 @@
     }
     else
-    if((fuFlags & SWP_HIDEWINDOW) && IsWindowVisible()) {
+    if((fuFlags & SWP_HIDEWINDOW) && IsWindowVisible(getWindowHandle())) {
         setStyle(getStyle() & ~WS_VISIBLE);
         if(hTaskList && !(getStyle() & WS_MINIMIZE)) {
@@ -2697 +2697 @@
     }
     /* Hide the window */
-    if(IsWindowVisible())
+    if(IsWindowVisible(getWindowHandle()))
     {
         SetWindowPos(0, 0, 0, 0, 0, SWP_HIDEWINDOW |
@@ -3253 +3253 @@
 
   return OS2ToWin32Handle(hwndActive);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL Win32BaseWindow::IsWindowEnabled()
-{
-    return OSLibWinIsWindowEnabled(OS2Hwnd);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL Win32BaseWindow::IsWindowVisible()
-{
-    //TODO: Do we have to check the state of the parent window? (as Wine does)
-#if 1
-    return (dwStyle & WS_VISIBLE) == WS_VISIBLE;
-#else
-    return OSLibWinIsWindowVisible(OS2Hwnd);
-#endif
 }
 //******************************************************************************

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.113 2001-04-12 14:04:33 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.114 2001-04-25 20:53:39 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -160 +160 @@
          HWND   getWindowHandle()               { return Win32Hwnd; };
          HWND   getOS2WindowHandle()            { return OS2Hwnd; };
+
  Win32WndClass *getWindowClass()                { return windowClass; };
 
@@ -254 +255 @@
          BOOL   IsWindowCreated()             { return fCreated; }
          BOOL   IsWindowDestroyed()           { return fIsDestroyed; };
-         BOOL   IsWindowEnabled();
-         BOOL   IsWindowVisible();
          BOOL   IsWindowIconic();
          //Window procedure type

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;