Author: igorz
Date: 2006-10-05 06:04:35 -0400 (Thu, 05 Oct 2006)
New Revision: 66280
Modified:
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/WebControlTest.cs
Log:
2006-10-05 Igor Zelmanovich <[EMAIL PROTECTED]>
* WebControl.cs: fixed: CreateControlStyle()
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2006-10-05 09:07:31 UTC (rev 66279)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2006-10-05 10:04:35 UTC (rev 66280)
@@ -1,3 +1,7 @@
+2006-10-05 Igor Zelmanovich <[EMAIL PROTECTED]>
+
+ * WebControl.cs: fixed: CreateControlStyle()
+
2006-10-04 Igor Zelmanovich <[EMAIL PROTECTED]>
* FormView.cs:
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs
2006-10-05 09:07:31 UTC (rev 66279)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs
2006-10-05 10:04:35 UTC (rev 66280)
@@ -508,8 +508,7 @@
protected virtual Style CreateControlStyle()
{
- style = new Style (ViewState);
- return style;
+ return new Style (ViewState);
}
protected override void LoadViewState (object savedState)
Modified: trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
2006-10-05 09:07:31 UTC (rev 66279)
+++ trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
2006-10-05 10:04:35 UTC (rev 66280)
@@ -1,3 +1,7 @@
+2006-10-05 Igor Zelmanovich <[EMAIL PROTECTED]>
+
+ * WebControlTest.cs: added test
+
2006-10-04 Igor Zelmanovich <[EMAIL PROTECTED]>
* FormViewTest.cs: removed NotWorking attribute
Modified:
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/WebControlTest.cs
===================================================================
--- trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/WebControlTest.cs
2006-10-05 09:07:31 UTC (rev 66279)
+++ trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/WebControlTest.cs
2006-10-05 10:04:35 UTC (rev 66280)
@@ -178,9 +178,22 @@
return result;
}
+ public Style DoCreateControlStyle () {
+ return base.CreateControlStyle ();
+ }
}
[Test]
+ public void CreateControlStyle () {
+ WebControlTestClass w = new WebControlTestClass ();
+ Assert.AreEqual (false, w.ControlStyleCreated,
"CreateControlStyle#1");
+ Style s = w.DoCreateControlStyle ();
+ Assert.AreEqual (false, w.ControlStyleCreated,
"CreateControlStyle#2");
+ s = w.ControlStyle;
+ Assert.AreEqual (true, w.ControlStyleCreated,
"CreateControlStyle#3");
+ }
+
+ [Test]
public void Constructors ()
{
WebControlTestClass w;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches