Changeset 5713 for trunk/src/user32/pmwindow.cpp

Timestamp:

May 15, 2001, 4:31:40 PM (24 years ago)

Author:

sandervl

Message:

SetFocus fix

File:

• trunk/src/user32/pmwindow.cpp (modified) (7 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.129 2001-05-12 08:25:56 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.130 2001-05-15 14:31:39 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -125 +125 @@
         (PFNWP)Win32FrameWindowProc,       /* Address of window procedure  */
         CS_FRAME,
-        FrameClassInfo.cbWindowData+NROF_WIN32WNDBYTES))
+        FrameClassInfo.cbWindowData))
     {
         dprintf(("WinRegisterClass Win32BaseWindow failed %x", WinGetLastError(hab)));
@@ -145 +145 @@
     DevCloseDC(hdc);
 
-    dprintf(("InitPM: Desktop (%d,%d)", ScreenWidth, ScreenHeight));
+    dprintf(("InitPM: Desktop (%d,%d) bpp %d", ScreenWidth, ScreenHeight, ScreenBitsPerPel));
     return TRUE;
 } /* End of main */
@@ -310 +310 @@
         //must delay this function call
         //mp1 = win32 window handle
-        //mp2 = activate flag
-        dprintf(("USER32: Delayed SetFocus %x %x call!", teb->o.odin.hwndFocus, mp1));
+        //mp2 = top parent if activation required
+        dprintf(("USER32: Delayed SetFocus %x %x %x call!", teb->o.odin.hwndFocus, mp1, mp2));
         if(teb->o.odin.hwndFocus) {
             win32wnd = Win32BaseWindow::GetWindowFromHandle(teb->o.odin.hwndFocus);
             if(win32wnd) {
-                 WinFocusChange(HWND_DESKTOP, win32wnd->getOS2WindowHandle(), (mp2) ? FC_NOLOSEACTIVE : 0);
+                 if(mp2) {
+                    SetActiveWindow((HWND)mp2);
+                 }
+                 if(!IsWindow(win32wnd->getWindowHandle())) break;       //abort if window destroyed
+                 WinFocusChange(HWND_DESKTOP, win32wnd->getOS2WindowHandle(), FC_NOSETACTIVE);
             }
             else DebugInt3();
@@ -578 +582 @@
     {
         //WM_CREATE handled during client window creation
+        dprintf(("PMFRAME: WM_CREATE %x"));
         goto RunDefFrameWndProc;
     }
@@ -584 +589 @@
     {
       RECTL rectl;
-
 
         HPS hps = WinBeginPaint(hwnd, NULL, &rectl);
@@ -1350 +1354 @@
 RunDefWndProc:
     RestoreOS2TIB();
-    //calling WinDefWindowProc here break Opera hotlist window (WM_ADJUSTWINDOWPOS)
+    //calling WinDefWindowProc here breaks Opera hotlist window (WM_ADJUSTWINDOWPOS)
 //    return pfnFrameWndProc(hwnd, msg, mp1, mp2);
     return WinDefWindowProc( hwnd, msg, mp1, mp2 );