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 bbf523f2b9d9445cde90c395fc3fd571efde592d..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
@@ -58,7 +58,6 @@ namespace System.Windows.Forms
 \r
                #region Public Properties\r
                [Browsable (false)]\r
-               [EditorBrowsable (EditorBrowsableState.Never)]\r
                public bool AllowTransparency {\r
                        get { return allow_transparency; }\r
                        set {\r
@@ -77,14 +76,12 @@ namespace System.Windows.Forms
                }\r
 \r
                [Browsable (false)]\r
-               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]\r
                public override AnchorStyles Anchor {\r
                        get { return base.Anchor; }\r
                        set { base.Anchor = value; }\r
                }\r
 \r
-               [Browsable (false)]\r
-               [EditorBrowsable (EditorBrowsableState.Never)]\r
+               [DefaultValue (true)]\r
                public bool AutoClose\r
                {\r
                        get { return this.auto_close; }\r
@@ -138,7 +135,6 @@ namespace System.Windows.Forms
                [EditorBrowsable (EditorBrowsableState.Never)]\r
                public new ToolStripGripDisplayStyle GripDisplayStyle {\r
                        get { return ToolStripGripDisplayStyle.Vertical; }\r
-                       set { }\r
                }\r
 \r
                [Browsable (false)]\r
@@ -152,7 +148,6 @@ namespace System.Windows.Forms
                [EditorBrowsable (EditorBrowsableState.Never)]\r
                public new Rectangle GripRectangle {\r
                        get { return Rectangle.Empty; }\r
-                       set { }\r
                }\r
 \r
                [Browsable (false)]\r
@@ -392,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
@@ -496,10 +497,8 @@ namespace System.Windows.Forms
                #region Public Events\r
                static object ClosedEvent = new object ();\r
                static object ClosingEvent = new object ();\r
-               static object ContextMenuStripChangedEvent = new object ();\r
                static object OpenedEvent = new object ();\r
                static object OpeningEvent = new object ();\r
-               static object RegionChangedEvent = new object ();\r
                static object ScrollEvent = new object ();\r
 \r
                public new event EventHandler BackgroundImageChanged {\r
@@ -540,9 +539,9 @@ namespace System.Windows.Forms
 \r
                [Browsable (false)]\r
                [EditorBrowsable (EditorBrowsableState.Never)]\r
-               public event EventHandler ContextMenuStripChanged {\r
-                       add { Events.AddHandler (ContextMenuStripChangedEvent, value); }\r
-                       remove { Events.RemoveHandler (ContextMenuStripChangedEvent, value); }\r
+               public new event EventHandler ContextMenuStripChanged {\r
+                       add { base.ContextMenuStripChanged += value; }\r
+                       remove { base.ContextMenuStripChanged -= value; }\r
                }\r
 \r
                [Browsable (false)]\r
@@ -614,14 +613,14 @@ namespace System.Windows.Forms
                        remove { Events.RemoveHandler (OpeningEvent, value); }\r
                }\r
 \r
-               public event EventHandler RegionChanged {\r
-                       add { Events.AddHandler (RegionChangedEvent, value); }\r
-                       remove { Events.RemoveHandler (RegionChangedEvent, value); }\r
+               public new event EventHandler RegionChanged {\r
+                       add { base.RegionChanged += value; }\r
+                       remove { base.RegionChanged -= value; }\r
                }\r
 \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