Author: jackson
Date: 2005-03-07 16:05:24 -0500 (Mon, 07 Mar 2005)
New Revision: 41539

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Binding.cs
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/CurrencyManager.cs
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyManager.cs
Log:
        * Binding.cs: Format and parse data correctly. Use ASsignableFrom
        instead of IsSubclassOf. Pulling data now sets the value on the
        control.
        * PropertyManager.cs:
        * CurrencyManager.cs: Just need to pull data when updating now,
        because PullData will set the value on the control.



Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Binding.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Binding.cs       
2005-03-07 20:53:33 UTC (rev 41538)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Binding.cs       
2005-03-07 21:05:24 UTC (rev 41539)
@@ -146,12 +146,11 @@
                        is_null_desc = TypeDescriptor.GetProperties 
(manager.Current).Find (property_name + "IsNull", false);
 
                        PullData ();
-                       PushData ();
                }
 
                internal void PushData ()
                {
-                       prop_desc.SetValue (control, data);
+                       SetControlValue (data);
                }
 
                internal void PullData ()
@@ -166,7 +165,10 @@
 
                        PropertyDescriptor pd = TypeDescriptor.GetProperties 
(manager.Current).Find (data_member, true);
                        object pulled = pd.GetValue (manager.Current);
-                       data = ParseData (pulled);
+                       data = ParseData (pulled, pd.PropertyType);
+
+                       data = FormatData (data);
+                       SetControlValue (data);
                }
 
                internal void UpdateIsBinding ()
@@ -174,6 +176,11 @@
                        PushData ();
                }
 
+               private void SetControlValue (object data)
+               {
+                       prop_desc.SetValue (control, data);
+               }
+
                private void CurrentChangedHandler ()
                {
                        if (changed_event != null) {
@@ -196,7 +203,6 @@
                private void PropertyValueChanged (object sender, EventArgs e)
                {
                        PullData ();
-                       PushData ();
                }
 
                private void ControlValidatingHandler (object sender, 
CancelEventArgs e)
@@ -204,24 +210,42 @@
                        PullData ();
                }
 
-                // TODO: Are there more ways the data can be converted?
-               private object ParseData (object data)
+               private object ParseData (object data, Type data_type)
                {
                        ConvertEventArgs e = new ConvertEventArgs (data, 
data_type);
 
                        OnParse (e);
-                       if (e.Value.GetType ().IsSubclassOf (data_type))
+                       if (e.Value.GetType ().IsAssignableFrom (data_type))
                                return e.Value;
                        if (e.Value == Convert.DBNull)
                                return e.Value;
 
+                       return ConvertData (e.Value, data_type);
+               }
+
+               private object FormatData (object data)
+               {
+                       if (data_type == typeof (object)) 
+                               return data;
+
+                       ConvertEventArgs e = new ConvertEventArgs (data, 
data_type);
+
+                       OnFormat (e);
+                       if (e.Value.GetType ().IsAssignableFrom (data_type))
+                               return e.Value;
+
+                       return ConvertData (data, data_type);
+               }
+
+               private object ConvertData (object data, Type data_type)
+               {
                        TypeConverter converter = TypeDescriptor.GetConverter 
(data.GetType ());
                        if (converter != null && converter.CanConvertTo 
(data_type))
                                return converter.ConvertTo (data, data_type);
 
                        if (data is IConvertible) {
                                object res = Convert.ChangeType (data, 
data_type);
-                               if (res.GetType ().IsSubclassOf (data_type))
+                               if (res.GetType ().IsAssignableFrom (data_type))
                                        return res;
                        }
 

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2005-03-07 20:53:33 UTC (rev 41538)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2005-03-07 21:05:24 UTC (rev 41539)
@@ -1,3 +1,12 @@
+2005-03-07  Jackson Harper  <[EMAIL PROTECTED]>
+
+       * Binding.cs: Format and parse data correctly. Use ASsignableFrom
+       instead of IsSubclassOf. Pulling data now sets the value on the
+       control.
+       * PropertyManager.cs:
+       * CurrencyManager.cs: Just need to pull data when updating now,
+       because PullData will set the value on the control.
+
 2005-03-04  Jackson Harper  <[EMAIL PROTECTED]>
 
        * Binding.cs: Implement data type parsing and converting on pulled

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/CurrencyManager.cs
===================================================================
--- 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/CurrencyManager.cs   
    2005-03-07 20:53:33 UTC (rev 41538)
+++ 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/CurrencyManager.cs   
    2005-03-07 21:05:24 UTC (rev 41539)
@@ -135,7 +135,7 @@
 
                protected internal override void OnCurrentChanged (EventArgs e)
                {
-                       UpdateBindings ();
+                       PullData ();
 
                        if (onCurrentChangedHandler != null) {
                                onCurrentChangedHandler (this, e);

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyManager.cs
===================================================================
--- 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyManager.cs   
    2005-03-07 20:53:33 UTC (rev 41538)
+++ 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyManager.cs   
    2005-03-07 21:05:24 UTC (rev 41539)
@@ -117,7 +117,7 @@
 
                protected internal override void OnCurrentChanged (EventArgs e)
                {
-                       UpdateBindings ();
+                       PullData ();
 
                        if (onCurrentChangedHandler != null) {
                                onCurrentChangedHandler (this, e);

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

Reply via email to