Refactored, cleaned up

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MdiClient.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MdiClient.cs
index b303388cd2c84c4a08a3081e9dfe2333d7d99e8f..2a6ef608e7170c5ab4f41b08bbdf39b2f8900673 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MdiClient.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MdiClient.cs
@@ -32,10 +32,8 @@ using System.Drawing;
 using System.Runtime.InteropServices;
 
 namespace System.Windows.Forms {
-#if NET_2_0
        [ComVisible (true)]
        [ClassInterface(ClassInterfaceType.AutoDispatch)]
-#endif
        [DesignTimeVisible(false)]
        [ToolboxItem(false)]
        public sealed class MdiClient : Control {
@@ -58,9 +56,7 @@ namespace System.Windows.Forms {
                #endregion      // Local Variables
 
                #region Public Classes
-#if NET_2_0
                [ComVisible (false)]
-#endif
                public new class ControlCollection : Control.ControlCollection {
 
                        private MdiClient owner;
@@ -195,7 +191,7 @@ namespace System.Windows.Forms {
                        SizeScrollBars ();
                        ArrangeWindows ();
                }
-#if NET_2_0
+
                protected override void ScaleControl (SizeF factor, BoundsSpecified specified)
                {
                        // Never change the MdiClient's location
@@ -205,7 +201,6 @@ namespace System.Windows.Forms {
                }
                
                [System.ComponentModel.EditorBrowsable (EditorBrowsableState.Never)]
-#endif
                protected override void ScaleCore (float dx, float dy)
                {
                        base.ScaleCore (dx, dy);
@@ -227,7 +222,6 @@ namespace System.Windows.Forms {
                        }
                }
 
-#if NET_2_0
                [EditorBrowsable (EditorBrowsableState.Never)]
                [Browsable (false)]
                public override ImageLayout BackgroundImageLayout {
@@ -238,7 +232,6 @@ namespace System.Windows.Forms {
                                base.BackgroundImageLayout = value;
                        }
                }
-#endif
 
                public Form [] MdiChildren {
                        get {
@@ -644,7 +637,6 @@ namespace System.Windows.Forms {
                                XplatUI.RequestNCRecalc (Parent.Handle);
                                ParentForm.PerformLayout ();
 
-#if NET_2_0
                                // If we closed the last child, unmerge the menus.
                                // If it's not the last child, the menu will be unmerged
                                // when another child takes focus.
@@ -653,10 +645,10 @@ namespace System.Windows.Forms {
                                if (parent_menu != null)
                                        if (parent_menu.IsCurrentlyMerged)
                                                ToolStripManager.RevertMerge (parent_menu);
-#endif
                        }
                        SizeScrollBars ();
                        SetParentText (false);
+                       form.Dispose();
                }
 
                internal void ActivateNextChild ()
@@ -822,7 +814,6 @@ namespace System.Windows.Forms {
 
                        setting_windowstates = false;
 
-#if NET_2_0
                        if (form.MdiParent.MainMenuStrip != null)
                                form.MdiParent.MainMenuStrip.RefreshMdiItems ();
 
@@ -837,11 +828,7 @@ namespace System.Windows.Forms {
                                if (parent_menu.IsCurrentlyMerged)
                                        ToolStripManager.RevertMerge (parent_menu);
                                        
-                               MenuStrip child_menu = null;
-
-                               foreach (Control c in form.Controls)
-                                       if (c is MenuStrip)
-                                               child_menu = (MenuStrip)c;
+                               MenuStrip child_menu = LookForChildMenu (form);
 
                                if (form.WindowState != FormWindowState.Maximized)
                                        RemoveControlMenuItems (wm);
@@ -872,12 +859,27 @@ namespace System.Windows.Forms {
                                if (child_menu != null)
                                        ToolStripManager.Merge (child_menu, parent_menu);
                        }
-#endif
 
                        return maximize_this;
                }
 
-#if NET_2_0
+               private MenuStrip LookForChildMenu (Control parent)
+               {
+                       foreach (Control c in parent.Controls) {
+                               if (c is MenuStrip)
+                                       return (MenuStrip)c;
+                                       
+                               if (c is ToolStripContainer || c is ToolStripPanel) {
+                                       MenuStrip ms = LookForChildMenu (c);
+                                       
+                                       if (ms != null)
+                                               return ms;
+                               }
+                       }
+                       
+                       return null;
+               }
+               
                internal void RemoveControlMenuItems (MdiWindowManager wm)
                {
                        Form form = wm.form;
@@ -900,7 +902,6 @@ namespace System.Windows.Forms {
                                parent_menu.ResumeLayout ();
                        }
                }
-#endif
 
                internal void SetWindowState (Form form, FormWindowState old_window_state, FormWindowState new_window_state, bool is_activating_child)
                {
@@ -955,10 +956,9 @@ namespace System.Windows.Forms {
 
                internal Form ActiveMdiChild {
                        get {
-#if NET_2_0
                                if (ParentForm != null && !ParentForm.Visible)
                                        return null;
-#endif
+
                                if (Controls.Count < 1)
                                        return null;