this one should really work

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

4 files changed, 27 insertions, 69 deletions

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ColumnHeader.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ColumnHeader.cs
index a9eedeb407b..16728e8d8cc 100644
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ColumnHeader.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ColumnHeader.cs
@@ -179,7 +179,7 @@ namespace System.Windows.Forms
 		#endregion // Public Instance Properties
 
 		#region Public Methods
-		object ICloneable.Clone ()
+		public object Clone ()
 		{
 			ColumnHeader columnHeader = new ColumnHeader ();
 			columnHeader.text = text;
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs
index d2bb16d19a9..90e6611717e 100644
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs
@@ -1963,11 +1963,11 @@ namespace System.Windows.Forms
 
 			#region Public Properties
 			[Browsable (false)]
-			int ICollection.Count {
+			public int Count {
 				get { return list.Count; }
 			}
 
-			bool IList.IsReadOnly {
+			public bool IsReadOnly {
 				get { return true; }
 			}
 
@@ -2008,7 +2008,7 @@ namespace System.Windows.Forms
 				list.CopyTo (dest, index);
 			}
 
-			IEnumerator IEnumerable.GetEnumerator ()
+			public IEnumerator GetEnumerator ()
 			{
 				return list.GetEnumerator ();
 			}
@@ -2071,15 +2071,11 @@ namespace System.Windows.Forms
 
 			#region Public Properties
 			[Browsable (false)]
-			int ICollection.Count {
+			public int Count {
 				get { return list.Count; }
 			}
 
-			internal int Count {
-				get { return list.Count; }
-			}
-
-			bool IList.IsReadOnly {
+			public bool IsReadOnly {
 				get { return false; }
 			}
 
@@ -2147,12 +2143,12 @@ namespace System.Windows.Forms
 				return list.Contains (value);
 			}
 
-			IEnumerator IEnumerable.GetEnumerator ()
+			public IEnumerator GetEnumerator ()
 			{
 				return list.GetEnumerator ();
 			}
 
-			void ICollection.CopyTo (Array dest, int index)
+			public void CopyTo (Array dest, int index)
 			{
 				list.CopyTo (dest, index);
 			}
@@ -2261,15 +2257,11 @@ namespace System.Windows.Forms
 
 			#region Public Properties
 			[Browsable (false)]
-			int ICollection.Count {
-				get { return list.Count; }
-			}
-
-			internal int Count {
+			public int Count {
 				get { return list.Count; }
 			}
 
-			bool IList.IsReadOnly {
+			public bool IsReadOnly {
 				get { return false; }
 			}
 
@@ -2387,7 +2379,7 @@ namespace System.Windows.Forms
 				list.CopyTo (dest, index);
 			}
 
-			IEnumerator IEnumerable.GetEnumerator ()
+			public IEnumerator GetEnumerator ()
 			{
 				return list.GetEnumerator ();
 			}
@@ -2510,15 +2502,11 @@ namespace System.Windows.Forms
 
 			#region Public Properties
 			[Browsable (false)]
-			int ICollection.Count {
+			public int Count {
 				get { return list.Count; }
 			}
 
-			internal int Count {
-				get { return list.Count; }
-			}
-
-			bool IList.IsReadOnly {
+			public bool IsReadOnly {
 				get { return true; }
 			}
 
@@ -2554,12 +2542,12 @@ namespace System.Windows.Forms
 				return list.Contains (selectedIndex);
 			}
 
-			void ICollection.CopyTo (Array dest, int index)
+			public void CopyTo (Array dest, int index)
 			{
 				list.CopyTo (dest, index);
 			}
 
-			IEnumerator IEnumerable.GetEnumerator ()
+			public IEnumerator GetEnumerator ()
 			{
 				return list.GetEnumerator ();
 			}
@@ -2622,15 +2610,11 @@ namespace System.Windows.Forms
 
 			#region Public Properties
 			[Browsable (false)]
-			int ICollection.Count {
-				get { return list.Count; }
-			}
-
-			internal int Count {
+			public int Count {
 				get { return list.Count; }
 			}
 
-			bool IList.IsReadOnly {
+			public bool IsReadOnly {
 				get { return true; }
 			}
 
@@ -2661,12 +2645,7 @@ namespace System.Windows.Forms
 			#endregion	// Public Properties
 
 			#region Public Methods
-			void IList.Clear ()
-			{
-				Clear ();
-			}
-
-			internal void Clear ()
+			public void Clear ()
 			{
 				ArrayList copy = (ArrayList) list.Clone ();
 				for (int i = 0; i < copy.Count; i++)
@@ -2674,17 +2653,18 @@ namespace System.Windows.Forms
 
 				list.Clear ();
 			}
+
 			public bool Contains (ListViewItem item)
 			{
 				return list.Contains (item);
 			}
 
-			void ICollection.CopyTo (Array dest, int index)
+			public void CopyTo (Array dest, int index)
 			{
 				list.CopyTo (dest, index);
 			}
 
-			IEnumerator IEnumerable.GetEnumerator ()
+			public IEnumerator GetEnumerator ()
 			{
 				return list.GetEnumerator ();
 			}
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListViewItem.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListViewItem.cs
index 14f537f0b90..5aba387690e 100644
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListViewItem.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListViewItem.cs
@@ -731,15 +731,11 @@ namespace System.Windows.Forms
 
 			#region Public Properties
 			[Browsable (false)]
-			int ICollection.Count {
+			public int Count {
 				get { return list.Count; }
 			}
 
-			internal int Count {
-				get { return list.Count; }
-			}
-
-			bool IList.IsReadOnly {
+			public bool IsReadOnly {
 				get { return false; }
 			}
 
@@ -819,7 +815,7 @@ namespace System.Windows.Forms
 					this.Add (item, foreColor, backColor, font);
 			}
 
-			void IList.Clear ()
+			public void Clear ()
 			{
 				list.Clear ();
 			}
@@ -829,7 +825,7 @@ namespace System.Windows.Forms
 				return list.Contains (item);
 			}
 
-			IEnumerator IEnumerable.GetEnumerator ()
+			public IEnumerator GetEnumerator ()
 			{
 				return list.GetEnumerator ();
 			}
@@ -902,7 +898,7 @@ namespace System.Windows.Forms
 				list.Remove (item);
 			}
 
-			void IList.RemoveAt (int index)
+			public void RemoveAt (int index)
 			{
 				list.RemoveAt (index);
 			}
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Menu.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Menu.cs
index 154df8c2120..cb6b6b6e841 100644
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Menu.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Menu.cs
@@ -284,16 +284,8 @@ namespace System.Windows.Forms
 
 			#region Public Properties
 
-			int ICollection.Count {
-				get { return items.Count;}
-			}
-
 			public int Count {
-				get { return items.Count; }
-			}
-
-			bool IList.IsReadOnly {
-				get { return false;}
+				get { return items.Count;}
 			}
 
 			public bool IsReadOnly {
@@ -444,21 +436,11 @@ namespace System.Windows.Forms
 				return items.Contains (value);
 			}
 
-			void ICollection.CopyTo (Array dest, int index)
-			{
-				items.CopyTo (dest, index);
-			}
-
 			public void CopyTo (Array dest, int index)
 			{
 				items.CopyTo (dest, index);
 			}
 
-			IEnumerator IEnumerable.GetEnumerator ()
-			{
-				return items.GetEnumerator ();
-			}
-
 			public IEnumerator GetEnumerator ()
 			{
 				return items.GetEnumerator ();