2005-11-30 Sebastien Pouliot <sebastien@ximian.com>

	* KeyedList.cs: Fixed for IOrderedDictionary change in 2.0 final.
	Now internal.
	* KeyedListEnumerator.cs: Now internal.

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

diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog
index 8daa06c31377b9336059537252472df4cf3f8ee3..f1b10b898f60496713b870685553a2c316adb50d 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-30  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * KeyedList.cs: Fixed for IOrderedDictionary change in 2.0 final.
+       Now internal.
+       * KeyedListEnumerator.cs: Now internal.
+
 2005-11-29 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * ControlCollection.cs: allow 'null' in Remove.

diff --git a/mcs/class/System.Web/System.Web.UI/KeyedList.cs b/mcs/class/System.Web/System.Web.UI/KeyedList.cs
index f6b5fa2ecfb639dd95355baf28ec2ec10d0b5562..a67c11daf9dc4760385e92647557f2ea07f3d264 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/KeyedList.cs
+++ b/mcs/class/System.Web/System.Web.UI/KeyedList.cs
@@ -34,7 +34,7 @@ using System.Collections.Specialized;
 namespace System.Web.UI
 {
 
-       public class KeyedList : IOrderedDictionary, IStateManager
+       internal class KeyedList : IOrderedDictionary, IStateManager
        {
 
                private Hashtable objectTable = new Hashtable ();
@@ -93,6 +93,11 @@ namespace System.Web.UI
                        return new KeyedListEnumerator (objectList);
                }
 
+               IDictionaryEnumerator IOrderedDictionary.GetEnumerator ()
+               {
+                       return new KeyedListEnumerator (objectList);
+               }
+
                IEnumerator IEnumerable.GetEnumerator ()
                {
                        return new KeyedListEnumerator (objectList);

diff --git a/mcs/class/System.Web/System.Web.UI/KeyedListEnumerator.cs b/mcs/class/System.Web/System.Web.UI/KeyedListEnumerator.cs
index 8abe067aadc678829cf6653f59a40d8b3abc7bdb..3a28e6341a3785b80fa03e1a7fccd73db8b9b432 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/KeyedListEnumerator.cs
+++ b/mcs/class/System.Web/System.Web.UI/KeyedListEnumerator.cs
@@ -32,7 +32,7 @@ using System.Collections;
 
 namespace System.Web.UI
 {
-       public class KeyedListEnumerator : IDictionaryEnumerator
+       internal class KeyedListEnumerator : IDictionaryEnumerator
        {
                private int index = -1;
                private ArrayList objs;