also, disable the call do BindColumns in

[mono.git] / mcs / class / Managed.Windows.Forms / System.Windows.Forms / ToolStripDropDown.cs

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDown.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDown.cs
index 05593b7aa7acbaf6a927f0a7ba8c60a2a716cb21..320081fade10a05879cfa9a4e5fc27e199496289 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDown.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDown.cs
@@ -387,15 +387,21 @@ namespace System.Windows.Forms
                        // Find the widest menu item\r
                        int widest = 0;\r
 \r
-                       foreach (ToolStripItem tsi in this.Items)\r
+                       foreach (ToolStripItem tsi in this.Items) {\r
+                               if (!tsi.Visible) \r
+                                       continue;\r
                                if (tsi.GetPreferredSize (Size.Empty).Width > widest)\r
                                        widest = tsi.GetPreferredSize (Size.Empty).Width;\r
-\r
+                       }\r
+                       \r
                        int x = this.Padding.Left;\r
                        widest += 68 - this.Padding.Horizontal;\r
                        int y = this.Padding.Top;\r
 \r
                        foreach (ToolStripItem tsi in this.Items) {\r
+                               if (!tsi.Visible)\r
+                                       continue;\r
+\r
                                y += tsi.Margin.Top;\r
 \r
                                int height = 0;\r
@@ -614,7 +620,7 @@ namespace System.Windows.Forms
 \r
                [Browsable (false)]\r
                [EditorBrowsable (EditorBrowsableState.Never)]\r
-               public event ScrollEventHandler Scroll {\r
+               public new event ScrollEventHandler Scroll {\r
                        add { Events.AddHandler (ScrollEvent, value); }\r
                        remove { Events.RemoveHandler (ScrollEvent, value); }\r
                }\r