In System.Windows.Forms:

	[ fix the majority of the CS0108 warnings we've been suppressing ]
	
	* TreeView.cs: mark BackgroundImageChanged as 'new'.

	* ToolBar.cs: ImeMode just passes stuff to Control.  Rename Layout
	to "LayoutToolBar" to quiet mcs.
	
	* TabControl.cs: mark our ControlCollection class as 'new'.

	* TextBoxBase.cs: mark some events as 'new'.

	* Splitter.cs: TabStop is 'new'.

	* ControlBindingsCollection.cs: mark a few methods as new since
	they change the visibility from protected to public.

	* RadioButton.cs: DoubleClick -> base class, and remove unused
	HaveDoubleClick.

	* MonthCalendar.cs: ImeMode property -> base class, and mark many
	events as new.

	* NumericUpDown.cs: TextChanged -> base class.

	* CheckedListBox.cs: mark our ObjectCollection class as new to
	quiet mcs.

	* FolderBrowserDialog.cs: make HelpRequest event new and have it
	muck with the base class.

	* StatusBar.cs: fix some mcs warnings about Update being the same
	name as a base class method.

	* RichTextBox.cs: mark some events as new, and make them do things
	to the base class impl.

	* UserControl.cs: mark TextChanged as new, and have it manipulate
	base.TextChanged.

	* UpDownBase.cs: mark some things new.

	* CheckBox.cs: mark DoubleClick "new", and add some text about
	what we need to look at.

	* Panel.cs: make the events "new", and manipulate the base
	version.  these are just here for attributes.

	* AccessibleObject.cs: make owner private.

	* Control.cs: deal with AccessibleObject.owner being private.
	cache our own copy if we need it.

	* Button.cs: add "new" to the DoubleClickEvent.

	* ListBox.cs: no need to track our own has_focus here.  let
	Control.has_focus do it for us.  Also some other work to clear up
	warnings about not overriding base class methods of the same name.
	
	* ComboBox.cs: clear up some warnings about not override base
	class methods of the same name.

2006-12-01  Chris Toshok  <[email protected]>

In System.Windows.Forms.X11Internal:
2006-12-01  Chris Toshok  <[email protected]>

	* X11Hwnd.cs: need to mark queue as "new" to quiet mcs.


svn path=/trunk/mcs/; revision=68852

mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/ChangeLog

@@ -1,3 +1,7 @@
+2006-12-01  Chris Toshok  <[email protected]>
+
+	* X11Hwnd.cs: need to mark queue as "new" to quiet mcs.
+
 2006-11-29  Chris Toshok  <[email protected]>
 
 	* X11Hwnd.cs: implement GetWindowTransparency, and also add

mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/X11Hwnd.cs

@@ -43,7 +43,7 @@ namespace System.Windows.Forms.X11Internal {
 		double trans = 1.0;
 
 		string text;
-		X11ThreadQueue queue;
+		new X11ThreadQueue queue;
 
 		const EventMask SelectInputMask = (EventMask.ButtonPressMask | 
 						   EventMask.ButtonReleaseMask | 

mcs/class/Managed.Windows.Forms/System.Windows.Forms/AccessibleObject.cs

@@ -38,7 +38,7 @@ namespace System.Windows.Forms {
 		#region Private Variables
 		internal string		name;
 		internal string		value;
-		internal Control	owner;
+		private Control owner;
 		internal AccessibleRole	role;
 		internal AccessibleStates	state;
 		internal string		default_action;

mcs/class/Managed.Windows.Forms/System.Windows.Forms/Button.cs

@@ -119,9 +119,13 @@ namespace System.Windows.Forms {
 		#region Events
 		static object DoubleClickEvent = new object ();
 
+		// XXX this and HaveDoubleClick above need to be
+		// looked at.. it's far more likely that this just
+		// uses base.DoubleClick, and HaveDoubleClick goes
+		// away in favor of calls to OnDoubleClick.
 		[Browsable(false)]
 		[EditorBrowsable (EditorBrowsableState.Advanced)]
-		public event EventHandler DoubleClick {
+		public new event EventHandler DoubleClick {
 			add { Events.AddHandler (DoubleClickEvent, value); }
 			remove { Events.RemoveHandler (DoubleClickEvent, value); }
 		}

mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog

@@ -1,3 +1,66 @@
+2006-12-01  Chris Toshok  <[email protected]>
+
+	[ fix the majority of the CS0108 warnings we've been suppressing ]
+	
+	* TreeView.cs: mark BackgroundImageChanged as 'new'.
+
+	* ToolBar.cs: ImeMode just passes stuff to Control.  Rename Layout
+	to "LayoutToolBar" to quiet mcs.
+	
+	* TabControl.cs: mark our ControlCollection class as 'new'.
+
+	* TextBoxBase.cs: mark some events as 'new'.
+
+	* Splitter.cs: TabStop is 'new'.
+
+	* ControlBindingsCollection.cs: mark a few methods as new since
+	they change the visibility from protected to public.
+
+	* RadioButton.cs: DoubleClick -> base class, and remove unused
+	HaveDoubleClick.
+
+	* MonthCalendar.cs: ImeMode property -> base class, and mark many
+	events as new.
+
+	* NumericUpDown.cs: TextChanged -> base class.
+
+	* CheckedListBox.cs: mark our ObjectCollection class as new to
+	quiet mcs.
+
+	* FolderBrowserDialog.cs: make HelpRequest event new and have it
+	muck with the base class.
+
+	* StatusBar.cs: fix some mcs warnings about Update being the same
+	name as a base class method.
+
+	* RichTextBox.cs: mark some events as new, and make them do things
+	to the base class impl.
+
+	* UserControl.cs: mark TextChanged as new, and have it manipulate
+	base.TextChanged.
+
+	* UpDownBase.cs: mark some things new.
+
+	* CheckBox.cs: mark DoubleClick "new", and add some text about
+	what we need to look at.
+
+	* Panel.cs: make the events "new", and manipulate the base
+	version.  these are just here for attributes.
+
+	* AccessibleObject.cs: make owner private.
+
+	* Control.cs: deal with AccessibleObject.owner being private.
+	cache our own copy if we need it.
+
+	* Button.cs: add "new" to the DoubleClickEvent.
+
+	* ListBox.cs: no need to track our own has_focus here.  let
+	Control.has_focus do it for us.  Also some other work to clear up
+	warnings about not overriding base class methods of the same name.
+	
+	* ComboBox.cs: clear up some warnings about not override base
+	class methods of the same name.
+
 2006-12-01  Chris Toshok  <[email protected]>
 
 	* Form.cs: flag a few things as "new" to quiet some of the mcs

mcs/class/Managed.Windows.Forms/System.Windows.Forms/CheckBox.cs

@@ -351,9 +351,12 @@ namespace System.Windows.Forms {
 		#endregion	// Events
 
 		#region Events
+		// XXX have a look at this and determine if it
+		// manipulates base.DoubleClick, and see if
+		// HaveDoubleClick can just call OnDoubleClick.
 		[Browsable(false)]
 		[EditorBrowsable (EditorBrowsableState.Never)]
-		public event EventHandler DoubleClick;
+		public new event EventHandler DoubleClick;
 		#endregion	// Events
 	}
 }

mcs/class/Managed.Windows.Forms/System.Windows.Forms/CheckedListBox.cs

@@ -364,7 +364,7 @@ namespace System.Windows.Forms
 
 		#endregion Private Methods
 
-		public class ObjectCollection : ListBox.ObjectCollection
+		public new class ObjectCollection : ListBox.ObjectCollection
 		{		
 			private CheckedListBox owner;
 

mcs/class/Managed.Windows.Forms/System.Windows.Forms/ComboBox.cs

@@ -267,8 +267,8 @@ namespace System.Windows.Forms
 				
 				OnDropDownStyleChanged (EventArgs.Empty);
     				
-				Layout ();
-				UpdateBounds ();
+				LayoutComboBox ();
+				UpdateComboBoxBounds ();
 				Refresh ();
     			}
 		}
@@ -335,7 +335,7 @@ namespace System.Windows.Forms
 					return;
 
     				integral_height = value;
-				UpdateBounds ();
+				UpdateComboBoxBounds ();
     				Refresh ();
 			}
 		}
@@ -356,8 +356,8 @@ namespace System.Windows.Forms
 				item_height_specified = true;
 				item_height = value;
 				if (IntegralHeight)
-					UpdateBounds ();
-				Layout ();
+					UpdateComboBoxBounds ();
+				LayoutComboBox ();
 				Refresh ();
 			}
 		}
@@ -524,7 +524,7 @@ namespace System.Windows.Forms
 				SelectedIndex = -1;
 				if (sorted) {
 					Items.Sort ();
-					Layout ();
+					LayoutComboBox ();
 				}
     			}
     		}
