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

Timestamp:

Oct 17, 1999, 2:17:46 PM (26 years ago)

Author:

cbratschi

Message:

added WINE scrollbars to frame, fixed pmframe, WM_ENTERIDLE

File:

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

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.32 1999-10-16 18:56:51 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.33 1999-10-17 12:17:44 cbratschi Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -257 +257 @@
 
         if ((pswp->fl & (SWP_SIZE | SWP_MOVE | SWP_ZORDER)) == 0) break;
-        if (!win32wnd->CanReceiveSizeMsgs())    break;
+        if (!win32wnd->CanReceiveSizeMsgs())    break;
 
         WinQueryWindowPos(hwnd, &swpOld);
@@ -263 +263 @@
         if(pswp->fl & (SWP_MOVE | SWP_SIZE)) {
             if (win32wnd->isChild()) {
-                if(win32wnd->getParent()) {
-                        hParent = win32wnd->getParent()->getOS2WindowHandle();
-                }
-                else    break;
-            }
+                if(win32wnd->getParent()) {
+                        hParent = win32wnd->getParent()->getOS2WindowHandle();
+                }
+                else    break;
+            }
             else
                 hFrame = win32wnd->getOS2FrameWindowHandle();
@@ -297 +297 @@
 
         if ((pswp->fl & (SWP_SIZE | SWP_MOVE | SWP_ZORDER)) == 0) break;
-        if (!win32wnd->CanReceiveSizeMsgs())    break;
+        if (!win32wnd->CanReceiveSizeMsgs())    break;
 
         if(pswp->fl & (SWP_MOVE | SWP_SIZE)) {
             if (win32wnd->isChild()) {
-                if(win32wnd->getParent()) {
-                        hParent = win32wnd->getParent()->getOS2WindowHandle();
-                }
-                else    goto RunDefWndProc; //parent has just been destroyed
+                if(win32wnd->getParent()) {
+                        hParent = win32wnd->getParent()->getOS2WindowHandle();
+                }
+                else    goto RunDefWndProc; //parent has just been destroyed
             }
             else
@@ -311 +311 @@
         OSLibMapSWPtoWINDOWPOS(pswp, &wp, pswpo, hParent, hFrame);
 
-        SWP swpFrame;
+        SWP swpFrame;
         WinQueryWindowPos(WinQueryWindow(hwnd, QW_PARENT), &swpFrame);
         dprintf(("WINDOWPOSCHANGE %x %x %x (%d,%d) (%d,%d)", win32wnd->getWindowHandle(), win32wnd->getOS2FrameWindowHandle(),
                          swpFrame.fl,swpFrame.x, swpFrame.y, swpFrame.cx, swpFrame.cy));
-        POINTL point;
-
-        point.x = swpFrame.x;
-        point.y = swpFrame.y;
-        if(win32wnd->getParent() != NULL)
-        {
-                WinMapWindowPoints(WinQueryWindow(hwnd, QW_PARENT), HWND_DESKTOP,
-                                   &point, 1);
-        }
-        point.y = OSLibQueryScreenHeight() - point.y - swpFrame.cy;
+        POINTL point;
+
+        point.x = swpFrame.x;
+        point.y = swpFrame.y;
+        if(win32wnd->getParent() != NULL)
+        {
+                WinMapWindowPoints(WinQueryWindow(hwnd, QW_PARENT), HWND_DESKTOP,
+                                   &point, 1);
+        }
+        point.y = OSLibQueryScreenHeight() - point.y - swpFrame.cy;
         win32wnd->setWindowRect(point.x, point.y, point.x+swpFrame.cx, point.y+swpFrame.cy);
         win32wnd->setClientRect(pswpo->x, pswpo->y, pswpo->x + pswpo->cx, pswpo->y + pswpo->cy);
@@ -614 +614 @@
     //Slider messages
     //**************************************************************************
+/* CB: handled internally
     case WM_VSCROLL:
     case WM_HSCROLL:
@@ -630 +631 @@
     break;
     }
+*/
 
     case WM_CONTROL:
@@ -845 +847 @@
     case WM_ERASEBACKGROUND:
     {
-        dprintf(("OS2: WM_ERASEBACKGROUND %x", win32wnd->getWindowHandle()));
+        dprintf(("OS2: WM_ERASEBACKGROUND %x", win32wnd->getWindowHandle()));
         if (!win32wnd->isSupressErase()) {
             BOOL erased = sendEraseBkgnd (win32wnd);
@@ -916 +918 @@
 //******************************************************************************
 //******************************************************************************
+MRESULT EXPENTRY Win32SubclassWindowProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
+{
+  Win32BaseWindow* win32wnd;
+
+  //Restore our FS selector
+  SetWin32TIB();
+
+  win32wnd = Win32BaseWindow::GetWindowFromOS2Handle(hwnd);
+
+  if (!win32wnd)
+  {
+    dprintf(("Invalid win32wnd pointer for subclassed window %x!!", hwnd));
+    goto RunDefWndProc;
+  }
+
+  switch (msg)
+  {
+    case WM_WINDOWPOSCHANGED:
+      {
+        PSWP      pswp  = (PSWP)mp1;
+        PSWP      pswpo = pswp + 1;
+        WINDOWPOS wp;
+        HWND      hParent = NULLHANDLE, hFrame = NULLHANDLE;
+
+        if ((pswp->fl & (SWP_SIZE | SWP_MOVE | SWP_ZORDER)) == 0) break;
+
+        if(pswp->fl & (SWP_MOVE | SWP_SIZE))
+          hFrame = WinQueryWindow(hwnd, QW_PARENT);
+
+        OSLibMapSWPtoWINDOWPOS(pswp,&wp,pswpo,hParent,hFrame);
+        win32wnd->MsgPosChanged((LPARAM)&wp);
+
+        goto RunOldWndProc;
+      }
+
+    default:
+      goto RunDefHandler;
+  }
+
+RunDefWndProc:
+  RestoreOS2TIB();
+  return WinDefWindowProc(hwnd,msg,mp1,mp2);
+
+RunOldWndProc:
+  RestoreOS2TIB();
+  return ((PFNWP)win32wnd->getOldWndProc())(hwnd,msg,mp1,mp2);
+
+RunDefHandler:
+  RestoreOS2TIB();
+  return Win32WindowProc(hwnd,msg,mp1,mp2);
+}
+
+PVOID SubclassWithDefHandler(HWND hwnd)
+{
+  return WinSubclassWindow(hwnd,Win32SubclassWindowProc);
+}