diff options
| author | Carlos Alberto Cortez <calberto.cortez@gmail.com> | 2010-01-21 02:47:44 +0300 |
|---|---|---|
| committer | Carlos Alberto Cortez <calberto.cortez@gmail.com> | 2010-01-21 02:47:44 +0300 |
| commit | d3a9c0768f1158275286c245f1b428220ecc80bf (patch) | |
| tree | 86683c9a5c6a97ae947c1642f2c013a5718efd23 /mcs | |
| parent | c1139cd2055032f0a94175fc34b3b09a810f8036 (diff) | |
* ComboBox.cs: When the normal drop down window is closed, make sure
that the auto complete list -if any- is closed as well, instead of
stay open without need.
2010-01-20 Carlos Alberto Cortez <calberto.cortez@gmail.com>
svn path=/trunk/mcs/; revision=149942
Diffstat (limited to 'mcs')
| -rw-r--r-- | mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog | 6 | ||||
| -rw-r--r-- | mcs/class/Managed.Windows.Forms/System.Windows.Forms/ComboBox.cs | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog index b0cddd6d9f7..4b050bb87f1 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog @@ -1,5 +1,11 @@ 2010-01-20 Carlos Alberto Cortez <calberto.cortez@gmail.com> + * ComboBox.cs: When the normal drop down window is closed, make sure + that the auto complete list -if any- is closed as well, instead of + stay open without need. + +2010-01-20 Carlos Alberto Cortez <calberto.cortez@gmail.com> + * TextBox.cs: When showing the autocomplete listbox, make sure it's on top, by calling the raw XplatUI.SetZOrder for it, since we can't properly call BringToFront on it as it is parentless. This fixes an diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ComboBox.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ComboBox.cs index 8bdcce0b696..8da7cf3a0ac 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ComboBox.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ComboBox.cs @@ -1598,6 +1598,12 @@ namespace System.Windows.Forms listbox_ctrl.Dispose (); listbox_ctrl = null; } +#if NET_2_0 + // The auto complete list could have been shown after the listbox, + // so make sure it's hidden. + if (textbox_ctrl != null) + textbox_ctrl.HideAutoCompleteList (); +#endif } private int FindStringCaseInsensitive (string search) |