fixed PR 7675

svn: r1338

original commit: 7a3710a0538f0da2577886f2a415e71949440849
This commit is contained in:
Robby Findler 2005-11-17 14:49:22 +00:00
parent a22cc6e6c2
commit 4d3fbab131
3 changed files with 15 additions and 15 deletions

View File

@ -1080,7 +1080,7 @@
(send edit begin-edit-sequence)
(let ([status (send edit load-file/gui-error
filename
'same
'guess
#f)])
(if status
(begin

View File

@ -138,14 +138,14 @@
(define/public (set-open-here-frame fr) (set! open-here-frame fr))
(define/public (get-open-here-frame)
(cond
[open-here-frame open-here-frame]
[else
(let ([candidates
(filter (λ (x) (is-a? (frame-frame x) frame:open-here<%>))
frames)])
(if (null? candidates)
#f
(frame-frame (car candidates))))]))
[open-here-frame open-here-frame]
[else
(let ([candidates
(filter (λ (x) (is-a? (frame-frame x) frame:open-here<%>))
frames)])
(if (null? candidates)
#f
(frame-frame (car candidates))))]))
(public get-mdi-parent frame-label-changed for-each-frame
get-active-frame set-active-frame insert-frame

View File

@ -380,12 +380,12 @@
(define open-file
(λ ()
(let ([file
(parameterize ([finder:dialog-parent-parameter
(and (preferences:get 'framework:open-here?)
(get-top-level-focus-window))])
(finder:get-file
(send *open-directory* get)))])
(let* ([parent (and (preferences:get 'framework:open-here?)
(get-top-level-focus-window))]
[file
(parameterize ([finder:dialog-parent-parameter parent])
(finder:get-file
(send *open-directory* get)))])
(when file
(send *open-directory*
set-from-file! file))