Changeset 2481 for trunk/src/user32/new/menu.cpp

Timestamp:

Jan 19, 2000, 6:40:16 PM (26 years ago)

Author:

cbratschi

Message:

* empty log message *

File:

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

trunk/src/user32/new/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.11 2000-01-16 18:17:10 cbratschi Exp $*/
+/* $Id: menu.cpp,v 1.12 2000-01-19 17:40:16 cbratschi Exp $*/
 /*
  * Menu functions
@@ -2581 +2581 @@
 }
 
+VOID MENU_DispatchMouseMsg(MSG *msg)
+{
+  LONG hittest;
+
+  hittest = SendMessageA(msg->hwnd,WM_NCHITTEST,0,MAKELONG(msg->pt.x,msg->pt.y));
+  if (hittest != HTCLIENT)
+    SendMessageA(msg->hwnd,msg->message+WM_NCMOUSEMOVE-WM_MOUSEMOVE,hittest,MAKELONG(msg->pt.x,msg->pt.y));
+  else
+    DispatchMessageA(msg);
+}
+
 /***********************************************************************
  *           MENU_TrackMenu
@@ -2638 +2649 @@
 
             hmenu = MENU_PtMenu(mt.hTopMenu,pt,inMenuBar);
+
+//CB: todo: Win32 dispatches at least some mouse messages!
 
             switch(msg.message)
@@ -2656 +2669 @@
 
                 case WM_RBUTTONUP:
-                    if (!(wFlags & TPM_RIGHTBUTTON)) break;
+                    if (!(wFlags & TPM_RIGHTBUTTON))
+                    {
+                      //CB: todo: app could open new menu!
+                      //MENU_DispatchMouseMsg(&msg); //CB: todo
+                      break;
+                    }
                     /* fall through */
                 case WM_LBUTTONUP:
@@ -2681 +2699 @@
 
                     fEndMenu |= !MENU_MouseMove( &mt, hmenu, wFlags );
+                    //CB: dispatch message
+                    if (!fEndMenu && !hmenu) DispatchMessageA(&msg);
 
             } /* switch(msg.message) - mouse */