Author: toshok
Date: 2006-10-30 16:33:42 -0500 (Mon, 30 Oct 2006)
New Revision: 67151
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGrid.cs
Log:
2006-10-30 Chris Toshok <[EMAIL PROTECTED]>
* DataGrid.cs (set_DataSource, set_DataMember): if we have a
BindingContext, set the data source directly, otherwise do the
lazy approach - the actual ListManager will be created when we get
a BindingContext. Fixes bug #79700.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-10-30 21:01:02 UTC (rev 67150)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-10-30 21:33:42 UTC (rev 67151)
@@ -1,3 +1,10 @@
+2006-10-30 Chris Toshok <[EMAIL PROTECTED]>
+
+ * DataGrid.cs (set_DataSource, set_DataMember): if we have a
+ BindingContext, set the data source directly, otherwise do the
+ lazy approach - the actual ListManager will be created when we get
+ a BindingContext. Fixes bug #79700.
+
2006-10-30 Jonathan Pobst <[EMAIL PROTECTED]>
* XplatUI.cs, XplatUIDriver.cs, XplatUIWin32.cs, XplatUIOSX.cs,
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGrid.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGrid.cs
2006-10-30 21:01:02 UTC (rev 67150)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGrid.cs
2006-10-30 21:33:42 UTC (rev 67151)
@@ -565,9 +565,14 @@
public string DataMember {
get { return datamember; }
set {
- if (list_manager != null)
- list_manager = null;
- datamember = value;
+ if (BindingContext != null) {
+ SetDataSource (datasource, value);
+ }
+ else {
+ if (list_manager != null)
+ list_manager = null;
+ datamember = value;
+ }
}
}
@@ -577,10 +582,17 @@
public object DataSource {
get { return datasource; }
set {
- if (list_manager != null)
- list_manager = null;
- datasource = value;
- datamember = string.Empty;
+ if (BindingContext != null) {
+ SetDataSource (value, ListManager ==
null ? datamember : string.Empty);
+ }
+ else {
+ datasource = value;
+ if (list_manager != null)
+ datamember = string.Empty;
+
+ if (list_manager != null)
+ list_manager = null;
+ }
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches