Changeset 342 for trunk/src/user32/new/pmwindow.cpp

Timestamp:

Jul 20, 1999, 9:42:36 AM (26 years ago)

Author:

sandervl

Message:

Accelerator support (not working) + bugfixes

File:

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

trunk/src/user32/new/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.12 1999-07-19 18:40:43 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.13 1999-07-20 07:42:36 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -24 +24 @@
 #include "oslibutil.h"
 #include "oslibgdi.h"
+#include "oslibmsg.h"
 
 HMQ  hmq = 0;                             /* Message queue handle         */
@@ -75 +76 @@
    }
 
-   return(TRUE);
+   return OSLibInitMsgQueue();
 } /* End of main */
 //******************************************************************************
@@ -163 +164 @@
     case WM_ADJUSTWINDOWPOS:
     {
-      RECTLOS2 rectChild;
-      ULONG x, y;
+      ULONG    x, y;
+      PSWP     pswp = (PSWP)mp1;
 
         dprintf(("OS2: WM_ADJUSTWINDOWPOS %x", hwnd));
 
-        WinQueryWindowRect(hwnd, (PRECTL)&rectChild);
-
-        //Calculate position relative to parent window (real window or desktop)
-        x = rectChild.xLeft;
-//        y = MapOS2ToWin32Y(hwnd, &rectChild, rectChild.yBottom);
-
-        if(win32wnd->MsgMove(x, y)) {
-            goto RunDefWndProc;
-        }
-        break;
+        if(pswp->fl & SWP_MOVE) {
+            if(win32wnd->isChild()) {
+                x = pswp->x;
+                y = pswp->cy - y - 1;
+            }
+            else {
+                OSLIBPOINT point;
+
+                point.x = pswp->x;
+                point.y = pswp->y;
+
+                MapOS2ToWin32Point(OSLIB_HWND_DESKTOP, hwnd, &point);
+                x = point.x;
+                y = point.y;
+            }
+            if(win32wnd->MsgMove(x, y)) {
+                goto RunDefWndProc;
+            }
+            break;
+        }
+        goto RunDefWndProc;
     }
 
@@ -183 +195 @@
     {
         dprintf(("OS2: WM_WINDOWPOSCHANGED %x", hwnd));
+        goto RunDefWndProc;
     }
 
@@ -383 +396 @@
             win32wnd->MsgCommand(CMD_MENU, SHORT1FROMMP(mp1), 0);
         }
+        if(SHORT1FROMMP(mp2) == CMDSRC_ACCELERATOR) {
+            win32wnd->MsgCommand(CMD_ACCELERATOR, SHORT1FROMMP(mp1), 0);
+        }
         //todo controls + accelerators
         break;
 
     case WM_SYSCOMMAND:
+        dprintf(("WM_SYSCOMMAND"));
+        break;
 
     case WM_CHAR:
+        dprintf(("WM_CHAR"));
 
     case WM_INITMENU: