Author: everaldo
Date: 2007-03-29 14:27:42 -0500 (Thu, 29 Mar 2007)
New Revision: 75170

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs
Log:
2007-03-29  Everaldo Canuto  <[EMAIL PROTECTED]>

        * MenuAPI.cs: Make OnMouseDown returns a boolean to identify if event is
        processed.

        * Form.cs: When active tracker mouse down is not processed, send event 
        back to control inside mouse position. [Fixes #81227]



Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-03-29 19:22:04 UTC (rev 75169)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-03-29 19:27:42 UTC (rev 75170)
@@ -1,3 +1,11 @@
+2007-03-29  Everaldo Canuto  <[EMAIL PROTECTED]>
+
+       * MenuAPI.cs: Make OnMouseDown returns a boolean to identify if event is
+       processed.
+
+       * Form.cs: When active tracker mouse down is not processed, send event 
+       back to control inside mouse position. [Fixes #81227]
+
 2007-03-29  Jonathan Pobst  <[EMAIL PROTECTED]>
 
        * ComboBox.cs: Override the ComboListBox's ActivateOnShow property and

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs  
2007-03-29 19:22:04 UTC (rev 75169)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs  
2007-03-29 19:27:42 UTC (rev 75170)
@@ -2366,7 +2366,14 @@
 
                                                args = new MouseEventArgs 
(FromParamToMouseButtons ((int) m.WParam.ToInt32()), 
                                                        mouse_clicks, LowOrder 
((int) m.LParam.ToInt32 ()), HighOrder ((int) m.LParam.ToInt32 ()), 0);
-                                               active_tracker.OnMouseDown(new 
MouseEventArgs (args.Button, args.Clicks, Control.MousePosition.X, 
Control.MousePosition.Y, args.Delta));
+
+                                               if (!active_tracker.OnMouseDown 
(new MouseEventArgs (args.Button, args.Clicks, Control.MousePosition.X, 
Control.MousePosition.Y, args.Delta))) {
+                                                       Point pt = new Point 
(args.X, args.Y);
+                                                       Control child_control = 
this.GetChildAtPoint (pt);
+                                                       if (child_control != 
null)
+                                                               
XplatUI.SendMessage(child_control.Handle, (Msg) m.Msg, m.WParam, m.LParam);
+                                               }
+                                               
                                                return;
                                        }
 #if NET_2_0

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs       
2007-03-29 19:22:04 UTC (rev 75169)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs       
2007-03-29 19:27:42 UTC (rev 75170)
@@ -131,20 +131,20 @@
                        return item;
                }
 
-               public void OnMouseDown (MouseEventArgs args)
+               public bool OnMouseDown (MouseEventArgs args)
                {
                        MenuItem item = GetItemAtXY (args.X, args.Y);
 
                        if (item == null) {
                                Deactivate ();
-                               return;
+                               return false;
                        }
 
                        if ((args.Button & MouseButtons.Left) == 0)
-                               return;
+                               return true;
 
                        if (!item.Enabled)
-                               return;
+                               return true;
                        
                        popdown_menu = active && item.VisibleItems;
                        
@@ -157,6 +157,7 @@
                                SelectItem (item.Parent, item, item.IsPopup);
                        
                        grab_control.ActiveTracker = this;
+                       return true;
                }
 
                public void OnMotion (MouseEventArgs args)

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to