2006-12-26 Jonathan Pobst <monkey@jpobst.com>

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
index cb7f09cc527fce3d61fffe2d544ac99f2efdac84..27af4c0709d50b80e7c35b41467e99ad2b4269e4 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
@@ -130,6 +130,7 @@ namespace System.Windows.Forms
                        MouseLeave += new EventHandler (ToolBar_MouseLeave);
                        MouseMove += new MouseEventHandler (ToolBar_MouseMove);
                        MouseUp += new MouseEventHandler (ToolBar_MouseUp);
+                       BackgroundImageChanged += new EventHandler (ToolBar_BackgroundImageChanged);
 
                        TabStop = false;
                        
@@ -201,15 +202,8 @@ namespace System.Windows.Forms
                [Browsable (false)]
                [EditorBrowsable (EditorBrowsableState.Never)]
                public override Image BackgroundImage {
-                       get { return background_image; }
-                       set {
-                               if (value == background_image)
-                                       return;
-
-                               background_image = value;
-                               OnBackgroundImageChanged (EventArgs.Empty);
-                               Redraw (false);
-                       }
+                       get { return base.BackgroundImage; }
+                       set { base.BackgroundImage = value; }
                }
 
                [DefaultValue (BorderStyle.None)]
@@ -332,7 +326,7 @@ namespace System.Windows.Forms
 
                // XXX this should probably go away and it should call
                // into Control.ImeMode instead.
-               ImeMode ime_mode = ImeMode.Disable;
+               new ImeMode ime_mode = ImeMode.Disable;
 
                [Browsable (false)]
                [EditorBrowsable (EditorBrowsableState.Never)]
@@ -381,14 +375,13 @@ namespace System.Windows.Forms
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                [EditorBrowsable (EditorBrowsableState.Never)]
                public override string Text {
-                       get { return text; } 
+                       get { return base.Text; } 
                        set {
-                               if (value == text)
+                               if (value == base.Text)
                                        return;
 
-                               text = value;
+                               base.Text = value;
                                Redraw (true);
-                               OnTextChanged (EventArgs.Empty);
                        }
                }
 
@@ -501,7 +494,7 @@ namespace System.Windows.Forms
                        if (Width <= 0 || Height <= 0 || !Visible)
                                return;
 
-                       Redraw (true, background_image != null);
+                       Redraw (true, BackgroundImage != null);
                }
 
                int requested_height = -1;
@@ -605,6 +598,11 @@ namespace System.Windows.Forms
                        (enabled [next] as ToolBarButton).Hilight = true;
                }
 
+               private void ToolBar_BackgroundImageChanged (object sender, EventArgs args)
+               {
+                       Redraw (false);
+               }
+
                private void ToolBar_MouseDown (object sender, MouseEventArgs me)
                {
                        if ((!Enabled) || ((me.Button & MouseButtons.Left) == 0))
@@ -896,7 +894,8 @@ namespace System.Windows.Forms
                        int x = theme.ToolBarGripWidth;
                        int y = theme.ToolBarGripWidth;
 
-                       int ht = AdjustedButtonSize.Height + theme.ToolBarGripWidth;
+                       Size adjusted_size = AdjustedButtonSize;
+                       int ht = adjusted_size.Height + theme.ToolBarGripWidth;
 
                        int separator_index = -1;
 
@@ -906,15 +905,11 @@ namespace System.Windows.Forms
                                if (!button.Visible)
                                        continue;
 
-                               if (size_specified && (button.Style != ToolBarButtonStyle.Separator)) {
-                                       if (button.Layout (button_size))
-                                               changed = true;
-                               }
-                               else {
-                                       if (button.Layout ())
-                                               changed = true;
-                               }
-
+                               if (size_specified && (button.Style != ToolBarButtonStyle.Separator))
+                                       changed = button.Layout (adjusted_size);
+                               else
+                                       changed = button.Layout ();
+                               
                                bool is_separator = button.Style == ToolBarButtonStyle.Separator;
 
                                if (x + button.Rectangle.Width < Width || is_separator || !Wrappable) {
@@ -924,7 +919,7 @@ namespace System.Windows.Forms
                                        x += button.Rectangle.Width;
                                        if (is_separator)
                                                separator_index = i;
-                               } else if (separator_index > 0) { 
+                               } else if (separator_index > 0) {
                                        i = separator_index;
                                        separator_index = -1;
                                        x = theme.ToolBarGripWidth;