Mercurial > hg > release > icedtea7-forest-2.0 > jdk

changeset 4437:eab94f59b6dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7045354: Korean IME's Hanja candidate window is not displayed on IMFDemo Reviewed-by: art, ant
author dcherepanov
date Mon, 30 May 2011 13:25:02 +0400
parents 000a845b1e38
children f05164caa490
files src/windows/native/sun/windows/awt_Component.cpp
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/windows/native/sun/windows/awt_Component.cpp	Sat May 28 12:56:52 2011 +0400
+++ b/src/windows/native/sun/windows/awt_Component.cpp	Mon May 30 13:25:02 2011 +0400
@@ -3715,7 +3715,10 @@
             SetCandidateWindow(iCandType, x-rc.left, y-rc.top);
     }
     if (m_bitsCandType != 0) {
-        ::DefWindowProc(GetHWnd(), WM_IME_NOTIFY, IMN_OPENCANDIDATE, m_bitsCandType);
+        HWND proxy = GetProxyFocusOwner();
+        // REMIND: is there any chance GetProxyFocusOwner() returns NULL here?
+        ::DefWindowProc((proxy != NULL) ? proxy : GetHWnd(),
+                        WM_IME_NOTIFY, IMN_OPENCANDIDATE, m_bitsCandType);
     }
 }