2005-05-21 Ben Maurer <bmaurer@ximian.com>

	* BaseDataList.cs: Caption is in 1.1 too, though not
	documented. Gonz owes me [more] ice cream. Yummmmm.

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

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/BaseDataList.cs b/mcs/class/System.Web/System.Web.UI.WebControls/BaseDataList.cs
index 09e95e2b7ad2442da430380f21d397dd4aab5ad9..25ffc4ca345d697600e03829474ee62e8b61612e 100755 (executable)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/BaseDataList.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/BaseDataList.cs
@@ -142,7 +142,6 @@ namespace System.Web.UI.WebControls
                        }
                }
 
-#if NET_2_0
                [DefaultValue ("")]
                [WebCategory ("Accessibility")]
                [WebSysDescription ("Caption")]
@@ -154,7 +153,6 @@ namespace System.Web.UI.WebControls
 
                        set { ViewState ["Caption"] = value; }
                }
-#endif
 
 #if NET_2_0
            [ThemeableAttribute (false)]

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
index 2448fc181843df13f986c36f5efba7caae2964bc..fc53cf9d78d1f893a76ef88dea9a8df148f57ea3 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-21  Ben Maurer  <bmaurer@ximian.com>
+
+       * BaseDataList.cs: Caption is in 1.1 too, though not
+       documented. Gonz owes me [more] ice cream. Yummmmm.
+
 2005-05-20 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * BaseDataList.cs: implemented 2.0 Caption property.