From a1fe245467949c85f9ba4b135dc2d099ca60e238 Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Wed, 14 Jun 2006 00:15:45 +0000 Subject: [PATCH] last minute pre-350 fixes svn: r3352 --- collects/drscheme/private/module-overview.ss | 8 +++++--- collects/drscheme/private/unit.ss | 16 ++++------------ collects/help/private/standard-urls.ss | 9 ++++----- collects/tests/drscheme/teachpack.ss | 2 +- 4 files changed, 14 insertions(+), 21 deletions(-) diff --git a/collects/drscheme/private/module-overview.ss b/collects/drscheme/private/module-overview.ss index 183bc95f72..0d1c7736ec 100644 --- a/collects/drscheme/private/module-overview.ss +++ b/collects/drscheme/private/module-overview.ss @@ -60,6 +60,7 @@ (interface () set-label-font-size get-label-font-size + get-hidden-paths show-visible-paths remove-visible-paths set-name-length @@ -308,6 +309,7 @@ (when (memq symbol hidden-paths) (set! hidden-paths (remq symbol hidden-paths)) (refresh-visible-paths))) + (define/public (get-hidden-paths) hidden-paths) (define/private (refresh-visible-paths) (begin-edit-sequence) @@ -479,7 +481,7 @@ (+ (send evt get-y) 1))))))] [else (super on-event evt)])) - (super-instantiate ()))) + (super-new))) (define (trim-string str len) (cond @@ -709,8 +711,8 @@ (callback (λ (x y) (if (send lib-paths-checkbox get-value) - (send pasteboard add-visible-path 'lib) - (send pasteboard remove-visible-path 'lib)))))) + (send pasteboard show-visible-paths 'lib) + (send pasteboard remove-visible-paths 'lib)))))) (define ec (make-object canvas:basic% vp pasteboard)) diff --git a/collects/drscheme/private/unit.ss b/collects/drscheme/private/unit.ss index d8b0239369..3fdf5e1346 100644 --- a/collects/drscheme/private/unit.ss +++ b/collects/drscheme/private/unit.ss @@ -2419,7 +2419,6 @@ module browser threading seems wrong. (message-box (string-constant drscheme) (string-constant module-browser-only-in-plt-and-module-langs))) can-browse?)) - (define/private (update-module-browser-pane) (open-status-line 'plt:module-browser:mouse-over) @@ -2435,17 +2434,10 @@ module browser threading seems wrong. (let* ([show-callback (λ (cb key) - (let ([val (send cb get-value)] - [current (preferences:get 'drscheme:module-browser:hide-paths)]) - (if val - (begin - (when (memq key current) - (preferences:set 'drscheme:module-browser:hide-paths (remq key current))) - (send module-browser-pb show-visible-paths key)) - (begin - (unless (memq key current) - (preferences:set 'drscheme:module-browser:hide-paths (cons key current))) - (send module-browser-pb remove-visible-paths key)))))] + (if (send cb get-value) + (send module-browser-pb show-visible-paths key) + (send module-browser-pb remove-visible-paths key)) + (preferences:set 'drscheme:module-browser:hide-paths (send module-browser-pb get-hidden-paths)))] [mk-checkbox (λ (key label) (new check-box% diff --git a/collects/help/private/standard-urls.ss b/collects/help/private/standard-urls.ss index b6bd6e198a..ab25d17c96 100644 --- a/collects/help/private/standard-urls.ss +++ b/collects/help/private/standard-urls.ss @@ -104,13 +104,12 @@ ; sym, string assoc list (define hd-locations `((hd-tour ,(get-help-url (build-path (find-doc-dir) "tour"))) - (release-notes "/servlets/release/notes.ss") - (plt-license "/servlets/release/license.ss") - (front-page "/servlets/home.ss"))) + (release-notes ,(prefix-with-server "/servlets/release/notes.ss")) + (plt-license ,(prefix-with-server "/servlets/release/license.ss")) + (front-page ,(prefix-with-server "/servlets/home.ss")))) (define hd-location-syms (map car hd-locations)) (define (get-hd-location sym) ; the assq is guarded by the contract - (let ([entry (assq sym hd-locations)]) - (prefix-with-server (cadr entry))))) + (cadr (assq sym hd-locations)))) diff --git a/collects/tests/drscheme/teachpack.ss b/collects/tests/drscheme/teachpack.ss index feb257cdd1..49da3ee9a8 100644 --- a/collects/tests/drscheme/teachpack.ss +++ b/collects/tests/drscheme/teachpack.ss @@ -214,7 +214,7 @@ (lambda (dir) (for-each (test-teachpack dir) (directory-list dir)))] - [teachpack-dir (normalize-path (build-path (collection-path "mzlib") 'up 'up "teachpack"))]) + [teachpack-dir (normalize-path (collection-path "teachpack"))]) (set-language-level! '("How to Design Programs" "Advanced Student")) (test-teachpacks teachpack-dir) (test-teachpacks (build-path teachpack-dir "htdp"))))