Changeset 1542 for trunk/src/user32/pmframe.cpp

Timestamp:

Nov 2, 1999, 6:07:25 PM (26 years ago)

Author:

cbratschi

Message:

frame bug fixes

File:

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

trunk/src/user32/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.16 1999-11-01 19:11:41 sandervl Exp $ */
+/* $Id: pmframe.cpp,v 1.17 1999-11-02 17:07:25 cbratschi Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -245 +245 @@
 
         if(!win32wnd->CanReceiveSizeMsgs()) {
+            goto RunDefFrameProc; //CB: must call def frame proc or frame control activation is broken
             break;
         }
@@ -267 +268 @@
            if(wndAfter) wp.hwndInsertAfter = wndAfter->getWindowHandle();
         }
+
+        //CB: problems with profmine titlebar tracking
         if(win32wnd->MsgPosChanging((LPARAM)&wp) == 0)
         {//app or default window handler changed wp
             dprintf(("PMFRAME: WM_ADJUSTWINDOWPOS, app changed windowpos struct"));
             dprintf(("%x (%d,%d), (%d,%d)", pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
+
             OSLibMapWINDOWPOStoSWPFrame(&wp, pswp, &swpOld, hParent, hwnd);
             dprintf(("%x (%d,%d), (%d,%d)", pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
@@ -277 +281 @@
             pswp->hwnd = hwnd;
 
-            RestoreOS2TIB();
-            return (MRESULT)0xf;
+            goto RunDefFrameProc; //CB: must call def frame proc or frame control activation is broken
+            //RestoreOS2TIB();
+            //return (MRESULT)0xf;
         }
         goto RunDefFrameProc; //CB: must call def frame proc or frame control activation is broken