Author: krasnov
Date: 2007-01-16 05:17:43 -0500 (Tue, 16 Jan 2007)
New Revision: 71116
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI/ChangeLog
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI/TemplateControl.jvm.cs
Log:
merge -r 71114:71115
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI/ChangeLog
===================================================================
--- branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI/ChangeLog
2007-01-16 10:01:50 UTC (rev 71115)
+++ branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI/ChangeLog
2007-01-16 10:17:43 UTC (rev 71116)
@@ -1,3 +1,7 @@
+2007-01-16 Vladimir Krasnov <[EMAIL PROTECTED]>
+
+ * TemplateControl.jvm.cs: added 2.0 event names for wiring up
+
2007-01-08 Vladimir Krasnov <[EMAIL PROTECTED]>
* PageTheme.cs: implemented
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI/TemplateControl.jvm.cs
===================================================================
---
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI/TemplateControl.jvm.cs
2007-01-16 10:01:50 UTC (rev 71115)
+++
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI/TemplateControl.jvm.cs
2007-01-16 10:17:43 UTC (rev 71116)
@@ -42,6 +42,14 @@
static object commitTransaction = new object ();
static object error = new object ();
static string [] methodNames = { "Page_Init",
+#if NET_2_0
+ "Page_PreInit",
+ "Page_PreLoad",
+ "Page_LoadComplete",
+ "Page_PreRenderComplete",
+ "Page_SaveStateComplete",
+ "Page_InitComplete",
+#endif
"Page_Load",
"Page_DataBind",
"Page_PreRender",
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches