Changeset 2483 for trunk/src/user32/oslibmsgtranslate.cpp

Timestamp:

Jan 20, 2000, 5:48:58 PM (26 years ago)

Author:

cbratschi

Message:

WM_CONTEXTMENU, sysmenu changes

File:

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

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.15 2000-01-18 20:10:40 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.16 2000-01-20 16:48:55 cbratschi Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -208 +208 @@
         hittest = win32wnd->MsgHitTest(winMsg->pt.x, winMsg->pt.y);
 
-        if (IsNCMouseMsg(win32wnd)) 
+        if (IsNCMouseMsg(win32wnd))
         {
           winMsg->message = WINWM_NCMOUSEMOVE;
           winMsg->wParam  = (WPARAM)hittest;
           winMsg->lParam  = MAKELONG(winMsg->pt.x,winMsg->pt.y);
-        } 
+        }
         else
         {
@@ -234 +234 @@
         winMsg->message = WINWM_NCACTIVATE;
         winMsg->wParam  = SHORT1FROMMP(os2Msg->mp1);
-        return TRUE;
+        return TRUE;
       }
       case WM_WINDOWPOSCHANGED:
       {
-        //todo: proper translation
-        return FALSE;
+        //todo: proper translation
+        return FALSE;
       }
     }
@@ -324 +324 @@
 
         if(pswp->fl & (SWP_MOVE | SWP_SIZE)) {
-                dprintf(("Set client rectangle to (%d,%d)(%d,%d)", swpOld.x, swpOld.y, swpOld.x + swpOld.cx, swpOld.y + swpOld.cy));
-                win32wnd->setClientRect(swpOld.x, swpOld.y, swpOld.x + swpOld.cx, swpOld.y + swpOld.cy);
-
-                thdb->wp.hwnd = win32wnd->getWindowHandle();
-                if ((pswp->fl & SWP_ZORDER) && (pswp->hwndInsertBehind > HWND_BOTTOM))
-                {
-                        Win32BaseWindow *wndAfter = Win32BaseWindow::GetWindowFromOS2Handle(pswp->hwndInsertBehind);
-                        if(wndAfter)
-                        thdb->wp.hwndInsertAfter = wndAfter->getWindowHandle();
-                }
-
-                PRECT lpRect = win32wnd->getWindowRect();
-                //SvL: Only send it when the client has changed & the frame hasn't
-                //     If the frame size/position has changed, pmframe.cpp will send
-                //     this message
-                if(lpRect->right == thdb->wp.x+thdb->wp.cx && lpRect->bottom == thdb->wp.y+thdb->wp.cy) {
-                        winMsg->message = WINWM_WINDOWPOSCHANGED;
-                        winMsg->lParam  = (LPARAM)&thdb->wp;
-                        break;
-                }
+                dprintf(("Set client rectangle to (%d,%d)(%d,%d)", swpOld.x, swpOld.y, swpOld.x + swpOld.cx, swpOld.y + swpOld.cy));
+                win32wnd->setClientRect(swpOld.x, swpOld.y, swpOld.x + swpOld.cx, swpOld.y + swpOld.cy);
+
+                thdb->wp.hwnd = win32wnd->getWindowHandle();
+                if ((pswp->fl & SWP_ZORDER) && (pswp->hwndInsertBehind > HWND_BOTTOM))
+                {
+                        Win32BaseWindow *wndAfter = Win32BaseWindow::GetWindowFromOS2Handle(pswp->hwndInsertBehind);
+                        if(wndAfter)
+                        thdb->wp.hwndInsertAfter = wndAfter->getWindowHandle();
+                }
+
+                PRECT lpRect = win32wnd->getWindowRect();
+                //SvL: Only send it when the client has changed & the frame hasn't
+                //     If the frame size/position has changed, pmframe.cpp will send
+                //     this message
+                if(lpRect->right == thdb->wp.x+thdb->wp.cx && lpRect->bottom == thdb->wp.y+thdb->wp.cy) {
+                        winMsg->message = WINWM_WINDOWPOSCHANGED;
+                        winMsg->lParam  = (LPARAM)&thdb->wp;
+                        break;
+                }
         }
         goto dummymessage;
@@ -447 +447 @@
           winMsg->wParam  = (WPARAM)hittest;
           winMsg->lParam  = MAKELONG(winMsg->pt.x,winMsg->pt.y);
-        } 
+        }
         else
         {
@@ -672 +672 @@
 
     case WM_CONTEXTMENU:
+        winMsg->message = WINWM_CONTEXTMENU;
+        winMsg->wParam  = win32wnd->getWindowHandle();
+        winMsg->lParam  = MAKELONG(winMsg->pt.x,winMsg->pt.y);
+        break;
+
     case WM_INITMENU:
     case WM_MENUSELECT: