diff options
| -rw-r--r-- | mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog | 4 | ||||
| -rw-r--r-- | mcs/class/Managed.Windows.Forms/System.Windows.Forms/ComboBox.cs | 6 |
2 files changed, 10 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 ed865fcac29..7294014eebd 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog @@ -1,3 +1,7 @@ +2007-10-17 Geoff Norton <gnorton@novell.com> + + * ComboBox.cs: Destroy the popup after hiding it. Fixes #322582 + 2007-10-16 Gert Driesen <drieseng@users.sourceforge.net> * ButtonBase.cs: Fixed IsDefault to use assigned value instead of 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 8a6cbb21432..dc6d1570e1d 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ComboBox.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ComboBox.cs @@ -1511,6 +1511,12 @@ namespace System.Windows.Forms #if NET_2_0 OnDropDownClosed (EventArgs.Empty); #endif + /* + * Apples X11 looses override-redirect when doing a Unmap/Map on a previously mapped window + * this causes the popup to appear under the main form. This is horrible but necessary + */ + listbox_ctrl.Dispose (); + listbox_ctrl = null; } private int FindStringCaseInsensitive (string search) |