* roottypes.cs: Rename from tree.cs.

[mono.git] / mcs / class / System.Web / System.Web.UI.WebControls / DataList.cs

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 f331754f566bef2e90f0b2c6771dfc356b008e77..39aa0b005f2d436b440fc2e318013697da4e71ae 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs
@@ -538,6 +538,11 @@ namespace System.Web.UI.WebControls {
 
                        if (useDataSource) {
                                idx = 0;
+#if NET_2_0
+                               if (IsBoundUsingDataSourceID)
+                                       ds = GetData();
+                               else
+#endif
                                ds = DataSourceResolver.ResolveDataSource (DataSource, DataMember);
                                keys = DataKeysArray;
                                keys.Clear ();
@@ -627,10 +632,10 @@ namespace System.Web.UI.WebControls {
                        case ListItemType.SelectedItem:
                        case ListItemType.EditItem:
                                int index = item.ItemIndex;
-                               if ((SelectedIndex == index) && (SelectedItemTemplate != null))
-                                       t = SelectedItemTemplate;
-                               else if ((EditItemIndex == index) && (EditItemTemplate != null))
+                               if ((EditItemIndex == index) && (EditItemTemplate != null))
                                        t = EditItemTemplate;
+                               else if ((SelectedIndex == index) && (SelectedItemTemplate != null))
+                                       t = SelectedItemTemplate;
                                else if (((index & 1) == 0) || (alternatingItemTemplate == null))
                                        t = ItemTemplate;
                                else
@@ -645,7 +650,11 @@ namespace System.Web.UI.WebControls {
                protected override void LoadViewState (object savedState)
                {
                        object[] state = (object[]) savedState;
+#if NET_2_0
+                       base.LoadViewState (state [8]);
+#else
                        base.LoadViewState (state [0]);
+#endif
                        if (state [1] != null)
                                ItemStyle.LoadViewState (state [1]);
                        if (state [2] != null)