Mercurial > hg > openjdk > jdk8 > jdk
changeset 7598:c4908732fef5 jdk8-b98
Merge
author | katleman |
---|---|
date | Mon, 08 Jul 2013 14:29:46 -0700 |
parents | f2342dedf04a (current diff) 2c26ccf0a85b (diff) |
children | 758c21301545 56bc019a0525 |
files | |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/macosx/native/sun/awt/AWTEvent.m Fri Jul 05 11:07:03 2013 -0700 +++ b/src/macosx/native/sun/awt/AWTEvent.m Mon Jul 08 14:29:46 2013 -0700 @@ -382,7 +382,7 @@ { TISInputSourceRef currentKeyboard = TISCopyCurrentKeyboardInputSource(); CFDataRef uchr = (CFDataRef)TISGetInputSourceProperty(currentKeyboard, kTISPropertyUnicodeKeyLayoutData); - if (uchr == nil) { return; } + if (uchr == nil) { return 0; } const UCKeyboardLayout *keyboardLayout = (const UCKeyboardLayout*)CFDataGetBytePtr(uchr); // Carbon modifiers should be used instead of NSEvent modifiers UInt32 modifierKeyState = (GetCurrentEventKeyModifiers() >> 8) & 0xFF;