Changeset 1732 for trunk/src

Timestamp:

Nov 14, 1999, 1:00:01 PM (26 years ago)

Author:

sandervl

Message:

WindowFromPoint fix + GetMenuItemRect implemented

Location:

trunk/src/user32

Files:

• oslibmenu.cpp (modified) (2 diffs)
• oslibmenu.h (modified) (2 diffs)
• window.cpp (modified) (2 diffs)
• winmenu.cpp (modified) (3 diffs)

trunk/src/user32/oslibmenu.cpp

@@ -1 @@
-/* $Id: oslibmenu.cpp,v 1.4 1999-10-30 09:19:44 sandervl Exp $ */
+/* $Id: oslibmenu.cpp,v 1.5 1999-11-14 12:00:01 sandervl Exp $ */
 /*
  * Window Menu wrapper functions for OS/2
@@ -79 +79 @@
 }
 //******************************************************************************
+//Returns menu item rectange in screen coordinates
+//******************************************************************************
+BOOL OSLibGetMenuItemRect(HWND hMenu, int index, LPRECT pRect)
+{
+  RECTL rectl;
+  BOOL  rc;
+  ULONG id;
+
+   //First get id from menu index
+   id = (ULONG)WinSendMsg(hMenu, MM_ITEMIDFROMPOSITION, MPARAM(index), 0);
+
+   rc = (BOOL)WinSendMsg(hMenu, MM_QUERYITEMRECT, MPARAM(id), (MPARAM)&rectl);
+   if(rc == FALSE) {
+        dprintf(("OSLibGetMenuItemRect %x %d %d failed!", hMenu, index, id));
+        return FALSE;
+   }
+   WinMapWindowPoints(hMenu, HWND_DESKTOP, (PPOINTL)&rectl, 2);
+   pRect->left  = rectl.xLeft;
+   pRect->right = rectl.xRight;
+   pRect->top   = OSLibQueryScreenHeight() - rectl.yTop;
+   pRect->bottom= OSLibQueryScreenHeight() - rectl.yBottom;
+   return TRUE;
+}
+//******************************************************************************
 //******************************************************************************
 

trunk/src/user32/oslibmenu.h

@@ -1 @@
-/* $Id: oslibmenu.h,v 1.3 1999-10-25 20:17:18 sandervl Exp $ */
+/* $Id: oslibmenu.h,v 1.4 1999-11-14 12:00:01 sandervl Exp $ */
 /*
  * Window Menu wrapper functions for OS/2
@@ -22 +22 @@
 HMENU OSLibWinCreateEmptyPopupMenu();
 int   OSLibGetMenuItemCount(HWND hMenu);
+BOOL  OSLibGetMenuItemRect(HWND hMenu, int index, LPRECT pRect);
  
 #endif //__OSLIBGDI_H__

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.34 1999-11-11 13:17:32 sandervl Exp $ */
+/* $Id: window.cpp,v 1.35 1999-11-14 12:00:01 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -1247 +1247 @@
 HWND WIN32API WindowFromPoint( POINT point)
 {
- HWND hwnd;
-
-    dprintf(("WindowFromPoint (%d,%d)\n", point.x, point.y));
-    hwnd = OSLibWinWindowFromPoint(OSLIB_HWND_DESKTOP, (PVOID)&point);
-    if(hwnd) {
-        return Win32BaseWindow::OS2ToWin32Handle(hwnd);
-    }
-    return 0;
+    HWND  hwndOS2, hwnd;
+    POINT wPoint;
+
+
+    wPoint.x = point.x;
+    wPoint.y = windowDesktop->getWindowHeight() - point.y;
+
+    hwndOS2 = OSLibWinWindowFromPoint(OSLIB_HWND_DESKTOP, (PVOID)&wPoint);
+    if(hwndOS2) {
+        hwnd = Win32BaseWindow::OS2ToWin32Handle(hwndOS2);
+        if(hwnd) {
+                dprintf(("WindowFromPoint (%d,%d) %x->%x\n", point.x, point.y, hwndOS2, hwnd));
+                return hwnd;
+        }
+    }
+    dprintf(("WindowFromPoint (%d,%d) %x->1\n", point.x, point.y, hwndOS2));
+    return 1;
 }
 //******************************************************************************

trunk/src/user32/winmenu.cpp

@@ -1 @@
-/* $Id: winmenu.cpp,v 1.16 1999-11-09 20:15:11 sandervl Exp $ */
+/* $Id: winmenu.cpp,v 1.17 1999-11-14 12:00:01 sandervl Exp $ */
 
 /*
@@ -1073 +1073 @@
  *             extended error information, use the GetLastError function.
  * Remark    :
- * Status    : UNTESTED STUB
+ * Status    : 
  *
  * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
@@ -1084 +1084 @@
               LPRECT, lprcItem)
 {
-  dprintf(("USER32:GetMenuItemRect (%08xh,%08xh,%08xh,%08x) not implemented.\n",
-         hWnd,
-         hMenu,
-         uItem,
-         lprcItem));
-
-  return (FALSE);
+    return OSLibGetMenuItemRect(hMenu, uItem, lprcItem);
 }
 /*****************************************************************************