also, disable the call do BindColumns in

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/KeysConverter.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/KeysConverter.cs
index 967662bfe87b42d89cba4a6d5370b17ec326ffd1..0c91047565202584c4fc3a599d77e9792011cf18 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/KeysConverter.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/KeysConverter.cs
@@ -69,7 +69,10 @@ namespace System.Windows.Forms {
                                                }
                                        }
                                }
-                               key |= (Keys)Enum.Parse(typeof(Keys), keys[keys.Length - 1], true);
+                               if (keys [keys.Length - 1].Equals ("Ctrl"))
+                                       key |= Keys.Control;
+                               else
+                                       key |= (Keys)Enum.Parse(typeof(Keys), keys[keys.Length - 1], true);
                                return key;
                        }
                        return base.ConvertFrom (context, culture, value);
@@ -104,23 +107,23 @@ namespace System.Windows.Forms {
                        return base.ConvertTo (context, culture, value, destinationType);
                }
 
-               public override TypeConverter.StandardValuesCollection GetStandardValues(ITypeDescriptorContext context) {\r
+               public override TypeConverter.StandardValuesCollection GetStandardValues(ITypeDescriptorContext context) {
                        string [] stdVal = new string [] {
                                "Alt", "Back", "Control", "Delete", "End", "Enter", "F1", "F10", "F11", "F12", "F2",
                                "F3", "F4", "F5", "F6", "F7", "F8", "F9", "Home", "Insert", "Next", "Prior", "Shift"};
 
                        return new TypeConverter.StandardValuesCollection (stdVal);
-               }\r
-\r
-               public override bool GetStandardValuesExclusive(ITypeDescriptorContext context) {\r
-                       \r
-                       return false;\r
-               }\r
-\r
-               public override bool GetStandardValuesSupported(ITypeDescriptorContext context) {\r
-                       return true;\r
-               }\r
-\r
+               }
+
+               public override bool GetStandardValuesExclusive(ITypeDescriptorContext context) {
+                       
+                       return false;
+               }
+
+               public override bool GetStandardValuesSupported(ITypeDescriptorContext context) {
+                       return true;
+               }
+
                #endregion      // Public Instance Methods
        }
 }