* ComboBox.cs: Pass off focus to the text control properly

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 5a4343f44c6f7ddb22d1c2bf8b83743a4a9347d4..0ea13bd29dc5aad252bb4e59c6ac65fd6ad043c4 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -7,6 +7,7 @@
        controls to "override" OnGotFocus and change focus behavior if
        needed.
        - Same thing for LostFocus
+       * ComboBox.cs: Pass off focus to the text control properly.
 
 2006-07-12  Alexander Olk  <alex.olk@googlemail.com>
 

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 33f16b59705f1e468bb08bfbd95881f6338571e2..961f62d4996160badf37da4f76fa1684725d79f0 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ComboBox.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ComboBox.cs
@@ -730,14 +730,14 @@ namespace System.Windows.Forms
 
                [EditorBrowsable(EditorBrowsableState.Advanced)]                
                protected override void OnGotFocus (EventArgs e) {                      
-                       has_focus = true;
                        Invalidate ();
+                       textbox_ctrl.Focus ();
+                       base.OnGotFocus (e);
                }
 
                [EditorBrowsable(EditorBrowsableState.Advanced)]                
                protected override void OnLostFocus (EventArgs e) {                     
-                       has_focus = false;
-                       Invalidate ();
+                       base.OnLostFocus (e);
                }               
 
                protected override void OnHandleCreated (EventArgs e)