@@ -752,9 +752,9 @@ namespace System.Windows.Forms
 			}
 
 			if (IntegralHeight)
-				UpdateBounds ();
+				UpdateComboBoxBounds ();
 
-			Layout ();
+			LayoutComboBox ();
 		}
 
 		protected override void OnForeColorChanged (EventArgs e)
@@ -813,7 +813,7 @@ namespace System.Windows.Forms
 			if (textbox_ctrl != null)
 				Controls.AddImplicit (textbox_ctrl);
 
-			Layout ();
+			LayoutComboBox ();
 		}
 
 		protected override void OnHandleDestroyed (EventArgs e)
@@ -844,7 +844,7 @@ namespace System.Windows.Forms
 
 		protected override void OnResize (EventArgs e)
 		{			
-			Layout ();
+			LayoutComboBox ();
 			if (listbox_ctrl != null)
 				listbox_ctrl.CalcListBoxArea ();
 		}
@@ -988,7 +988,7 @@ namespace System.Windows.Forms
 			set {}
 		}
 		
-		void Layout ()
+		void LayoutComboBox ()
 		{			
 			int border = ThemeEngine.Current.Border3DSize.Width;
 
@@ -1265,7 +1265,7 @@ namespace System.Windows.Forms
     			process_textchanged_event = true;
     		}
 		
