Assign values to base class.

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripControlHost.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripControlHost.cs
index 6fb53ff35f56494f22560374d3ea3b9026be843a..1e34d8d2007289758c3e5bba989e7e199db08d9d 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripControlHost.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripControlHost.cs
@@ -25,7 +25,7 @@
 // Authors:
 //     Jonathan Pobst (monkey@jpobst.com)
 //
-#if NET_2_0
+
 using System.Drawing;
 using System.ComponentModel;
 
@@ -47,6 +47,7 @@ namespace System.Windows.Forms
                        this.control = c;
                        this.control_align = ContentAlignment.MiddleCenter;
                        this.control.TabStop = false;
+                       this.control.Resize += ControlResizeHandler;
                        this.Size = DefaultSize;
                        this.OnSubscribeControlEvents (this.control);
                }
@@ -250,7 +251,7 @@ namespace System.Windows.Forms
                                if (control == null)
                                        return new Size (23, 23);
 
-                               return control.GetPreferredSize (Size.Empty);
+                               return control.Size;
                        }
                }
                #endregion
@@ -316,9 +317,17 @@ namespace System.Windows.Forms
                        if (eh != null)
                                eh (this, e);
                }
+
+               void ControlResizeHandler (object obj, EventArgs args)
+               {
+                       OnHostedControlResize (args);
+               }
                
                protected virtual void OnHostedControlResize (EventArgs e)
                {
+                       // Since the control size has been just adjusted, only update the location
+                       if (control != null)
+                               control.Location = AlignInRectangle (this.Bounds, control.Size, this.control_align).Location;
                }
                
                protected virtual void OnKeyDown (KeyEventArgs e)
@@ -565,4 +574,3 @@ namespace System.Windows.Forms
                #endregion
        }
 }
-#endif