move 2.0 stuff into ifdef NET_2_0

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

diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog
index 73123cb621d5abdba08da3d09598ad12d7140b27..aea34ccb908ccfd73cfef738f54f147201a49785 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-25  Andrew Skiba  <andrews@mainsoft.com>
+
+       * Control.cs: move 2.0 stuff into ifdef NET_2_0
+
 2006-05-25  Andrew Skiba  <andrews@mainsoft.com>
 
        * Page.cs, Control.cs: Fix the order of OnInit invocation of controls

diff --git a/mcs/class/System.Web/System.Web.UI/Control.cs b/mcs/class/System.Web/System.Web.UI/Control.cs
index 427bf8d86ddea772b306c34ee1992beffd44cfba..a5399959bf9bf5e8afe0549464618dba99ad9576 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/Control.cs
+++ b/mcs/class/System.Web/System.Web.UI/Control.cs
@@ -1274,10 +1274,10 @@ namespace System.Web.UI
                                }
                        }
 
-                       ApplyTheme ();
-
                        stateMask |= INITING;
 #if NET_2_0
+                       ApplyTheme ();
+                       
                        if (Adapter != null)
                                Adapter.OnInit (EventArgs.Empty);
                        else