Changeset 8861 for trunk/src/user32/menu.cpp

Timestamp:

Jul 12, 2002, 9:49:21 PM (23 years ago)

Author:

sandervl

Message:

PF: Close menu when RMB is pressed outside menu window

File:

• trunk/src/user32/menu.cpp (modified) (2 diffs)

trunk/src/user32/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.47 2002-06-02 10:07:57 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.48 2002-07-12 19:49:21 sandervl Exp $*/
 /*
  * Menu functions
@@ -2863 +2863 @@
                 case WM_RBUTTONDBLCLK:
                 case WM_RBUTTONDOWN:
-                    if (!(wFlags & TPM_RIGHTBUTTON)) break;
+                    if (!(wFlags & TPM_RIGHTBUTTON)) 
+                    {
+#ifdef __WIN32OS2__
+                      MENUITEM *item;
+                      UINT id = 0;
+                        
+                       if( IS_SYSTEM_MENU(menu) )
+                          item = menu->items;
+                       else
+                          item = MENU_FindItemByCoords( menu, pt, &id );
+                       //@@PF If our pointer is over the menu - do nothing
+                       if (item) break; 
+                       //@@PF Time to close menu - win2k&98 checked
+                       fEndMenu = 1;
+                       break;
+#else
+                    //@@PF This is totally incorrect. Menu need to be closed.
+                    break;
+#endif
+                    }
                     goto buttondown;
                 case WM_LBUTTONDBLCLK: