Author: jackson
Date: 2005-04-01 14:03:51 -0500 (Fri, 01 Apr 2005)
New Revision: 42474
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Binding.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
Log:
* Binding.cs: Had some IsAssignableFrom calls backwards.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Binding.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Binding.cs
2005-04-01 18:36:22 UTC (rev 42473)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Binding.cs
2005-04-01 19:03:51 UTC (rev 42474)
@@ -230,7 +230,7 @@
ConvertEventArgs e = new ConvertEventArgs (data,
data_type);
OnParse (e);
- if (e.Value.GetType ().IsAssignableFrom (data_type))
+ if (data_type.IsAssignableFrom (e.Value.GetType ()))
return e.Value;
if (e.Value == Convert.DBNull)
return e.Value;
@@ -246,7 +246,7 @@
ConvertEventArgs e = new ConvertEventArgs (data,
data_type);
OnFormat (e);
- if (e.Value.GetType ().IsAssignableFrom (data_type))
+ if (data_type.IsAssignableFrom (e.Value.GetType ()))
return e.Value;
return ConvertData (data, data_type);
@@ -260,7 +260,7 @@
if (data is IConvertible) {
object res = Convert.ChangeType (data,
data_type);
- if (res.GetType ().IsAssignableFrom (data_type))
+ if (data_type.IsAssignableFrom (res.GetType ()))
return res;
}
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2005-04-01 18:36:22 UTC (rev 42473)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2005-04-01 19:03:51 UTC (rev 42474)
@@ -1,5 +1,9 @@
2005-04-01 Jackson Harper <[EMAIL PROTECTED]>
+ * Binding.cs: Had some IsAssignableFrom calls backwards.
+
+2005-04-01 Jackson Harper <[EMAIL PROTECTED]>
+
* Binding.cs: Handle null data members when pulling data.
* PropertyManager.cs: Handle the data member being a property that
does not exist.
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
