MacOS and return for default button

original commit: c00a245b81a6330c1510c284a6b5a35aa822096b
This commit is contained in:
Matthew Flatt 1998-12-16 14:56:21 +00:00
parent 5f1e823c23
commit 9ec58c79f1

View File

@ -310,15 +310,15 @@
[(w h) (double-boxed 0 0 (lambda (x y) (send o get-client-size x y)))]) [(w h) (double-boxed 0 0 (lambda (x y) (send o get-client-size x y)))])
(list o x y w h))) (list o x y w h)))
(define (container->children f except) (define (container->children f except must-focus?)
(apply (apply
append append
(map (map
(lambda (i) (lambda (i)
(cond (cond
[(is-a? i wx-basic-panel<%>) (container->children i except)] [(is-a? i wx-basic-panel<%>) (container->children i except must-focus?)]
[(or (eq? i except) [(or (eq? i except)
(not (send i gets-focus?)) (and must-focus? (not (send i gets-focus?)))
(not (send i is-enabled?)) (not (send i is-enabled?))
(not (send i is-shown?))) (not (send i is-shown?)))
null] null]
@ -684,7 +684,7 @@
[normal-move [normal-move
(lambda () (lambda ()
(let* ([o (if (or (is-a? o wx:canvas%) (is-a? o wx:item%)) o #f)] (let* ([o (if (or (is-a? o wx:canvas%) (is-a? o wx:item%)) o #f)]
[dests (map object->position (container->children panel o))] [dests (map object->position (container->children panel o #t))]
[pos (if o (object->position o) (list 'x 0 0 1 1))] [pos (if o (object->position o) (list 'x 0 0 1 1))]
[o (traverse (cadr pos) (caddr pos) (cadddr pos) (list-ref pos 4) [o (traverse (cadr pos) (caddr pos) (cadddr pos) (list-ref pos 4)
(case code (case code
@ -730,7 +730,7 @@
(if (and o (send o handles-key-code code #t meta?)) (if (and o (send o handles-key-code code #t meta?))
#f #f
;; Move selection/hit control based on & shortcuts ;; Move selection/hit control based on & shortcuts
(let* ([objs (container->children panel #f)] (let* ([objs (container->children panel #f #t)]
[re (key-regexp code)]) [re (key-regexp code)])
(ormap (ormap
(lambda (o) (lambda (o)