Author: andrews
Date: 2006-05-25 07:41:52 -0400 (Thu, 25 May 2006)
New Revision: 61106
Modified:
trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI/Control.cs
Log:
move 2.0 stuff into ifdef NET_2_0
Modified: trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2006-05-25 11:29:26 UTC
(rev 61105)
+++ trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2006-05-25 11:41:52 UTC
(rev 61106)
@@ -1,5 +1,9 @@
2006-05-25 Andrew Skiba <[EMAIL PROTECTED]>
+ * Control.cs: move 2.0 stuff into ifdef NET_2_0
+
+2006-05-25 Andrew Skiba <[EMAIL PROTECTED]>
+
* Page.cs, Control.cs: Fix the order of OnInit invocation of controls
created via master page content (see
http://lists.ximian.com/pipermail/mono-devel-list/2006-May/018585.html
).
Modified: trunk/mcs/class/System.Web/System.Web.UI/Control.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/Control.cs 2006-05-25 11:29:26 UTC
(rev 61105)
+++ trunk/mcs/class/System.Web/System.Web.UI/Control.cs 2006-05-25 11:41:52 UTC
(rev 61106)
@@ -1274,10 +1274,10 @@
}
}
- ApplyTheme ();
-
stateMask |= INITING;
#if NET_2_0
+ ApplyTheme ();
+
if (Adapter != null)
Adapter.OnInit (EventArgs.Empty);
else
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
