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

Timestamp:

Jun 14, 2000, 3:17:51 PM (25 years ago)

Author:

sandervl

Message:

region changes

File:

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

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.93 2000-06-08 18:10:10 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.94 2000-06-14 13:15:24 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -200 +200 @@
     case WM_CREATE:
     {
+        RestoreOS2TIB();
+        PMFrameWindowProc(hwnd, msg, mp1, mp2);
+        SetWin32TIB();
 
         if(thdb->newWindow == 0)
@@ -213 +216 @@
             return (MRESULT)TRUE; //discontinue window creation
         }
-        RestoreOS2TIB();
-        PMFrameWindowProc(hwnd, msg, mp1, mp2);
-        SetWin32TIB();
     createfail:
         RestoreOS2TIB();
@@ -235 +235 @@
         win32wnd->MsgDestroy();
         WinSetVisibleRegionNotify(hwnd, FALSE);
-        goto RunDefWndProc;
+        goto RunDefFrameProc;
 
     case WM_ENABLE:
@@ -450 +450 @@
         dprintf(("OS2: WM_ACTIVATE %x %x %x", hwnd, mp1, mp2));
 
+        WinSetWindowUShort(hwnd,QWS_FLAGS, SHORT1FROMMP(mp1) ? (flags | FF_ACTIVE):(flags & ~FF_ACTIVE));
         if(win32wnd->IsWindowCreated()) 
         {
-          WinSetWindowUShort(hwnd,QWS_FLAGS,mp1 ? (flags | FF_ACTIVE):(flags & ~FF_ACTIVE));
           win32wnd->MsgActivate((LOWORD(pWinMsg->wParam) == WA_ACTIVE_W) ? 1 : 0, HIWORD(pWinMsg->wParam), pWinMsg->lParam, (HWND)mp2);
 
@@ -463 +463 @@
           }
         }
-
-        break;
+        RestoreOS2TIB();
+        return 0;
     }
 
@@ -470 +470 @@
     {
         dprintf(("OS2: WM_SIZE (%d,%d) (%d,%d)", SHORT1FROMMP(mp2), SHORT2FROMMP(mp2), SHORT1FROMMP(mp1), SHORT2FROMMP(mp2)));
-        break;
-    }
-
+        goto RunDefWndProc;
+    }
 
     case WM_MINMAXFRAME:
@@ -737 +736 @@
 
     case WM_FOCUSCHANGE:
-        dprintf(("OS2: WM_FOCUSCHANGE %x", win32wnd->getWindowHandle()));
-        goto RunDefWndProc;
+        dprintf(("OS2: WM_FOCUSCHANGE %x %x %x", win32wnd->getWindowHandle(), mp1, mp2));
+        goto RunDefFrameProc;  //partly responsible for activation of frame windows
 
     case WM_QUERYTRACKINFO: