suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't expose menu-root frame through get-top-level-{focus,edit-target}-window

Browse Source 
svn: r1339
This commit is contained in:
Matthew Flatt 2005-11-17 18:34:56 +00:00
parent 7a3710a053
commit 103e26c094
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
collects/mred/private/mrtop.ss
View File

@ -242,19 +242,26 @@
(remq root-menu-frame (map wx->mred (wx:get-top-level-windows)))) (remq root-menu-frame (map wx->mred (wx:get-top-level-windows))))
(define (get-top-level-focus-window) (define (get-top-level-focus-window)
(ormap (lambda (f) (and (send f is-act-on?) (wx->mred f))) (wx:get-top-level-windows))) (ormap (lambda (f) (and (send f is-act-on?)
(let ([f (wx->mred f)])
(and f
(not (eq? f root-menu-frame))
f))))
(wx:get-top-level-windows)))
(define (get-top-level-edit-target-window) (define (get-top-level-edit-target-window)
(let loop ([l (wx:get-top-level-windows)][f #f][s 0][ms 0]) (let loop ([l (wx:get-top-level-windows)][f #f][s 0][ms 0])
(if (null? l) (if (null? l)
(and f (wx->mred f)) f
(let* ([f2 (car l)] (let* ([f2 (car l)]
[f2m (wx->mred f2)]
[s2 (send f2 get-act-date/seconds)] [s2 (send f2 get-act-date/seconds)]
[ms2 (send f2 get-act-date/milliseconds)]) [ms2 (send f2 get-act-date/milliseconds)])
(if (or (not f) (if (and (or (not f)
(> s2 s) (> s2 s)
(and (= s2 s) (> ms2 ms))) (and (= s2 s) (> ms2 ms)))
(loop (cdr l) f2 s2 ms2) (not (eq? f2m root-menu-frame)))
(loop (cdr l) f2m s2 ms2)
(loop (cdr l) f s ms)))))) (loop (cdr l) f s ms))))))
(define (send-message-to-window x y m) (define (send-message-to-window x y m)