changeset 4534:25564f7b29c4

7071248: IME composition window does not disappear when file dialog is closed : Japanese WinXP Reviewed-by: naoto, art
author denis
date Mon, 05 Sep 2011 18:54:49 +0400
parents 970ff8d5bbe7
children 98bb40dbc144
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	Thu Sep 01 17:29:37 2011 +0400
+++ b/src/windows/native/sun/windows/awt_FileDialog.cpp	Mon Sep 05 18:54:49 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,