Mercurial > hg > release > icedtea7-forest-2.4 > jdk
changeset 7346:1bacdebef58f
8019990: IM candidate window appears on the South-East corner of the display.
Reviewed-by: bagiras, serb
author | bae |
---|---|
date | Thu, 03 Apr 2014 17:09:54 +0400 |
parents | f79b0c33fa99 |
children | 46636540eff2 |
files | src/windows/native/sun/windows/awt_Component.cpp src/windows/native/sun/windows/awt_Frame.cpp test/java/awt/Frame/7024749/bug7024749.java |
diffstat | 3 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/windows/native/sun/windows/awt_Component.cpp Tue May 06 22:15:25 2014 -0700 +++ b/src/windows/native/sun/windows/awt_Component.cpp Thu Apr 03 17:09:54 2014 +0400 @@ -1719,9 +1719,11 @@ case WM_IME_SETCONTEXT: // lParam is passed as pointer and it can be modified. mr = WmImeSetContext(static_cast<BOOL>(wParam), &lParam); + CallProxyDefWindowProc(message, wParam, lParam, retValue, mr); break; case WM_IME_NOTIFY: mr = WmImeNotify(wParam, lParam); + CallProxyDefWindowProc(message, wParam, lParam, retValue, mr); break; case WM_IME_STARTCOMPOSITION: mr = WmImeStartComposition(); @@ -4066,7 +4068,7 @@ { if (mr != mrConsume) { HWND proxy = GetProxyFocusOwner(); - if (proxy != NULL) { + if (proxy != NULL && ::IsWindowEnabled(proxy)) { retVal = ComCtl32Util::GetInstance().DefWindowProc(NULL, proxy, message, wParam, lParam); mr = mrConsume; }
--- a/src/windows/native/sun/windows/awt_Frame.cpp Tue May 06 22:15:25 2014 -0700 +++ b/src/windows/native/sun/windows/awt_Frame.cpp Thu Apr 03 17:09:54 2014 +0400 @@ -319,6 +319,8 @@ case WM_IME_STARTCOMPOSITION: case WM_IME_ENDCOMPOSITION: case WM_IME_COMPOSITION: + case WM_IME_SETCONTEXT: + case WM_IME_NOTIFY: case WM_IME_CONTROL: case WM_IME_COMPOSITIONFULL: case WM_IME_SELECT:
--- a/test/java/awt/Frame/7024749/bug7024749.java Tue May 06 22:15:25 2014 -0700 +++ b/test/java/awt/Frame/7024749/bug7024749.java Thu Apr 03 17:09:54 2014 +0400 @@ -23,7 +23,7 @@ /* * @test - * @bug 7024749 7184326 + * @bug 7024749 7184326 8019990 * @summary JDK7 b131---a crash in: Java_sun_awt_windows_ThemeReader_isGetThemeTransitionDurationDefined+0x75 * @library ../../regtesthelpers * @build Util