2005-02-02 Atsushi Enomoto <atsushi@ximian.com>

	* DataView.cs : ColumnCollectionChanged() is the event invoker (i.e.
	  when overriden, no column change events are fired).


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

2 files changed, 8 insertions, 8 deletions

diff --git a/mcs/class/System.Data/System.Data/ChangeLog b/mcs/class/System.Data/System.Data/ChangeLog
index b0a44c7c781..8b62e283446 100644
--- a/mcs/class/System.Data/System.Data/ChangeLog
+++ b/mcs/class/System.Data/System.Data/ChangeLog
@@ -1,5 +1,10 @@
 2005-02-02  Atsushi Enomoto  <atsushi@ximian.com>
 
+	* DataView.cs : ColumnCollectionChanged() is the event invoker (i.e.
+	  when overriden, no column change events are fired).
+
+2005-02-02  Atsushi Enomoto  <atsushi@ximian.com>
+
 	* DataView.cs : CancelEditRowView() and DeleteRowView() was incorrectly
 	  checking target tables. They also should raise events if required.
 
diff --git a/mcs/class/System.Data/System.Data/DataView.cs b/mcs/class/System.Data/System.Data/DataView.cs
index 21945165718..45764fec4f9 100644
--- a/mcs/class/System.Data/System.Data/DataView.cs
+++ b/mcs/class/System.Data/System.Data/DataView.cs
@@ -505,11 +505,6 @@ namespace System.Data
 			isOpen = false;
 		}
 
-		protected virtual void ColumnCollectionChanged (
-			object sender, CollectionChangeEventArgs e)
-		{
-		}
-
 		protected override void Dispose (bool disposing)
 		{
 			if (disposing)
@@ -569,7 +564,7 @@ namespace System.Data
 			dataTable.RowChanged     += new DataRowChangeEventHandler(OnRowChanged);
 			dataTable.RowDeleting    += new DataRowChangeEventHandler(OnRowDeleting);
 			dataTable.RowDeleted     += new DataRowChangeEventHandler(OnRowDeleted);
-			dataTable.Columns.CollectionChanged += new CollectionChangeEventHandler(OnColumnCollectionChanged);
+			dataTable.Columns.CollectionChanged += new CollectionChangeEventHandler(ColumnCollectionChanged);
 			dataTable.Constraints.CollectionChanged += new CollectionChangeEventHandler(OnConstraintCollectionChanged);
 		}
 
@@ -580,7 +575,7 @@ namespace System.Data
 			dataTable.RowChanged     -= new DataRowChangeEventHandler(OnRowChanged);
 			dataTable.RowDeleting    -= new DataRowChangeEventHandler(OnRowDeleting);
 			dataTable.RowDeleted     -= new DataRowChangeEventHandler(OnRowDeleted);
-			dataTable.Columns.CollectionChanged -= new CollectionChangeEventHandler(OnColumnCollectionChanged);
+			dataTable.Columns.CollectionChanged -= new CollectionChangeEventHandler(ColumnCollectionChanged);
 			dataTable.Constraints.CollectionChanged -= new CollectionChangeEventHandler(OnConstraintCollectionChanged);
 		}
 
@@ -666,7 +661,7 @@ namespace System.Data
 			OnListChanged (new ListChangedEventArgs (ListChangedType.ItemDeleted, deletedIndex, -1));
 		}
 		
-		private void OnColumnCollectionChanged (object sender, CollectionChangeEventArgs args)
+		protected virtual void ColumnCollectionChanged (object sender, CollectionChangeEventArgs args)
 		{
 			// UpdateIndex() is not invoked here (even if the sort
 			// column is being removed).