diff --git a/pkgs/gui-pkgs/gui-doc/scribblings/gui/key-event-class.scrbl b/pkgs/gui-pkgs/gui-doc/scribblings/gui/key-event-class.scrbl index f5cd3d15..7020f0ec 100644 --- a/pkgs/gui-pkgs/gui-doc/scribblings/gui/key-event-class.scrbl +++ b/pkgs/gui-pkgs/gui-doc/scribblings/gui/key-event-class.scrbl @@ -175,8 +175,7 @@ The special key symbols attempt to capture useful keys that have no @item{@racket[#\return] --- the Enter or Return key (on all platforms), but not necessarily the Enter key near the numpad - (which is reported as @racket['numpad-enter] if the platform - distinguishes the two Enter keys)} + (which is reported as @racket['numpad-enter] Unix and Mac OS X)} @item{@racket[#\tab] --- the tab key} @@ -206,7 +205,11 @@ On Windows, when the Control key is pressed without Alt, the key See also @method[key-event% get-other-shift-key-code]. -} +@history[#:changed "6.1.0.8" @elem{Changed reporting of numpad Enter + to @racket['numpad-enter] as + documented, instead of + @racket[#\u03].}]} + @defmethod[(get-key-release-code) (or/c char? key-code-symbol?)]{ diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/repl.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/repl.rkt index 9411af00..5e73fdf7 100644 --- a/pkgs/gui-pkgs/gui-lib/mred/private/repl.rkt +++ b/pkgs/gui-pkgs/gui-lib/mred/private/repl.rkt @@ -26,7 +26,7 @@ (override* [on-char (lambda (c) (super-on-char c) - (when (and (memq (send c get-key-code) '(#\return #\newline #\003)) + (when (and (memq (send c get-key-code) '(#\return #\newline numpad-enter)) (not locked?)) (set! locked? #t) (evaluate (get-text prompt-pos (last-position)))))]) diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/keycode.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/keycode.rkt index da1f0338..af549ff0 100644 --- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/keycode.rkt +++ b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/keycode.rkt @@ -42,7 +42,7 @@ (#x4b . divide) (71 . separator) (65 . decimal) - (76 . #\u3) ; numpad enter + (76 . numpad-enter) ; was #\u3 in earlier versions (82 . numpad0) (83 . numpad1) (84 . numpad2) diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/keycode.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/keycode.rkt index 6f86ca18..818aaebd 100644 --- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/keycode.rkt +++ b/pkgs/gui-pkgs/gui-lib/mred/private/wx/gtk/keycode.rkt @@ -23,7 +23,7 @@ (#xff63 . insert) (#xff80 . #\space) ; keypad (#xff89 . #\tab) ; keypad - (#xff8d . #\u3) ; enter + (#xff8d . numpad-enter) ; was #\u3 in earlier versions (#xff91 . f1) (#xff92 . f2) (#xff93 . f3) diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/keymap.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxme/keymap.rkt index 7e42e206..27c94314 100644 --- a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/keymap.rkt +++ b/pkgs/gui-pkgs/gui-lib/mred/private/wxme/keymap.rkt @@ -75,7 +75,7 @@ ("numpad7" . numpad7) ("numpad8" . numpad8) ("numpad9" . numpad9) - ("numpadenter" . #\u3) + ("numpadenter" . numpad-enter) ("f1" . f1) ("f2" . f2) ("f3" . f3) diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/text.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxme/text.rkt index 22f254d6..7eff75e8 100644 --- a/pkgs/gui-pkgs/gui-lib/mred/private/wxme/text.rkt +++ b/pkgs/gui-pkgs/gui-lib/mred/private/wxme/text.rkt @@ -629,7 +629,7 @@ [(add) (ins #\+)] [(subtract) (ins #\-)] [(decimal) (ins #\.)] - [(#\u3) (ins #\return)] ; NUMPAD-ENTER + [(numpad-enter) (ins #\return)] [(#\return #\tab) (ins code)] [else (let ([vcode (if (char? code) diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wxtextfield.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wxtextfield.rkt index 24fb4bc9..4cd10d9c 100644 --- a/pkgs/gui-pkgs/gui-lib/mred/private/wxtextfield.rkt +++ b/pkgs/gui-pkgs/gui-lib/mred/private/wxtextfield.rkt @@ -90,7 +90,7 @@ (let ([c (send e get-key-code)]) (unless (and (or (eq? c #\return) (eq? c #\newline) - (eq? c #\u3)) ; numpad enter + (eq? c 'numpad-enter)) return-cb (return-cb (lambda () (callback 'text-field-enter) #t))) (as-exit (lambda () (super-on-char e)))))))]