Changeset 20134

Timestamp:

Jan 2, 2003, 6:02:06 PM (22 years ago)

Author:

sandervl

Message:

corrected regressions caused by previous setfocus fix; make sure owner isn't disabled when specifying SWP_DEACTIVATE

Location:

tags/trunk/src/user32

Files:

• oslibwin.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (2 diffs)
• window.cpp (modified) (2 diffs)

tags/trunk/src/user32/oslibwin.cpp ¶

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.135 2003-01-02 15:21:58 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.136 2003-01-02 17:02:04 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -734 +734 @@
    //SvL: Must also deactivate the window when hiding it or else focus won't
    //     change. (NOTE: make sure this doesn't cause regressions (01-02-2003)
-   if (  fuFlags & SWP_HIDEWINDOW_W)  flags |= SWP_HIDE|SWP_DEACTIVATE;
+   if (  fuFlags & SWP_HIDEWINDOW_W) {
+       flags |= SWP_HIDE|SWP_DEACTIVATE;
+   }
 
    if (  fuFlags & SWP_NOSENDCHANGING_W) flags |= SWP_NOADJUST;

tags/trunk/src/user32/win32wbase.cpp ¶

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.349 2003-01-01 14:29:44 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.350 2003-01-02 17:02:05 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2580 +2580 @@
     swp.hwnd = OS2HwndFrame;
 
+    //SvL: Must also deactivate the window when hiding it or else focus won't
+    //     change. (NOTE: make sure this doesn't cause regressions (01-02-2003)
+    if((swp.fl & (SWPOS_HIDE|SWPOS_DEACTIVATE)) == (SWPOS_HIDE|SWPOS_DEACTIVATE)) 
+    {
+        //we must make sure the owner is not disabled or else the focus will
+        //be switched to the wrong window
+        Win32BaseWindow *topOwner;
+
+        if(getOwner() == NULL) {
+             windowDesktop->addRef();
+             topOwner = windowDesktop;
+        }
+        else topOwner = GetWindowFromHandle(getOwner()->GetTopParent());
+
+        if(topOwner != NULL) {
+             DWORD dwStyle = topOwner->GetWindowLong(GWL_STYLE, FALSE);
+             if(dwStyle & WS_DISABLED) {
+                 swp.fl &= ~SWPOS_DEACTIVATE;
+             }
+        }
+        else DebugInt3();
+    }
+
     if(fuFlags & SWP_SHOWWINDOW && !IsWindowVisible(getWindowHandle())) {
         setStyle(getStyle() | WS_VISIBLE);

tags/trunk/src/user32/window.cpp ¶

@@ -1 @@
-/* $Id: window.cpp,v 1.129 2003-01-02 15:21:45 sandervl Exp $ */
+/* $Id: window.cpp,v 1.130 2003-01-02 17:02:06 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -756 +756 @@
  BOOL activate, ret;
  TEB *teb;
-    
+
+    dprintf(("SetFocus %x", hwnd));    
     teb = GetThreadTEB();
     if(teb == NULL) {