Author: toshok
Date: 2007-01-10 19:10:49 -0500 (Wed, 10 Jan 2007)
New Revision: 70823

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
Log:
2007-01-10  Chris Toshok  <[EMAIL PROTECTED]>

        * Control.cs: make FireEnter, FireLeave, FireValidating, and
        FireValidated virtual.

        * Form.cs: override and don't chain up calls to FireEnter and
        FireLeave.



Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-01-11 00:09:21 UTC (rev 70822)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-01-11 00:10:49 UTC (rev 70823)
@@ -1,3 +1,11 @@
+2007-01-10  Chris Toshok  <[EMAIL PROTECTED]>
+
+       * Control.cs: make FireEnter, FireLeave, FireValidating, and
+       FireValidated virtual.
+
+       * Form.cs: override and don't chain up calls to FireEnter and
+       FireLeave.
+
 2007-01-10  Carlos Alberto Cortez <[EMAIL PROTECTED]>
 
        * ListView.cs: Add more text padding space when using

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs       
2007-01-11 00:09:21 UTC (rev 70822)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs       
2007-01-11 00:10:49 UTC (rev 70823)
@@ -1426,22 +1426,22 @@
 
                }
 
-               internal void FireEnter ()
+               internal virtual void FireEnter ()
                {
                        OnEnter (EventArgs.Empty);
                }
 
-               internal void FireLeave ()
+               internal virtual void FireLeave ()
                {
                        OnLeave (EventArgs.Empty);
                }
 
-               internal void FireValidating (CancelEventArgs ce)
+               internal virtual void FireValidating (CancelEventArgs ce)
                {
                        OnValidating (ce);
                }
 
-               internal void FireValidated ()
+               internal virtual void FireValidated ()
                {
                        OnValidated (EventArgs.Empty);
                }

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs  
2007-01-11 00:09:21 UTC (rev 70822)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs  
2007-01-11 00:10:49 UTC (rev 70823)
@@ -2163,6 +2163,16 @@
                }
                #endregion      // Protected Instance Methods
 
+               internal override void FireEnter ()
+               {
+                       // do nothing - forms don't generate OnEnter
+               }
+
+               internal override void FireLeave ()
+               {
+                       // do nothing - forms don't generate OnLeave
+               }
+
                internal void RemoveWindowManager ()
                {
                        window_manager = null;

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to