Author: toshok
Date: 2006-09-11 21:37:21 -0400 (Mon, 11 Sep 2006)
New Revision: 65269

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGrid.cs
Log:
        * DataGrid.cs (set_DataSource): make this work for both the
        winforms/datagrid test and ReportBuilder.  It seems as though when
        we've created a ListManager (or maybe it's if we have a
        BindingContext?), when we set the DataSource it clears the
        DataMember to "".  otherwise we reuse the datamember.  Fixes bug
        #79333.

2006-09-11  Chris Toshok  <[EMAIL PROTECTED]>



Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2006-09-12 01:29:33 UTC (rev 65268)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2006-09-12 01:37:21 UTC (rev 65269)
@@ -1,5 +1,14 @@
 2006-09-11  Chris Toshok  <[EMAIL PROTECTED]>
 
+       * DataGrid.cs (set_DataSource): make this work for both the
+       winforms/datagrid test and ReportBuilder.  It seems as though when
+       we've created a ListManager (or maybe it's if we have a
+       BindingContext?), when we set the DataSource it clears the
+       DataMember to "".  otherwise we reuse the datamember.  Fixes bug
+       #79333.
+
+2006-09-11  Chris Toshok  <[EMAIL PROTECTED]>
+
        * XplatUIX11.cs: deal with queue being null, which happens in all
        the Clipboard functions.  Fixes one of the two problems mentioned
        in #78612.

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGrid.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGrid.cs      
2006-09-12 01:29:33 UTC (rev 65268)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGrid.cs      
2006-09-12 01:37:21 UTC (rev 65269)
@@ -546,7 +546,7 @@
                public object DataSource {
                        get { return datasource; }
                        set {
-                               SetDataSource (value, string.Empty);
+                               SetDataSource (value, ListManager == null ? 
datamember : string.Empty);
                        }
                }
 

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to