2010-07-08 Marek Habersack <mhabersack@novell.com>

	* CheckBoxList.cs: RepeatLayout property update for new values of
	the RepeatLayout enum in 4.0

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

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
index eb159f0c4fc739713aa536e1749fe2e1e8582118..f874bbd3c6f09b549d680bb8465e5bab32f3e1f6 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
@@ -1,5 +1,8 @@
 2010-07-08  Marek Habersack  <mhabersack@novell.com>
 
+       * CheckBoxList.cs: RepeatLayout property update for new values of
+       the RepeatLayout enum in 4.0
+
        * TreeView.cs: in 4.0, checkbox renders the value of the current
        node's ToolTip, if anything, and not Text.
 

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CheckBoxList.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CheckBoxList.cs
index 789e40a4763da8f0492480e9c4ca03a91fe0fe6f..2efde6a67ae3c9249ad74d76e7cadc886fab94cc 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/CheckBoxList.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/CheckBoxList.cs
@@ -94,8 +94,13 @@ namespace System.Web.UI.WebControls
                public virtual RepeatLayout RepeatLayout {
                        get { return (RepeatLayout) ViewState.GetInt ("RepeatLayout", (int) RepeatLayout.Table); }
                        set {
-                               if (value < RepeatLayout.Table ||
-                                               value > RepeatLayout.Flow)
+                               bool outOfRange;
+#if NET_4_0
+                               outOfRange = value < RepeatLayout.Table || value > RepeatLayout.OrderedList;
+#else
+                               outOfRange = value < RepeatLayout.Table || value > RepeatLayout.Flow;
+#endif
+                               if (outOfRange)
                                        throw new ArgumentOutOfRangeException ("value");
                                ViewState ["RepeatLayout"] = value;
                        }