PR 9289

svn: r9259

collects/drscheme/private/frame.ss

@@ -158,7 +158,6 @@
         
         (drscheme:app:add-language-items-to-help-menu menu))
       
-      (define/override (file-menu:open-callback item evt) (handler:open-file))
       (define/override (file-menu:new-string) (string-constant new-menu-item))
       (define/override (file-menu:open-string) (string-constant open-menu-item))
       

collects/framework/private/frame.ss

@@ -1039,23 +1039,20 @@
         (super set-label (gui-utils:trim-string (get-entire-label) 200))
         (send (group:get-the-frame-group) frame-label-changed this))
       
-      (public get-entire-label get-label-prefix set-label-prefix)
+      (define/public (get-entire-label)
-      [define get-entire-label
-        (λ ()
         (cond
           [(string=? "" label)
            label-prefix]
           [(string=? "" label-prefix)
            label]
           [else 
-             (string-append label " - " label-prefix)]))]
+           (string-append label " - " label-prefix)]))
-      [define get-label-prefix (λ () label-prefix)]
+      (define/public (get-label-prefix) label-prefix)
-      [define set-label-prefix
+      (define/public (set-label-prefix s)
-        (λ (s)
         (when (and (string? s)
                    (not (string=? s label-prefix)))
           (set! label-prefix s)
-            (do-label)))]
+          (do-label)))
       [define/override get-label (λ () label)]
       [define/override set-label
         (λ (t)
@@ -1116,6 +1113,14 @@
       
       (inherit get-checkable-menu-item% get-menu-item%)
       
+      (define/override (file-menu:open-callback item evt)
+        (let* ([e (get-editor)]
+               [fn (and e (send e get-filename))]
+               [dir (and fn
+                         (let-values ([(base name dir) (split-path fn)])
+                           base))])
+          (handler:open-file dir)))
+      
       (define/override (file-menu:revert-on-demand item)
         (send item enable (not (send (get-editor) is-locked?))))
       

collects/framework/private/framework-exports.ss

@@ -642,13 +642,15 @@
              ]})
 
         (handler:open-file
-         (-> (or/c false/c (is-a?/c frame:basic<%>)))
+         (->* ()
-         ()
+              ((or/c false/c path? string?))
+              (or/c false/c (is-a?/c frame:basic<%>)))
+         (((dir #f)))
          @{This function queries the user for a filename and opens the file for
            editing.  It uses @scheme[handler:edit-file] to open the file, once
            the user has chosen it.
 
-           Calls @scheme[finder:get-file] and @scheme[handler:edit-file].})
+           Calls @scheme[finder:get-file] and @scheme[handler:edit-file], passing along @scheme[dir].})
 
         (handler:install-recent-items
          ((is-a?/c menu%) . -> . void?)

collects/framework/private/handler.ss

@@ -1,5 +1,5 @@
-
 #lang scheme/unit
+
 (require mzlib/class
          mzlib/list
          (lib "hierlist.ss" "hierlist")
@@ -368,29 +368,12 @@
         (open-recent-list-item recent-item))
       (super-instantiate ()))))
 
-  (define *open-directory* ; object to remember last directory
+(define (open-file [directory #f])
-    (new (class object%
-           (field [the-dir #f])
-           [define/public get (λ () the-dir)]
-           [define/public set-from-file!
-             (λ (file) 
-               (set! the-dir (path-only file)))]
-           [define/public set-to-default
-             (λ ()
-               (set! the-dir (current-directory)))]
-           (set-to-default)
-           (super-new))))
-  
-  (define (open-file)
   (let* ([parent (and (or (not (eq? 'macosx (system-type)))
                           (preferences:get 'framework:open-here?))
                       (get-top-level-focus-window))]
          [file 
           (parameterize ([finder:dialog-parent-parameter parent])
-              (finder:get-file
+            (finder:get-file directory))])
-               (send *open-directory* get)))])
-      (when file
-        (send *open-directory*
-              set-from-file! file))
     (and file
          (edit-file file))))

collects/framework/private/keymap.ss

@@ -1349,7 +1349,11 @@
               #t)]
            [load-file
             (λ (edit event)
-              (handler:open-file)
+              (let ([fn (send edit get-filename)])
+                (handler:open-file
+                 (and fn
+                      (let-values ([(base name dir) (split-path fn)])
+                        base))))
               #t)])
       (λ (kmap)
         (let* ([map (λ (key func)