Author: igorz
Date: 2007-02-27 07:30:12 -0500 (Tue, 27 Feb 2007)
New Revision: 73458
Modified:
trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI/TemplateControl.cs
trunk/mcs/class/System.Web/System.Web.UI/TemplateControl.jvm.cs
Log:
2007-02-26 Igor Zelmanovich <[EMAIL PROTECTED]>
* TemplateControl.cs:
* TemplateControl.jvm.cs: fixed: AutoEventWireup feature:
Method 'Page_XXX' is declared in the base class must be
called even is private.
Modified: trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2007-02-27 12:02:04 UTC
(rev 73457)
+++ trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2007-02-27 12:30:12 UTC
(rev 73458)
@@ -1,3 +1,10 @@
+2007-02-26 Igor Zelmanovich <[EMAIL PROTECTED]>
+
+ * TemplateControl.cs:
+ * TemplateControl.jvm.cs: fixed: AutoEventWireup feature:
+ Method 'Page_XXX' is declared in the base class must be
+ called even is private.
+
2007-02-26 Vladimir Krasnov <[EMAIL PROTECTED]>
* Control.cs: fixed AppRelativeTemplateSourceDirectory property, should
Modified: trunk/mcs/class/System.Web/System.Web.UI/TemplateControl.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/TemplateControl.cs 2007-02-27
12:02:04 UTC (rev 73457)
+++ trunk/mcs/class/System.Web/System.Web.UI/TemplateControl.cs 2007-02-27
12:30:12 UTC (rev 73458)
@@ -47,7 +47,7 @@
#else
public abstract class TemplateControl : Control, INamingContainer {
#endif
- static Assembly _System_Web_Assembly = typeof
(TemplateControl).Assembly;
+ static readonly Assembly _System_Web_Assembly = typeof
(TemplateControl).Assembly;
static object abortTransaction = new object ();
static object commitTransaction = new object ();
static object error = new object ();
Modified: trunk/mcs/class/System.Web/System.Web.UI/TemplateControl.jvm.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/TemplateControl.jvm.cs
2007-02-27 12:02:04 UTC (rev 73457)
+++ trunk/mcs/class/System.Web/System.Web.UI/TemplateControl.jvm.cs
2007-02-27 12:30:12 UTC (rev 73458)
@@ -38,6 +38,7 @@
public abstract class TemplateControl : Control, INamingContainer
{
+ static readonly Assembly _System_Web_Assembly = typeof
(TemplateControl).Assembly;
static object abortTransaction = new object ();
static object commitTransaction = new object ();
static object error = new object ();
@@ -161,9 +162,14 @@
if (!SupportAutoEvents || !AutoEventWireup)
return;
- Type type = GetType ();
foreach (string methodName in methodNames) {
- MethodInfo method = type.GetMethod (methodName,
bflags);
+ MethodInfo method = null;
+ Type type;
+ for (type = GetType (); type.Assembly !=
_System_Web_Assembly; type = type.BaseType) {
+ method = type.GetMethod (methodName,
bflags);
+ if (method != null)
+ break;
+ }
if (method == null)
continue;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
