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

Timestamp:

Nov 3, 1999, 8:51:44 PM (26 years ago)

Author:

sandervl

Message:

mouse activate + CreateIconIndirect fix

File:

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

trunk/src/user32/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.18 1999-11-03 18:00:25 cbratschi Exp $ */
+/* $Id: pmframe.cpp,v 1.19 1999-11-03 19:51:43 sandervl Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -257 +257 @@
 
         if(!win32wnd->CanReceiveSizeMsgs()) {
-            goto RunDefFrameProc; //CB: must call def frame proc or frame control activation is broken
+//SvL: Doing this breaks button.exe, header4(a).exe & style.exe
+//            goto RunDefFrameProc; //CB: must call def frame proc or frame control activation is broken
             break;
         }
@@ -293 +294 @@
             pswp->hwnd = hwnd;
 
-            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
+            RestoreOS2TIB();
+            return (MRESULT)0xf;
         }
         goto RunDefFrameProc; //CB: must call def frame proc or frame control activation is broken
@@ -422 +423 @@
         if (win32wnd->IsModalDialog())
         {
-          Win32BaseWindow *topOwner = win32wnd->getOwner()->getTopParent();
+          Win32BaseWindow *topOwner = win32wnd->getOwner()->GetTopParent();
 
           if (topOwner) WinSetWindowPos(topOwner->getOS2FrameWindowHandle(),hwnd,0,0,0,0,SWP_ZORDER);