浏览代码

2002-06-16 Gonzalo Paniagua Javier <[email protected]>

	* Panel.cs: fixed stack overflow.
	* Unit.cs: use Int32.Parse and Single.Parse instead of Int32Converter
	and SingleConverter.

svn path=/trunk/mcs/; revision=5293
Gonzalo Paniagua Javier 23 年之前
父节点
当前提交
4e0798e081

+ 6 - 0
mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog

@@ -1,3 +1,9 @@
+2002-06-16  Gonzalo Paniagua Javier <[email protected]>
+
+	* Panel.cs: fixed stack overflow.
+	* Unit.cs: use Int32.Parse and Single.Parse instead of Int32Converter
+	and SingleConverter.
+
 2002-06-12  Gonzalo Paniagua Javier <[email protected]>
 
 	* RadioButton.cs: mono-stylized and some little fixes.

+ 1 - 1
mcs/class/System.Web/System.Web.UI.WebControls/Panel.cs

@@ -79,7 +79,7 @@ namespace System.Web.UI.WebControls
 
 		protected override void AddAttributesToRender(HtmlTextWriter writer)
 		{
-			AddAttributesToRender(writer);
+			base.AddAttributesToRender(writer);
 			if(BackImageUrl.Length > 0)
 			{
 				writer.AddStyleAttribute(HtmlTextWriterStyle.BackgroundImage, "url(" + ResolveUrl(BackImageUrl) + ")");

+ 3 - 6
mcs/class/System.Web/System.Web.UI.WebControls/Unit.cs

@@ -142,12 +142,9 @@ namespace System.Web.UI.WebControls
 			try
 			{
 				if(type == UnitType.Pixel)
-				{
-					val = (double)((new Int32Converter()).ConvertFromString(null, culture, strVal.Substring(0, start + 1)));
-				} else
-				{
-					val = (double)((new SingleConverter()).ConvertFromString(null, culture, strVal.Substring(0, start + 1)));
-				}
+					val = (double) Int32.Parse (strVal.Substring (0, start + 1), culture);
+				else
+					val = (double) Single.Parse (strVal.Substring (0, start + 1), culture);
 			} catch(Exception)
 			{
 				throw new ArgumentOutOfRangeException();