Author: mhabersack
Date: 2007-10-17 19:04:47 -0400 (Wed, 17 Oct 2007)
New Revision: 87726
Modified:
trunk/mcs/class/System.Web/System.Web.UI/Control.cs
Log:
The fix for bug #325303 is for the 2.0 profile only
Modified: trunk/mcs/class/System.Web/System.Web.UI/Control.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/Control.cs 2007-10-17 22:37:21 UTC
(rev 87725)
+++ trunk/mcs/class/System.Web/System.Web.UI/Control.cs 2007-10-17 23:04:47 UTC
(rev 87726)
@@ -1422,8 +1422,18 @@
internal void PreRenderRecursiveInternal ()
{
- if (Visible) {
+ bool visible;
+
+#if NET_2_0
+ visible = Visible;
+#else
+ visible = (stateMask & VISIBLE) != 0;
+#endif
+
+ if (visible) {
+#if NET_2_0
SetMask (VISIBLE, true);
+#endif
EnsureChildControls ();
#if MONO_TRACE
TraceContext trace = (Context != null &&
Context.Trace.IsEnabled) ? Context.Trace : null;
@@ -1451,8 +1461,11 @@
if (trace != null)
trace.Write ("control", String.Format
("End PreRenderRecursive {0} {1}", _userId, type_name));
#endif
- } else
+ }
+#if NET_2_0
+ else
SetMask (VISIBLE, false);
+#endif
stateMask |= PRERENDERED;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
