2010-03-07 Rodrigo Kumpera <rkumpera@novell.com>

	* EventInfo.cs: Some v4 adjustments.

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

diff --git a/mcs/class/corlib/System.Reflection/ChangeLog b/mcs/class/corlib/System.Reflection/ChangeLog
index 252f5cbb36fa7bf9d0a9d8af3deadcd2149752f7..fda76e313a03394c5f659057b51fab6d94037ecc 100644 (file)
--- a/mcs/class/corlib/System.Reflection/ChangeLog
+++ b/mcs/class/corlib/System.Reflection/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-07 Rodrigo Kumpera  <rkumpera@novell.com>
+
+       * EventInfo.cs: Some v4 adjustments.
+
 2010-03-07 Rodrigo Kumpera  <rkumpera@novell.com>
 
        * MethodInfo.cs: New v4 stuff.

diff --git a/mcs/class/corlib/System.Reflection/EventInfo.cs b/mcs/class/corlib/System.Reflection/EventInfo.cs
index 8aadfb0899aee00dd0fb6e48067d34eb53700805..9137379f4c5cc77d33aee396a52cbff0d8472c52 100644 (file)
--- a/mcs/class/corlib/System.Reflection/EventInfo.cs
+++ b/mcs/class/corlib/System.Reflection/EventInfo.cs
@@ -41,7 +41,11 @@ namespace System.Reflection {
 
                public abstract EventAttributes Attributes {get;}
 
-               public Type EventHandlerType {
+               public
+#if NET_4_0
+               virtual
+#endif
+               Type EventHandlerType {
                        get {
                                ParameterInfo[] p;
                                MethodInfo add = GetAddMethod (true);
@@ -56,7 +60,12 @@ namespace System.Reflection {
                                        return null;
                        }
                }
-               public bool IsMulticast {get {return true;}}
+
+               public
+#if NET_4_0
+               virtual
+#endif
+               bool IsMulticast {get {return true;}}
                public bool IsSpecialName {get {return (Attributes & EventAttributes.SpecialName ) != 0;}}
                public override MemberTypes MemberType {
                        get {return MemberTypes.Event;}
@@ -68,7 +77,11 @@ namespace System.Reflection {
 
                [DebuggerHidden]
                [DebuggerStepThrough]
-               public void AddEventHandler (object target, Delegate handler)
+               public
+#if NET_4_0
+               virtual
+#endif
+               void AddEventHandler (object target, Delegate handler)
                {
                        if (cached_add_event == null) {
                                MethodInfo add = GetAddMethod ();
@@ -111,7 +124,11 @@ namespace System.Reflection {
 
                [DebuggerHidden]
                [DebuggerStepThrough]
-               public void RemoveEventHandler (object target, Delegate handler)
+               public
+#if NET_4_0
+               virtual
+#endif
+               void RemoveEventHandler (object target, Delegate handler)
                {
                        MethodInfo remove = GetRemoveMethod ();
                        if (remove == null)