Changeset 1542 for trunk/src/user32

Timestamp:

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

Author:

cbratschi

Message:

frame bug fixes

Location:

trunk/src/user32

Files:

• pmframe.cpp (modified) (4 diffs)
• win32dlg.cpp (modified) (3 diffs)
• win32wbase.cpp (modified) (7 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

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.26 1999-10-31 01:14:42 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.27 1999-11-02 17:07:25 cbratschi Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -19 +19 @@
 #include <win32dlg.h>
 #include "oslibmsg.h"
+#include "oslibwin.h"
 #include "win32wdesktop.h"
 #include "controls.h"
@@ -270 +271 @@
     {
         topOwner->EnableWindow( FALSE );
+        //CB: todo: make modal, implement modeless, remove FCF_TASKLIST
+        //    emulate WinProcessDlg
         ShowWindow( SW_SHOW );
 

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.71 1999-11-01 19:11:43 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.72 1999-11-02 17:07:25 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1601 +1601 @@
     case WM_SETTEXT:
     {
-        if(!fInternalMsg) 
+        if(!fInternalMsg)
         {
            LRESULT result;
@@ -2422 +2422 @@
 HWND Win32BaseWindow::SetActiveWindow()
 {
-  return OSLibWinSetActiveWindow(OS2Hwnd);
+  return OSLibWinSetActiveWindow(OS2HwndFrame);
 }
 //******************************************************************************
@@ -2429 +2429 @@
 BOOL Win32BaseWindow::EnableWindow(BOOL fEnable)
 {
-  return OSLibWinEnableWindow(OS2Hwnd, fEnable);
+  return OSLibWinEnableWindow(OS2HwndFrame, fEnable);
 }
 //******************************************************************************
@@ -2435 +2435 @@
 BOOL Win32BaseWindow::CloseWindow()
 {
-  return OSLibWinMinimizeWindow(OS2Hwnd);
+  return OSLibWinMinimizeWindow(OS2HwndFrame);
 }
 //******************************************************************************
@@ -2459 +2459 @@
 BOOL Win32BaseWindow::IsWindowEnabled()
 {
-    return OSLibWinIsWindowEnabled(OS2Hwnd);
+    return OSLibWinIsWindowEnabled(OS2HwndFrame);
 }
 //******************************************************************************
@@ -2468 +2468 @@
     return (dwStyle & WS_VISIBLE) == WS_VISIBLE;
 #else
-    return OSLibWinIsWindowVisible(OS2Hwnd);
+    return OSLibWinIsWindowVisible(OS2HwndFrame);
 #endif
 }