-		void UpdateBounds ()
+		void UpdateComboBoxBounds ()
 		{
 			if (requested_height != -1)
 				SetBounds (0, 0, 0, requested_height, BoundsSpecified.Height);

mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs

@@ -187,9 +187,13 @@ namespace System.Windows.Forms
 		
 		#region Public Classes
 		[ComVisible(true)]
-		public class ControlAccessibleObject : AccessibleObject {			
+		public class ControlAccessibleObject : AccessibleObject {
+			Control owner;
+
 			#region ControlAccessibleObject Constructors
-			public ControlAccessibleObject(Control ownerControl) {
+			public ControlAccessibleObject(Control ownerControl)
+				: base (ownerControl)
+			{
 				this.owner = ownerControl;
 			}
 			#endregion	// ControlAccessibleObject Constructors

mcs/class/Managed.Windows.Forms/System.Windows.Forms/ControlBindingsCollection.cs

@@ -81,11 +81,11 @@ namespace System.Windows.Forms {
 			return res;
 		}
 
-		public void Clear() {
+		public new void Clear() {
 			base.Clear();
 		}
 
-		public void Remove(Binding binding) {
+		public new void Remove(Binding binding) {
 			if (binding == null) {
 				throw new NullReferenceException("The binding is null");
 			}
@@ -93,7 +93,7 @@ namespace System.Windows.Forms {
 			base.Remove(binding);
 		}
 
-		public void RemoveAt(int index) {
+		public new void RemoveAt(int index) {
 			if (index < 0 || index >= base.List.Count) {
 				throw new ArgumentOutOfRangeException("index");
 			}

mcs/class/Managed.Windows.Forms/System.Windows.Forms/FolderBrowserDialog.cs

@@ -296,13 +296,11 @@ namespace System.Windows.Forms {
 		#endregion	// Internal Methods
 		
 		#region Events
-		static object HelpRequestEvent = new object ();
-
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
-		public event EventHandler HelpRequest {
-			add { Events.AddHandler (HelpRequestEvent, value); }
-			remove { Events.RemoveHandler (HelpRequestEvent, value); }
+		public new event EventHandler HelpRequest {
+			add { base.HelpRequest += value; }
+			remove { base.HelpRequest -= value; }
 		}
 		#endregion
 		

mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListBox.cs

@@ -82,7 +82,6 @@ namespace System.Windows.Forms
 		private bool suspend_layout;
 		private bool ctrl_pressed = false;
 		private bool shift_pressed = false;
-		private bool has_focus = false;
 		private bool explicit_item_height = false;
 		private int top_index = 0;
 		private int last_visible_index = 0;
@@ -207,7 +206,7 @@ namespace System.Windows.Forms
 			get { return InternalBorderStyle; }
 			set { 
 				InternalBorderStyle = value; 
-				UpdateBounds ();
+				UpdateListBoxBounds ();
 			}
 		}
 
@@ -313,7 +312,7 @@ namespace System.Windows.Forms
 					return;
 
     				integral_height = value;
-				UpdateBounds ();
+				UpdateListBoxBounds ();
 			}
 		}
 
@@ -338,8 +337,8 @@ namespace System.Windows.Forms
 
 				item_height = value;
 				if (IntegralHeight)
-					UpdateBounds ();
-				Layout ();
+					UpdateListBoxBounds ();
+				LayoutListBox ();
 			}
 		}
 
@@ -361,7 +360,7 @@ namespace System.Windows.Forms
 					throw new ArgumentException ("A multicolumn ListBox cannot have a variable-sized height.");
 					
     				multicolumn = value;
-				Layout ();
+				LayoutListBox ();
 			}
 		}
 
@@ -631,7 +630,7 @@ namespace System.Windows.Forms
 		public void EndUpdate ()
 		{
 			suspend_layout = false;
-			Layout ();
+			LayoutListBox ();
 			base.Refresh ();
 		}
 
@@ -824,8 +823,8 @@ namespace System.Windows.Forms
 				SizeF sz = DeviceContext.MeasureString ("The quick brown Fox", Font);
 				item_height = (int) sz.Height;
 				if (IntegralHeight)
-					UpdateBounds ();
-				Layout ();
+					UpdateListBoxBounds ();
+				LayoutListBox ();
 			}
 		}
 
@@ -837,7 +836,7 @@ namespace System.Windows.Forms
 			Controls.AddImplicit (vscrollbar);
 			Controls.AddImplicit (hscrollbar);
 			ResumeLayout ();
-			Layout ();
+			LayoutListBox ();
 		}
 
 		protected override void OnHandleDestroyed (EventArgs e)
@@ -864,7 +863,7 @@ namespace System.Windows.Forms
 		{
 			base.OnResize (e);
 			if (canvas_size.IsEmpty || MultiColumn)
-				Layout ();
+				LayoutListBox ();
 		}
 
 		protected override void OnSelectedIndexChanged (EventArgs e)
@@ -988,7 +987,7 @@ namespace System.Windows.Forms
 
 		private Size canvas_size;
 
-		private void Layout ()
+		private void LayoutListBox ()
 		{
 			if (!IsHandleCreated || suspend_layout)
 				return;
@@ -1360,16 +1359,12 @@ namespace System.Windows.Forms
 		
 		private void OnGotFocus (object sender, EventArgs e) 			
 		{			
-			has_focus = true;			
-			
 			if (FocusedItem != -1)
 				InvalidateItem (FocusedItem);
 		}		
 		
 		private void OnLostFocus (object sender, EventArgs e) 			
 		{			
-			has_focus = false;
-			
 			if (FocusedItem != -1)
 				InvalidateItem (FocusedItem);
 		}		
@@ -1812,12 +1807,12 @@ namespace System.Windows.Forms
 			if (!IsHandleCreated || suspend_layout)
 				return;
 
-			Layout ();
+			LayoutListBox ();
 
 			base.Refresh ();
 		}
 
-		private void UpdateBounds ()
+		private void UpdateListBoxBounds ()
 		{
 			if (requested_height == -1)
 				return;

mcs/class/Managed.Windows.Forms/System.Windows.Forms/MonthCalendar.cs

@@ -328,20 +328,9 @@ namespace System.Windows.Forms {
 
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
-		public ImeMode ImeMode {
-			get {
-				return ime_mode;
-			}
-
-			set {
-				if (ime_mode != value) {
-					ime_mode = value;
-
-					if (ImeModeChanged != null) {
-						ImeModeChanged(this, EventArgs.Empty);
-					}
-				}
-			}
+		public new ImeMode ImeMode {
+			get { return base.ImeMode; }
+			set { base.ImeMode = value; }
 		}
 
 		// the maximum date allowed to be selected on this month calendar
@@ -1005,21 +994,27 @@ namespace System.Windows.Forms {
 
 		[Browsable(false)]
 		[EditorBrowsable (EditorBrowsableState.Never)]
-		public event EventHandler BackgroundImageChanged;
+		public new event EventHandler BackgroundImageChanged {
+			add { base.BackgroundImageChanged += value; }
+			remove { base.BackgroundImageChanged -= value; }
+		}
 
 		// this event is overridden to supress it from being fired
 		[Browsable(false)]
 		[EditorBrowsable (EditorBrowsableState.Never)]
-		public event EventHandler Click;
+		public new event EventHandler Click;
 
 		// this event is overridden to supress it from being fired
 		[Browsable(false)]
 		[EditorBrowsable (EditorBrowsableState.Never)]
-		public event EventHandler DoubleClick;
+		public new event EventHandler DoubleClick;
 
 		[Browsable(false)]
 		[EditorBrowsable (EditorBrowsableState.Never)]
-		public event EventHandler ImeModeChanged;
+		public new event EventHandler ImeModeChanged {
+			add { base.ImeModeChanged += value; }
+			remove { base.ImeModeChanged -= value; }
+		}
 
 		[Browsable(false)]
 		[EditorBrowsable (EditorBrowsableState.Never)]
@@ -1027,7 +1022,10 @@ namespace System.Windows.Forms {
 
 		[Browsable(false)]
 		[EditorBrowsable (EditorBrowsableState.Never)]
-		public event EventHandler TextChanged;
+		public new event EventHandler TextChanged {
+			add { base.TextChanged += value; }
+			remove { base.TextChanged -= value; }
+		}
 		#endregion	// public events
 
 		#region internal properties

mcs/class/Managed.Windows.Forms/System.Windows.Forms/NumericUpDown.cs

@@ -461,7 +461,6 @@ namespace System.Windows.Forms {
 
 		#region Events
 		static object ValueChangedEvent = new object ();
-		static object TextChangedEvent = new object ();
 
 		public event EventHandler ValueChanged {
 			add { Events.AddHandler (ValueChangedEvent, value); }
@@ -470,9 +469,9 @@ namespace System.Windows.Forms {
 
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
-		public event EventHandler TextChanged {
-			add { Events.AddHandler (TextChangedEvent, value); }
-			remove { Events.RemoveHandler (TextChangedEvent, value); }
+		public new event EventHandler TextChanged {
+			add { base.TextChanged += value; }
+			remove { base.TextChanged -= value; }
 		}
 		#endregion	// Events
 	}

mcs/class/Managed.Windows.Forms/System.Windows.Forms/Panel.cs

@@ -106,19 +106,31 @@ namespace System.Windows.Forms {
 		#region Events
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
-		public event KeyEventHandler KeyDown;
+		public new event KeyEventHandler KeyDown {
+			add { base.KeyDown += value; }
+			remove { base.KeyDown -= value; }
+		}
 
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
-		public event KeyPressEventHandler KeyPress;
+		public new event KeyPressEventHandler KeyPress {
+			add { base.KeyPress += value; }
+			remove { base.KeyPress -= value; }
+		}
 
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
-		public event KeyEventHandler KeyUp;
+		public new event KeyEventHandler KeyUp {
+			add { base.KeyUp += value; }
+			remove { base.KeyUp -= value; }
+		}
 
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
-		public event EventHandler TextChanged;
+		public new event EventHandler TextChanged {
+			add { base.TextChanged += value; }
+			remove { base.TextChanged -= value; }
+		}
 		#endregion
 	}
 }

mcs/class/Managed.Windows.Forms/System.Windows.Forms/RadioButton.cs

@@ -132,10 +132,6 @@ namespace System.Windows.Forms {
 			this.TabStop = true;
 		}
 
-		internal override void HaveDoubleClick() {
-			if (DoubleClick != null) DoubleClick(this, EventArgs.Empty);
-		}
-
 		internal override void Draw (PaintEventArgs pe) {
 			ThemeEngine.Current.DrawRadioButton (pe.Graphics, this.ClientRectangle, this);
 		}
@@ -332,7 +328,10 @@ namespace System.Windows.Forms {
 
 		[Browsable(false)]
 		[EditorBrowsable (EditorBrowsableState.Never)]
-		public event EventHandler	DoubleClick;
+		public new event EventHandler DoubleClick {
+			add { base.DoubleClick += value; }
+			remove { base.DoubleClick -= value; }
+		}
 		#endregion	// Events
 	}
 }

mcs/class/Managed.Windows.Forms/System.Windows.Forms/RichTextBox.cs

@@ -1100,7 +1100,10 @@ namespace System.Windows.Forms {
 
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
-		public event EventHandler			BackgroundImageChanged;
+		public new event EventHandler BackgroundImageChanged {
+			add { base.BackgroundImageChanged += value; }
+			remove { base.BackgroundImageChanged -= value; }
+		}
 
 		public event ContentsResizedEventHandler ContentsResized {
 			add { Events.AddHandler (ContentsResizedEvent, value); }
@@ -1109,61 +1112,47 @@ namespace System.Windows.Forms {
 
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
-		public event EventHandler			DoubleClick;
+		public new event EventHandler DoubleClick {
+			add { base.DoubleClick += value; }
+			remove { base.DoubleClick -= value; }
+		}
 
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
-		public event DragEventHandler DragDrop {
-			add {
-				base.DragDrop += value;
-			}
-
-			remove {
-				base.DragDrop -= value;
-			}
+		public new event DragEventHandler DragDrop {
+			add { base.DragDrop += value; }
+			remove { base.DragDrop -= value; }
 		}
 
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
-		public event DragEventHandler DragEnter {
-			add {
-				base.DragEnter += value;
-			}
-
-			remove {
-				base.DragEnter -= value;
-			}
+		public new event DragEventHandler DragEnter {
+			add { base.DragEnter += value; }
+			remove { base.DragEnter -= value; }
 		}
 
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
-		public event EventHandler DragLeave {
-			add {
-				base.DragLeave += value;
-			}
-
-			remove {
-				base.DragLeave -= value;
-			}
+		public new event EventHandler DragLeave {
+			add { base.DragLeave += value; }
+			remove { base.DragLeave -= value; }
 		}
 
 
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
-		public event DragEventHandler DragOver {
-			add {
-				base.DragOver += value;
-			}
-
-			remove {
-				base.DragOver -= value;
-			}
+		public new event DragEventHandler DragOver {
+			add { base.DragOver += value; }
+			remove { base.DragOver -= value; }
 		}
 
 
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
-		public event GiveFeedbackEventHandler		GiveFeedback;
+		public new event GiveFeedbackEventHandler GiveFeedback {
+			add { base.GiveFeedback += value; }
+			remove { base.GiveFeedback -= value; }
+		}
 
 		public event EventHandler HScroll {
 			add { Events.AddHandler (HScrollEvent, value); }
@@ -1187,7 +1176,11 @@ namespace System.Windows.Forms {
 
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
-		public event QueryContinueDragEventHandler	QueryContinueDrag;
+		public new event QueryContinueDragEventHandler QueryContinueDrag {
+			add { base.QueryContinueDrag += value; }
+			remove { base.QueryContinueDrag -= value; }
+		}
+
 		public event EventHandler			SelectionChanged;
 		public event EventHandler			VScroll;
 		#endregion	// Events

mcs/class/Managed.Windows.Forms/System.Windows.Forms/Splitter.cs

@@ -299,14 +299,9 @@ namespace System.Windows.Forms {
 
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
-		public bool TabStop {
-			get {
-				return base.TabStop;
-			}
-
-			set {
-				base.TabStop = value;
-			}
+		public new bool TabStop {
+			get { return base.TabStop; }
+			set { base.TabStop = value; }
 		}
 
 		[Bindable(false)]

mcs/class/Managed.Windows.Forms/System.Windows.Forms/StatusBar.cs

@@ -81,7 +81,7 @@ namespace System.Windows.Forms {
 				if (value == Dock)
 					return;
 				base.Dock = value;
-				Update ();
+				UpdateStatusBar ();
 			}
 		}
 
@@ -92,7 +92,7 @@ namespace System.Windows.Forms {
 				if (value == Font)
 					return;
 				base.Font = value;
-				Update ();
+				UpdateStatusBar ();
 			}
 		}
 
@@ -128,7 +128,7 @@ namespace System.Windows.Forms {
 				if (show_panels == value)
 					return;
 				show_panels = value;
-				Update ();
+				UpdateStatusBar ();
 			}
 		}
 
@@ -139,7 +139,7 @@ namespace System.Windows.Forms {
 				if (sizing_grip == value)
 					return;
 				sizing_grip = value;
-				Update ();
+				UpdateStatusBar ();
 			}
 		}
 
@@ -156,7 +156,7 @@ namespace System.Windows.Forms {
 				if (value == Text)
 					return;
 				base.Text = value;
-				Update ();
+				UpdateStatusBar ();
 			}
 			
 		}
@@ -249,7 +249,7 @@ namespace System.Windows.Forms {
 			if (Width <= 0 || Height <= 0)
 				return;
 
-			Update ();
+			UpdateStatusBar ();
 		}
 
 		protected override void WndProc(ref Message m) {
@@ -268,11 +268,11 @@ namespace System.Windows.Forms {
 		internal void UpdatePanel (StatusBarPanel panel)
 		{
 			if (panel.AutoSize == StatusBarPanelAutoSize.Contents) {
-				Update ();
+				UpdateStatusBar ();
 				return;
 			}
 
-			Update ();
+			UpdateStatusBar ();
 		}
 
 		internal void UpdatePanelContents (StatusBarPanel panel)
@@ -285,7 +285,7 @@ namespace System.Windows.Forms {
 			Invalidate (new Rectangle (panel.X + 2, 2, panel.Width - 4, bounds.Height - 4));
 		}
 
-		internal void Update ()
+		void UpdateStatusBar ()
 		{
 			CalcPanelSizes ();
 			Refresh ();

mcs/class/Managed.Windows.Forms/System.Windows.Forms/TabControl.cs

@@ -1074,7 +1074,7 @@ namespace System.Windows.Forms {
 
 
 		#region Class TaControl.ControlCollection
-		public class ControlCollection : System.Windows.Forms.Control.ControlCollection {
+		public new class ControlCollection : System.Windows.Forms.Control.ControlCollection {
 
 			private TabControl owner;
 			private ArrayList list = new ArrayList ();

mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs

@@ -1319,14 +1319,15 @@ namespace System.Windows.Forms {
 		}
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Advanced)]
-		public event EventHandler	Click {
+		public new event EventHandler Click {
 			add { base.Click += value; }
 			remove { base.Click -= value; }
 		}
 
+		// XXX should this not manipulate base.Paint?
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
-		public event PaintEventHandler	Paint;
+		public new event PaintEventHandler Paint;
 		#endregion	// Events
 
 		#region Private Methods

mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs

@@ -112,7 +112,9 @@ namespace System.Windows.Forms
 			foreground_color = ThemeEngine.Current.DefaultControlForeColor;
 			buttons = new ToolBarButtonCollection (this);
 			dock_style = DockStyle.Top;
-			
+
+			ImeMode = ImeMode.Disable;
+
 			GotFocus += new EventHandler (FocusChanged);
 			LostFocus += new EventHandler (FocusChanged);
 			MouseDown += new MouseEventHandler (ToolBar_MouseDown);
@@ -320,19 +322,11 @@ namespace System.Windows.Forms
 			}
 		}
 
-		ImeMode ime_mode = ImeMode.Disable;
-
 		[Browsable (false)]
 		[EditorBrowsable (EditorBrowsableState.Never)]
 		public new ImeMode ImeMode {
-			get { return ime_mode; }
-			set {
-				if (value == ime_mode)
-					return;
-
-				ime_mode = value;
-				OnImeModeChanged (EventArgs.Empty);
-			}
+			get { return base.ImeMode; }
+			set { base.ImeMode = value; }
 		}
 
 		[Browsable (false)]
@@ -805,7 +799,7 @@ namespace System.Windows.Forms
 		{
 			bool invalidate = true;
 			if (recalculate) {
-				invalidate = Layout ();
+				invalidate = LayoutToolBar ();
 			}
 
 			if (force || invalidate)
@@ -875,7 +869,7 @@ namespace System.Windows.Forms
 			}
 		}
 
-		bool Layout ()
+		bool LayoutToolBar ()
 		{
 			bool changed = false;
 			Theme theme = ThemeEngine.Current;

mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs

@@ -1787,7 +1787,7 @@ namespace System.Windows.Forms {
 
 		[Browsable (false)]
 		[EditorBrowsable (EditorBrowsableState.Never)]	
-		public event EventHandler BackgroundImageChanged {
+		public new event EventHandler BackgroundImageChanged {
 			add { base.BackgroundImageChanged += value; }
 			remove { base.BackgroundImageChanged -= value; }
 		}

mcs/class/Managed.Windows.Forms/System.Windows.Forms/UpDownBase.cs

@@ -391,27 +391,17 @@ namespace System.Windows.Forms
 		[Browsable(false)]
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
-		public Size AutoScrollMargin {
-			get {
-				return base.AutoScrollMargin;
-			}
-
-			set {
-				base.AutoScrollMargin = value;
-			}
+		public new Size AutoScrollMargin {
+			get { return base.AutoScrollMargin; }
+			set { base.AutoScrollMargin = value; }
 		}
 
 		[Browsable(false)]
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
-		public Size AutoScrollMinSize {
-			get {
-				return base.AutoScrollMinSize;
-			}
-
-			set {
-				base.AutoScrollMinSize = value;
-			}
+		public new Size AutoScrollMinSize {
+			get { return base.AutoScrollMinSize; }
+			set { base.AutoScrollMinSize = value; }
 		}
 
 		public override Color BackColor {
@@ -460,10 +450,8 @@ namespace System.Windows.Forms
 		[Browsable(false)]
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
-		public DockPaddingEdges DockPadding {
-			get {
-				return base.DockPadding;
-			}
+		public new DockPaddingEdges DockPadding {
+			get { return base.DockPadding; }
 		}
 
 		[Browsable(false)]

mcs/class/Managed.Windows.Forms/System.Windows.Forms/UserControl.cs

@@ -99,7 +99,6 @@ namespace System.Windows.Forms {
 
 		#region Events
 		static object LoadEvent = new object ();
-		static object TextChangedEvent = new object ();
 
 		public event EventHandler Load {
 			add { Events.AddHandler (LoadEvent, value); }
@@ -108,9 +107,9 @@ namespace System.Windows.Forms {
 
 		[Browsable(false)]
 		[EditorBrowsable(EditorBrowsableState.Never)]
-		public event EventHandler TextChanged {
-			add { Events.AddHandler (TextChangedEvent, value); }
-			remove { Events.RemoveHandler (TextChangedEvent, value); }
+		public new event EventHandler TextChanged {
+			add { base.TextChanged += value; }
+			remove { base.TextChanged -= value; }
 		}
 
 		#endregion	// Events