# HG changeset patch # User denis # Date 1315234489 -14400 # Node ID f63e5bab16763c6618d28fd8d59b472f102dd428 # Parent ebae41687d0b19179b392fd190db4890b8a4ac95 7071248: IME composition window does not disappear when file dialog is closed : Japanese WinXP Reviewed-by: naoto, art diff -r ebae41687d0b -r f63e5bab1676 jdk/src/windows/native/sun/windows/awt_FileDialog.cpp --- a/jdk/src/windows/native/sun/windows/awt_FileDialog.cpp Thu Sep 01 17:29:37 2011 +0400 +++ b/jdk/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,