Use context information passed to editor.

svn path=/trunk/mcs/; revision=46341

diff --git a/mcs/class/System.Design/System.Windows.Forms.Design/ChangeLog b/mcs/class/System.Design/System.Windows.Forms.Design/ChangeLog
index b355919d28934e1fd2489b30dfd939a75739cadc..714bf5261fb9d833aa624343e763a774ca198098 100644 (file)
--- a/mcs/class/System.Design/System.Windows.Forms.Design/ChangeLog
+++ b/mcs/class/System.Design/System.Windows.Forms.Design/ChangeLog
@@ -1,3 +1,6 @@
+2005-06-21  Jonathan Chambers <jonathan.chambers@ansys.com>
+       * DockEditor.cs: Use context information 
+
 2005-06-18  Jonathan Chambers <jonathan.chambers@ansys.com>
        * DockEditor.cs: Implemented class
 

diff --git a/mcs/class/System.Design/System.Windows.Forms.Design/DockEditor.cs b/mcs/class/System.Design/System.Windows.Forms.Design/DockEditor.cs
index 706660fb4b07ab8cb754e00edc76786be1923372..19300df25d956077b4daedc6fd10cbbe1f623297 100644 (file)
--- a/mcs/class/System.Design/System.Windows.Forms.Design/DockEditor.cs
+++ b/mcs/class/System.Design/System.Windows.Forms.Design/DockEditor.cs
@@ -42,14 +42,14 @@ namespace System.Windows.Forms.Design
                [MonoTODO]
                public override object EditValue (ITypeDescriptorContext context, IServiceProvider provider, object value)
                {
-                       if (/*context != null && */provider != null)
+                       if (context != null && provider != null)
                        {
                                IWindowsFormsEditorService editorService = (IWindowsFormsEditorService)provider.GetService(typeof(IWindowsFormsEditorService));
                                if (editorService != null)
                                {
                                        // Create the UI editor control
                                        DockEditorControl dockEditorControl = new DockEditorControl(editorService); 
-                                       //dockEditorControl.DockStyle = (DockStyle)context.Instance;
+                                       dockEditorControl.DockStyle = (DockStyle)context.Instance;
                                        editorService.DropDownControl(dockEditorControl);
 
                                        return dockEditorControl.DockStyle;