Author: krasnov
Date: 2006-08-06 08:35:14 -0400 (Sun, 06 Aug 2006)
New Revision: 63407
Modified:
trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI/Control.cs
Log:
* Control.cs: fixed EnableTheming proprty, fixes bug when child control has
EnableTheming=false and parent has true.
Modified: trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2006-08-06 12:14:28 UTC
(rev 63406)
+++ trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2006-08-06 12:35:14 UTC
(rev 63407)
@@ -1,3 +1,8 @@
+2006-08-06 Vladimir Krasnov <[EMAIL PROTECTED]>
+
+ * Control.cs: fixed EnableTheming proprty, fixes bug when child
+ control has EnableTheming=false and parent has true.
+
2006-07-31 Vladimir Krasnov <[EMAIL PROTECTED]>
* MasterPage.cs: fixed default values, fixed AddContentTemplate
Modified: trunk/mcs/class/System.Web/System.Web.UI/Control.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/Control.cs 2006-08-06 12:14:28 UTC
(rev 63406)
+++ trunk/mcs/class/System.Web/System.Web.UI/Control.cs 2006-08-06 12:35:14 UTC
(rev 63407)
@@ -141,9 +141,6 @@
stateMask = ENABLE_VIEWSTATE | VISIBLE | AUTOID |
BINDING_CONTAINER | AUTO_EVENT_WIREUP;
if (this is INamingContainer)
stateMask |= IS_NAMING_CONTAINER;
-#if NET_2_0
- stateMask |= ENABLE_THEMING;
-#endif
}
#if NET_2_0
@@ -1442,6 +1439,7 @@
#if NET_2_0
string skinId = string.Empty;
+ bool _enableTheming = true;
[Browsable (false)]
[Themeable (false)]
@@ -1450,15 +1448,19 @@
{
get
{
- if ((stateMask & ENABLE_THEMING) == 0)
- return false;
+ if ((stateMask & ENABLE_THEMING) != 0)
+ return _enableTheming;
if (_parent != null)
return _parent.EnableTheming;
return true;
}
- set { SetMask (ENABLE_THEMING, value); }
+ set
+ {
+ SetMask (ENABLE_THEMING, true);
+ _enableTheming = value;
+ }
}
[Browsable (false)]
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
