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

Timestamp:

Jun 29, 2000, 2:26:01 PM (25 years ago)

Author:

sandervl

Message:

activation fixes

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.202 2000-06-23 19:04:12 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.203 2000-06-29 12:26:01 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -724 +724 @@
             /* Call WH_SHELL hook */
             if (!(getStyle() & WS_CHILD) && !owner)
-                HOOK_CallHooksA(WH_SHELL, HSHELL_WINDOWCREATED, getWindowHandle(), 0 );
+                HOOK_CallHooksA(WH_SHELL, HSHELL_WINDOWCREATED, getWindowHandle(), 0);
 
             SetLastError(0);
@@ -2133 +2133 @@
     SetWindowPos(HWND_TOP, newPos.left, newPos.top, newPos.right, newPos.bottom, LOWORD(swp));
 
+    if(!(swp & SWP_NOACTIVATE)) {
+        OSLibWinSetActiveWindow(OS2Hwnd);
+    }
+
     if (flags & WIN_NEED_SIZE)
     {
@@ -2283 +2287 @@
         }
     }
-
     if(rc == FALSE)
     {
@@ -2803 +2806 @@
 
     dprintf(("SetActiveWindow %x", getWindowHandle()));
+    if (HOOK_IsHooked( WH_CBT ))
+    {
+        CBTACTIVATESTRUCT cbta;
+        LRESULT ret;
+
+        cbta.fMouse = FALSE;
+        cbta.hWndActive = GetActiveWindow();
+        ret = HOOK_CallHooksA(WH_CBT, HCBT_ACTIVATE, getWindowHandle(), (LPARAM)&cbta);
+        if(ret)
+        {
+            dprintf(("SetActiveWindow %x, CBT hook cancelled operation", getWindowHandle()));
+            return cbta.hWndActive;
+        }
+    }
+
     if(OSLibWinSetActiveWindow(OS2Hwnd) == FALSE) {
         dprintf(("OSLibWinSetActiveWindow %x returned FALSE!", OS2Hwnd));