2003-01-07 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* DataList.cs: fixed IRepeatInfoUser.GetItemStyle.

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

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
index a55e3450bcf89c012ae1421956236f150a346850..9bf9e1c3f584a7e7b48b21f15a6979f30e70e5b3 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,7 @@
+2003-01-07  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * DataList.cs: fixed IRepeatInfoUser.GetItemStyle.
+
 2002-12-17  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * BaseValidator.cs: return an empty string in GetControlValidationValue

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs
index 704284350899e210bda3d81e54ca79f52d1b9af2..2a69a90f7825df3750695258db6e8c59ef750e94 100755 (executable)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs
@@ -868,10 +868,11 @@ namespace System.Web.UI.WebControls
 
                Style IRepeatInfoUser.GetItemStyle (ListItemType itemType, int repeatIndex)
                {
-                       if (ControlStyleCreated && GetItem (itemType, repeatIndex) != null)
-                               return ControlStyle;
+                       DataListItem item = GetItem (itemType, repeatIndex);
+                       if (item == null || !item.ControlStyleCreated)
+                               return null;
 
-                       return null;
+                       return item.ControlStyle;
                }
        }
 }