2008-05-22 Atsushi Enomoto <atsushi@ximian.com>

        * XplatUIX11.cs : when we call WM_SETFOCUS, call X11Keyboard
          FocusIn() too. This should fix the issue on switching
          scim keyboards.

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 936ef9ac9b0ad7e74f401caef1b9ae04c2cff3fa..fb97939cf193543f439e28867834742217160909 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-22  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * XplatUIX11.cs : when we call WM_SETFOCUS, call X11Keyboard
+         FocusIn() too. This should fix the issue on switching
+         scim keyboards.
+
 2008-05-22  Atsushi Enomoto  <atsushi@ximian.com>
 
        * X11Keyboard.cs : set XIM font size to somewhat reasonable

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
index 3dda25102e76fccf09f0d66cf315044015cd451e..928df0e1ef7b68964b8e23e6e625a71caf035fab 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
@@ -4163,6 +4163,7 @@ namespace System.Windows.Forms {
                                                goto ProcessNextMessage;
                                        }
                                        SendMessage(FocusWindow, Msg.WM_SETFOCUS, IntPtr.Zero, IntPtr.Zero);
+                                       Keyboard.FocusIn (FocusWindow);
                                        goto ProcessNextMessage;
                                }