Changeset 1583 for trunk/src

Timestamp:

Nov 3, 1999, 11:04:24 PM (26 years ago)

Author:

cbratschi

Message:

WM_CONTEXTMENU

Location:

trunk/src/user32

Files:

• USER32.DEF (modified) (2 diffs)
• pmframe.cpp (modified) (2 diffs)
• pmwindow.cpp (modified) (3 diffs)
• user32exp.def (modified) (1 diff)
• win32wbase.cpp (modified) (2 diffs)
• win32wbase.h (modified) (2 diffs)

trunk/src/user32/USER32.DEF

@@ -1 @@
-; $Id: USER32.DEF,v 1.17 1999-10-26 11:14:52 sandervl Exp $
+; $Id: USER32.DEF,v 1.18 1999-11-03 22:04:21 cbratschi Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -627 +627 @@
     GetOS2Callback__15Win32WindowProcFv = GetOS2Callback__Fv @2001
 
-; Wine helper function
+; Wine/Odin helper function
     GetSysColorPen              = _GetSysColorPen@4              @2002
+    TrackWin32Window            = _TrackWin32Window@8            @2003
 
     Win32ToOS2Handle__FUl      = Win32ToOS2Handle__15Win32BaseWindowFUl @2006

trunk/src/user32/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.19 1999-11-03 19:51:43 sandervl Exp $ */
+/* $Id: pmframe.cpp,v 1.20 1999-11-03 22:04:22 cbratschi Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -210 +210 @@
 }
 //******************************************************************************
+// used by statusbar control
+//******************************************************************************
+VOID WINAPI TrackWin32Window(HWND hwnd,BOOL lefttop)
+{
+  Win32BaseWindow *win32wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
+  INT flags = lefttop ? (TF_LEFT | TF_TOP):(TF_RIGHT | TF_BOTTOM);
+
+  if (!win32wnd) return;
+
+  WinSendMsg(win32wnd->getOS2FrameWindowHandle(),WM_TRACKFRAME,(MPARAM)flags,(MPARAM)0);
+}
+//******************************************************************************
 //Win32 frame message handler
 //******************************************************************************

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.50 1999-11-02 19:13:01 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.51 1999-11-03 22:04:22 cbratschi Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -877 +877 @@
     // Only send this message if the window is enabled
         if (WinIsWindowEnabled(hwnd))
-        {
+        {
             if(win32wnd->MsgHitTest((*(POINTS *)&mp1).x, MapOS2ToWin32Y(OSLIB_HWND_DESKTOP, hwnd, (*(POINTS *)&mp1).y))) {
                     goto RunDefWndProc;
@@ -884 +884 @@
         else    goto RunDefWndProc;
         break;
+
+    case WM_CONTEXTMENU:
+      {
+        POINTL pt;
+
+        dprintf(("OS2: WM_CONTEXTMENU %x", hwnd));
+        pt.x = (*(POINTS *)&mp1).x;
+        pt.y = (*(POINTS *)&mp1).y;
+        WinMapWindowPoints(hwnd,HWND_DESKTOP,&pt,1);
+        pt.y = WinQuerySysValue(HWND_DESKTOP,SV_CYSCREEN)-pt.y-1;
+        win32wnd->MsgContextMenu(pt.x,pt.y);
+
+        RestoreOS2TIB();
+        return (MRESULT)TRUE;
+      }
 
     case WM_SYSCOLORCHANGE:

trunk/src/user32/user32exp.def

@@ -576 +576 @@
     GetOS2Callback__15Win32WindowProcFv       @2001
     _GetSysColorPen@4                         @2002
+    _TrackWin32Window@8                       @2003
     Win32ToOS2Handle__FUl                     @2006

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.74 1999-11-03 19:51:43 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.75 1999-11-03 22:04:22 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1229 +1229 @@
 //******************************************************************************
 //******************************************************************************
+ULONG  Win32BaseWindow::MsgContextMenu(ULONG x,ULONG y)
+{
+  return SendInternalMessageA(WM_CONTEXTMENU,Win32Hwnd,MAKELPARAM(x,y));
+}
+//******************************************************************************
+//******************************************************************************
 BOOL Win32BaseWindow::isMDIClient()
 {

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.40 1999-11-03 19:51:44 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.41 1999-11-03 22:04:24 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -92 +92 @@
          ULONG  MsgGetTextLength();
          char  *MsgGetText();
+         ULONG  MsgContextMenu(ULONG x,ULONG y);
 
 virtual  LONG   SetWindowLongA(int index, ULONG value);