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

Timestamp:

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

Author:

sandervl

Message:

IsWindowVisible & IsWindowEnabled updates + fixes

File:

• trunk/src/user32/win32wbase.cpp (modified) (6 diffs)

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
 }
 //******************************************************************************