From 12556eaf75e295bd967d101dcb0f1eceb512714a Mon Sep 17 00:00:00 2001
From: Sean Chou <zhouyx@openjdk.org>
Date: Wed, 23 May 2012 12:37:31 +0800
Subject: [PATCH] 7170996: IME composition window does not disappear when file
 dialog is closed : Japanese WinXP

Reviewed-by: art, bagiras
---
 jdk/src/windows/native/sun/windows/awt_Component.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jdk/src/windows/native/sun/windows/awt_Component.cpp b/jdk/src/windows/native/sun/windows/awt_Component.cpp
index b03ea0d0af0..9cc2f76e90b 100644
--- a/jdk/src/windows/native/sun/windows/awt_Component.cpp
+++ b/jdk/src/windows/native/sun/windows/awt_Component.cpp
@@ -558,6 +558,8 @@ AwtComponent::CreateHWnd(JNIEnv *env, LPCWSTR title,
 
     m_hwnd = hwnd;
 
+    ::ImmAssociateContext(m_hwnd, NULL);
+
     SetDrawState((jint)JAWT_LOCK_SURFACE_CHANGED |
         (jint)JAWT_LOCK_BOUNDS_CHANGED |
         (jint)JAWT_LOCK_CLIP_CHANGED);