diff options
author | Sven Gothel <[email protected]> | 2013-02-28 01:18:52 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2013-02-28 01:18:52 +0100 |
commit | 1f9bff1aab54c399438c735581508ac85c6a29b3 (patch) | |
tree | b1a0e6c1d19451ef750798c09a058fed47dbc88c /src/newt/classes/jogamp | |
parent | 808a9a27a8c1c9e0a6701a8dd81d51f8daa8129d (diff) | |
parent | c9a13b31703302f58100af2a3f437ff7cb8fd010 (diff) |
Fix merge conflict of erikbrayet/bug_668
Diffstat (limited to 'src/newt/classes/jogamp')
-rw-r--r-- | src/newt/classes/jogamp/newt/driver/android/event/AndroidNewtEventFactory.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/newt/classes/jogamp/newt/driver/android/event/AndroidNewtEventFactory.java b/src/newt/classes/jogamp/newt/driver/android/event/AndroidNewtEventFactory.java index 22e2cbc51..4f19e9c4d 100644 --- a/src/newt/classes/jogamp/newt/driver/android/event/AndroidNewtEventFactory.java +++ b/src/newt/classes/jogamp/newt/driver/android/event/AndroidNewtEventFactory.java @@ -176,7 +176,7 @@ public class AndroidNewtEventFactory { final int newtMods = aKeyModifiers2Newt(event.getMetaState()); return new com.jogamp.newt.event.KeyEvent( - type, src, unixTime, newtMods, newtKeyCode, newtKeyCode, event.getDisplayLabel()); + type, src, unixTime, newtMods, newtKeyCode, newtKeyCode, (char) event.getUnicodeChar()); } } return null; |