changeset 4577:d8b5c0186736

7071248: IME composition window does not disappear when file dialog is closed : Japanese WinXP Reviewed-by: naoto, art
author denis
date Wed, 07 Sep 2011 15:47:47 +0400
parents c162f8fc4adc
children a141f7ccdc5b
files src/windows/native/sun/windows/awt_FileDialog.cpp
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/windows/native/sun/windows/awt_FileDialog.cpp	Tue Sep 06 10:51:28 2011 -0700
+++ b/src/windows/native/sun/windows/awt_FileDialog.cpp	Wed Sep 07 15:47:47 2011 +0400
@@ -153,6 +153,11 @@
             break;
         }
         case WM_DESTROY: {
+            HIMC hIMC = ::ImmGetContext(hdlg);
+            if (hIMC != NULL) {
+                ::ImmNotifyIME(hIMC, NI_COMPOSITIONSTR, CPS_CANCEL, 0);
+            }
+
             WNDPROC lpfnWndProc = (WNDPROC)(::GetProp(parent, NativeDialogWndProcProp));
             ComCtl32Util::GetInstance().UnsubclassHWND(parent,
                                                        FileDialogWndProc,