2008-12-08 Atsushi Enomoto <atsushi@ximian.com>

[mono.git] / mcs / class / Managed.Windows.Forms / System.Windows.Forms / PropertyManager.cs

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyManager.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyManager.cs
index c92df20e2fa2343829190b26b6ffadfb7ca17fa7..fdd6297cfdfead5232a728f8c6818a79dc2b29ce 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyManager.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyManager.cs
@@ -30,7 +30,7 @@ namespace System.Windows.Forms {
 
        public class PropertyManager : BindingManagerBase {
 
-               private string property_name;
+               internal string property_name;
                private PropertyDescriptor prop_desc;
                private object data_source;
                private EventDescriptor changed_event;
@@ -115,12 +115,20 @@ namespace System.Windows.Forms {
                        editable.EndEdit ();
                }
 
+#if NET_2_0
+               // Hide this method from the 2.0 public API
+               internal override PropertyDescriptorCollection GetItemPropertiesInternal ()
+               {
+                       return TypeDescriptor.GetProperties (data_source);
+               }
+#else
                public override PropertyDescriptorCollection GetItemProperties ()
                {
                        return TypeDescriptor.GetProperties (data_source);
                }
+#endif
 
-               public override void RemoveAt (int idx)
+               public override void RemoveAt (int index)
                {
                        throw new NotSupportedException ("RemoveAt is not supported for property to property binding");
                }
@@ -137,7 +145,7 @@ namespace System.Windows.Forms {
                         get { return data_source == null; }
                 }
 
-               protected internal override string GetListName (ArrayList list)
+               protected internal override string GetListName (ArrayList listAccessors)
                {
                        return String.Empty;
                }
@@ -147,19 +155,21 @@ namespace System.Windows.Forms {
                {
                }
 
-               protected internal override void OnCurrentChanged (EventArgs e)
+               protected internal override void OnCurrentChanged (EventArgs ea)
                {
                        PushData ();
 
                        if (onCurrentChangedHandler != null) {
-                               onCurrentChangedHandler (this, e);
+                               onCurrentChangedHandler (this, ea);
                        }
                }
 
-               private void PropertyChangedHandler (object sender, EventArgs e)
+#if NET_2_0
+               protected override void OnCurrentItemChanged (EventArgs ea)
                {
-                       OnCurrentChanged (EventArgs.Empty);
+                       throw new NotImplementedException ();
                }
+#endif
        }
 }