From 4f69410cd8329e2f9f2ce741491c33ae04470ec3 Mon Sep 17 00:00:00 2001 From: John Roberts Date: Sat, 18 Jul 2015 01:03:08 +0200 Subject: [PATCH] Fix generating events for WXK_NUMPAD_ENTER in wxOSX. This allows to properly detected numeric keypad "Enter" key in the code, notably in wxTextCtrl inside wxWidgets itself. See #16415. --- src/osx/cocoa/window.mm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm index bad9a1446e..6bcfee0f2c 100644 --- a/src/osx/cocoa/window.mm +++ b/src/osx/cocoa/window.mm @@ -232,6 +232,10 @@ long wxOSXTranslateCocoaKey( NSEvent* event, int eventType ) { switch ( [s characterAtIndex:0] ) { + // numpad enter key End-of-text character ETX U+0003 + case 3: + retval = WXK_NUMPAD_ENTER; + break; // backspace key case 0x7F : case 8 : @@ -345,9 +349,6 @@ long wxOSXTranslateCocoaKey( NSEvent* event, int eventType ) case 69: // + retval = WXK_NUMPAD_ADD; break; - case 76: // Enter - retval = WXK_NUMPAD_ENTER; - break; case 65: // . retval = WXK_NUMPAD_DECIMAL; break;