Author: toshok
Date: 2006-12-05 12:33:34 -0500 (Tue, 05 Dec 2006)
New Revision: 69057
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/CheckedListBox.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/LabelEditTextBox.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MainMenu.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Menu.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MonthCalendar.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBox.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
Log:
2006-12-05 Chris Toshok <[EMAIL PROTECTED]>
* TextBox.cs, CheckedListBox.cs, MonthCalendar.cs, Menu.cs,
MainMenu.cs, ListView.cs, LabelEditTextBox.cs, ToolBar.cs: more
System.ComponentModel.EventHandlerList work.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-12-05 17:17:36 UTC (rev 69056)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-12-05 17:33:34 UTC (rev 69057)
@@ -1,3 +1,9 @@
+2006-12-05 Chris Toshok <[EMAIL PROTECTED]>
+
+ * TextBox.cs, CheckedListBox.cs, MonthCalendar.cs, Menu.cs,
+ MainMenu.cs, ListView.cs, LabelEditTextBox.cs, ToolBar.cs: more
+ System.ComponentModel.EventHandlerList work.
+
2006-12-05 Jonathan Chambers <[EMAIL PROTECTED]>
* DrawTreeNodeEventArgs.cs: Added.
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/CheckedListBox.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/CheckedListBox.cs
2006-12-05 17:17:36 UTC (rev 69056)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/CheckedListBox.cs
2006-12-05 17:33:34 UTC (rev 69057)
@@ -52,6 +52,8 @@
}
#region events
+ static object ItemCheckEvent = new object ();
+
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
public new event EventHandler Click {
@@ -94,7 +96,10 @@
remove { base.ValueMemberChanged -= value; }
}
- public event ItemCheckEventHandler ItemCheck;
+ public event ItemCheckEventHandler ItemCheck {
+ add { Events.AddHandler (ItemCheckEvent, value); }
+ remove { Events.RemoveHandler (ItemCheckEvent, value); }
+ }
#endregion Events
#region Public Properties
@@ -252,8 +257,9 @@
protected virtual void OnItemCheck (ItemCheckEventArgs ice)
{
- if (ItemCheck != null)
- ItemCheck (this, ice);
+ ItemCheckEventHandler eh =
(ItemCheckEventHandler)(Events [ItemCheckEvent]);
+ if (eh != null)
+ eh (this, ice);
}
protected override void OnKeyPress (KeyPressEventArgs e)
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/LabelEditTextBox.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/LabelEditTextBox.cs
2006-12-05 17:17:36 UTC (rev 69056)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/LabelEditTextBox.cs
2006-12-05 17:33:34 UTC (rev 69057)
@@ -64,11 +64,16 @@
protected void OnEditingFinished (EventArgs e)
{
- if (EditingFinished != null)
- EditingFinished (this, EventArgs.Empty);
+ EventHandler eh = (EventHandler)(Events
[EditingFinishedEvent]);
+ if (eh != null)
+ eh (this, e);
}
- public event EventHandler EditingFinished;
+ static object EditingFinishedEvent = new object ();
+ public event EventHandler EditingFinished {
+ add { Events.AddHandler (EditingFinishedEvent, value); }
+ remove { Events.AddHandler (EditingFinishedEvent,
value); }
+ }
}
}
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs
2006-12-05 17:17:36 UTC (rev 69056)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs
2006-12-05 17:33:34 UTC (rev 69057)
@@ -1839,8 +1839,9 @@
protected void OnEditingFinished (EventArgs e)
{
- if (EditingFinished != null)
- EditingFinished (this, EventArgs.Empty);
+ EventHandler eh = (EventHandler)(Events
[EditingFinishedEvent]);
+ if (eh != null)
+ eh (this, e);
}
private void ResizeTextBoxWidth (int new_width)
@@ -1879,7 +1880,11 @@
Size = DefaultSize;
}
- public event EventHandler EditingFinished;
+ static object EditingFinishedEvent = new object ();
+ public event EventHandler EditingFinished {
+ add { Events.AddHandler (EditingFinishedEvent,
value); }
+ remove { Events.RemoveHandler
(EditingFinishedEvent, value); }
+ }
}
internal override void OnPaintInternal (PaintEventArgs pe)
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MainMenu.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MainMenu.cs
2006-12-05 17:17:36 UTC (rev 69056)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MainMenu.cs
2006-12-05 17:33:34 UTC (rev 69057)
@@ -120,8 +120,9 @@
ThemeEngine.Current.DrawMenuBar (pe.Graphics, this,
rect);
- if (Paint != null)
- Paint (this, pe);
+ PaintEventHandler eh = (PaintEventHandler)(Events
[PaintEvent]);
+ if (eh != null)
+ eh (this, pe);
}
internal override void InvalidateItem (MenuItem item)
@@ -162,8 +163,13 @@
tracker.OnMotion (args);
}
- internal event PaintEventHandler Paint;
+ static object PaintEvent = new object ();
+ internal event PaintEventHandler Paint {
+ add { Events.AddHandler (PaintEvent, value); }
+ remove { Events.RemoveHandler (PaintEvent, value); }
+ }
+
#endregion Private Methods
}
}
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Menu.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Menu.cs
2006-12-05 17:17:36 UTC (rev 69056)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Menu.cs
2006-12-05 17:33:34 UTC (rev 69057)
@@ -74,8 +74,9 @@
internal virtual void OnMenuChanged (EventArgs e)
{
- if (MenuChanged != null)
- MenuChanged (this, e);
+ EventHandler eh = (EventHandler)(Events
[MenuChangedEvent]);
+ if (eh != null)
+ eh (this, e);
}
[BrowsableAttribute(false)]
@@ -295,8 +296,12 @@
}
#endregion Public Methods
+ static object MenuChangedEvent = new object ();
- internal event EventHandler MenuChanged;
+ internal event EventHandler MenuChanged {
+ add { Events.AddHandler (MenuChangedEvent, value); }
+ remove { Events.RemoveHandler (MenuChangedEvent,
value); }
+ }
[ListBindable(false)]
public class MenuItemCollection : IList, ICollection,
IEnumerable
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MonthCalendar.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MonthCalendar.cs
2006-12-05 17:17:36 UTC (rev 69056)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MonthCalendar.cs
2006-12-05 17:33:34 UTC (rev 69057)
@@ -920,16 +920,16 @@
// raises the date changed event
protected virtual void OnDateChanged (DateRangeEventArgs
drevent) {
- if (this.DateChanged != null) {
- this.DateChanged (this, drevent);
- }
+ EventHandler eh = (EventHandler)(Events
[DateChangedEvent]);
+ if (eh != null)
+ eh (this, drevent);
}
// raises the DateSelected event
protected virtual void OnDateSelected (DateRangeEventArgs
drevent) {
- if (this.DateSelected != null) {
- this.DateSelected (this, drevent);
- }
+ EventHandler eh = (EventHandler)(Events
[DateSelectedEvent]);
+ if (eh != null)
+ eh (this, drevent);
}
protected override void OnFontChanged (EventArgs e) {
@@ -984,13 +984,21 @@
#endregion // Protected Instance Methods
#region public events
+ static object DateChangedEvent = new object ();
+ static object DateSelectedEvent = new object ();
// fired when the date is changed (either explicitely or
implicitely)
// when navigating the month selector
- public event DateRangeEventHandler DateChanged;
+ public event DateRangeEventHandler DateChanged {
+ add { Events.AddHandler (DateChangedEvent, value); }
+ remove { Events.RemoveHandler (DateChangedEvent,
value); }
+ }
// fired when the user explicitely clicks on date to select it
- public event DateRangeEventHandler DateSelected;
+ public event DateRangeEventHandler DateSelected {
+ add { Events.AddHandler (DateSelectedEvent, value); }
+ remove { Events.RemoveHandler (DateSelectedEvent,
value); }
+ }
[Browsable(false)]
[EditorBrowsable (EditorBrowsableState.Never)]
@@ -1000,11 +1008,13 @@
}
// this event is overridden to supress it from being fired
+ // XXX check this out
[Browsable(false)]
[EditorBrowsable (EditorBrowsableState.Never)]
public new event EventHandler Click;
// this event is overridden to supress it from being fired
+ // XXX check this out
[Browsable(false)]
[EditorBrowsable (EditorBrowsableState.Never)]
public new event EventHandler DoubleClick;
@@ -1016,6 +1026,7 @@
remove { base.ImeModeChanged -= value; }
}
+ // XXX check this out
[Browsable(false)]
[EditorBrowsable (EditorBrowsableState.Never)]
public new event PaintEventHandler Paint;
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBox.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBox.cs
2006-12-05 17:17:36 UTC (rev 69056)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBox.cs
2006-12-05 17:33:34 UTC (rev 69057)
@@ -255,9 +255,9 @@
}
protected virtual void OnTextAlignChanged(EventArgs e) {
- if (TextAlignChanged != null) {
- TextAlignChanged(this, e);
- }
+ EventHandler eh = (EventHandler)(Events
[TextAlignChangedEvent]);
+ if (eh != null)
+ eh (this, e);
}
protected override void WndProc(ref Message m) {
@@ -266,7 +266,12 @@
#endregion // Protected Instance Methods
#region Events
- public event EventHandler TextAlignChanged;
+ static object TextAlignChangedEvent = new object ();
+
+ public event EventHandler TextAlignChanged {
+ add { Events.AddHandler (TextAlignChangedEvent, value);
}
+ remove { Events.RemoveHandler (TextAlignChangedEvent,
value); }
+ }
#endregion // Events
#region Private Methods
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
2006-12-05 17:17:36 UTC (rev 69056)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
2006-12-05 17:33:34 UTC (rev 69057)
@@ -52,6 +52,9 @@
#endregion Instance Variables
#region Events
+ static object ButtonClickEvent = new object ();
+ static object ButtonDropDownEvent = new object ();
+
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
public new event EventHandler BackColorChanged {
@@ -66,9 +69,16 @@
remove { base.BackgroundImageChanged -= value; }
}
- public event ToolBarButtonClickEventHandler ButtonClick;
- public event ToolBarButtonClickEventHandler ButtonDropDown;
+ public event ToolBarButtonClickEventHandler ButtonClick {
+ add { Events.AddHandler (ButtonClickEvent, value); }
+ remove {Events.RemoveHandler (ButtonClickEvent, value);
}
+ }
+ public event ToolBarButtonClickEventHandler ButtonDropDown {
+ add { Events.AddHandler (ButtonDropDownEvent, value); }
+ remove {Events.RemoveHandler (ButtonDropDownEvent,
value); }
+ }
+
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
public new event EventHandler ForeColorChanged {
@@ -452,14 +462,16 @@
e.Button.Invalidate ();
- if (ButtonClick != null)
- ButtonClick (this, e);
+ ToolBarButtonClickEventHandler eh =
(ToolBarButtonClickEventHandler)(Events [ButtonClickEvent]);
+ if (eh != null)
+ eh (this, e);
}
protected virtual void OnButtonDropDown
(ToolBarButtonClickEventArgs e)
{
- if (ButtonDropDown != null)
- ButtonDropDown (this, e);
+ ToolBarButtonClickEventHandler eh =
(ToolBarButtonClickEventHandler)(Events [ButtonDropDownEvent]);
+ if (eh != null)
+ eh (this, e);
if (e.Button.DropDownMenu == null)
return;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
