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

Timestamp:

May 12, 2001, 10:25:57 AM (24 years ago)

Author:

sandervl

Message:

focus changes

File:

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

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.128 2001-05-11 20:40:39 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.129 2001-05-12 08:25:56 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -306 +306 @@
         goto RunDefWndProc;
 
-    case WM_SETFOCUS:
-    {
-      HWND hwndFocus = (HWND)mp1;
-
-        dprintf(("OS2: WM_SETFOCUS %x %x (%x) %d", win32wnd->getWindowHandle(), mp1, OS2ToWin32Handle(hwndFocus), mp2));
-
+    case WIN32APP_SETFOCUSMSG:
         //PM doesn't allow SetFocus calls during WM_SETFOCUS message processing;
         //must delay this function call
+        //mp1 = win32 window handle
+        //mp2 = activate flag
+        dprintf(("USER32: Delayed SetFocus %x %x call!", teb->o.odin.hwndFocus, mp1));
+        if(teb->o.odin.hwndFocus) {
+            win32wnd = Win32BaseWindow::GetWindowFromHandle(teb->o.odin.hwndFocus);
+            if(win32wnd) {
+                 WinFocusChange(HWND_DESKTOP, win32wnd->getOS2WindowHandle(), (mp2) ? FC_NOLOSEACTIVE : 0);
+            }
+            else DebugInt3();
+        }
+        break;
+
+    case WM_SETFOCUS:
+    {
+      HWND hwndFocus = (HWND)mp1;
+
+        dprintf(("OS2: WM_SETFOCUS %x %x (%x) %d", win32wnd->getWindowHandle(), mp1, OS2ToWin32Handle(hwndFocus), mp2));
+
+        //PM doesn't allow SetFocus calls during WM_SETFOCUS message processing;
+        //must delay this function call
 
         teb->o.odin.fWM_SETFOCUS = TRUE;
         teb->o.odin.hwndFocus    = 0;
-        if(WinQueryWindowULong(hwndFocus, OFFSET_WIN32PM_MAGIC) != WIN32PM_MAGIC) {
+        if(WinQueryWindowULong(hwndFocus, OFFSET_WIN32PM_MAGIC) != WIN32PM_MAGIC)
+        {
                 //another (non-win32) application's window
                 //set to NULL (allowed according to win32 SDK) to avoid problems
@@ -565 +581 @@
     }
 
-    case WIN32APP_SETFOCUSMSG:
-        //PM doesn't allow SetFocus calls during WM_SETFOCUS message processing;
-        //must delay this function call
-        //mp1 = win32 window handle
-        //mp2 = activate flag
-        dprintf(("USER32: Delayed SetFocus %x %x call!", teb->o.odin.hwndFocus, mp1));
-        if(teb->o.odin.hwndFocus) {
-            win32wnd = Win32BaseWindow::GetWindowFromHandle(teb->o.odin.hwndFocus);
-            teb->o.odin.hwndFocus = 0;
-            if(win32wnd) {
-                 WinFocusChange(HWND_DESKTOP, win32wnd->getOS2FrameWindowHandle(), (mp2) ? FC_NOLOSEACTIVE : 0);
-            }
-            else DebugInt3();
-        }
-        break;
-
     case WM_PAINT:
     {
@@ -1351 +1351 @@
     RestoreOS2TIB();
     //calling WinDefWindowProc here break Opera hotlist window (WM_ADJUSTWINDOWPOS)
-    return pfnFrameWndProc(hwnd, msg, mp1, mp2);
-//    return WinDefWindowProc( hwnd, msg, mp1, mp2 );
+//    return pfnFrameWndProc(hwnd, msg, mp1, mp2);
+    return WinDefWindowProc( hwnd, msg, mp1, mp2 );
 }
 //******************************************************************************