From 5eca08ac781f4ea824e66a4abbedbef1a23be856 Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Sat, 16 Jan 1999 04:52:07 +0000 Subject: [PATCH] ... original commit: c2c7891c733e8564adec3b581c67d56cdecb1afe --- collects/framework/frame.ss | 3 ++- collects/framework/group.ss | 6 ++++-- collects/framework/handler.ss | 5 +++-- collects/tests/framework/framework-test-engine.ss | 6 +++--- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/collects/framework/frame.ss b/collects/framework/frame.ss index 8b87a56a..b49a28ea 100644 --- a/collects/framework/frame.ss +++ b/collects/framework/frame.ss @@ -11,6 +11,7 @@ [finder : framework:finder^] [keymap : framework:keymap^] [text : framework:text^] + [editor : framework:editor^] [mzlib:function : mzlib:function^]) (rename [-editor<%> editor<%>] @@ -706,7 +707,7 @@ r-root))]) (override - [get-editor<%> (lambda () text:info<%>)] + [get-editor<%> (lambda () editor:info<%>)] [get-editor% (lambda () text:info%)]) (public diff --git a/collects/framework/group.ss b/collects/framework/group.ss index d7819952..52ea3706 100644 --- a/collects/framework/group.ss +++ b/collects/framework/group.ss @@ -8,7 +8,7 @@ (define-struct frame (frame id)) (define % - (class null () + (class object% () (private [active-frame #f] [frame-counter 0] @@ -195,7 +195,9 @@ (let* ([frame (frame-frame (car frames))]) (if (test-frame frame) frame - (loop (cdr frames))))]))))]))) + (loop (cdr frames))))]))))]) + (sequence + (super-init)))) (define the-frame-group #f) diff --git a/collects/framework/handler.ss b/collects/framework/handler.ss index 391a8541..c375ddf4 100644 --- a/collects/framework/handler.ss +++ b/collects/framework/handler.ss @@ -111,7 +111,7 @@ (define *open-directory* ; object to remember last directory (make-object - (class null () + (class object% () (private [the-dir #f]) (public @@ -123,7 +123,8 @@ (lambda () (set! the-dir (current-directory)))]) (sequence - (set-to-default))))) + (set-to-default) + (super-init))))) (define open-file (lambda () diff --git a/collects/tests/framework/framework-test-engine.ss b/collects/tests/framework/framework-test-engine.ss index 9bae26a2..9f03b9aa 100644 --- a/collects/tests/framework/framework-test-engine.ss +++ b/collects/tests/framework/framework-test-engine.ss @@ -1,4 +1,4 @@ -(require-library "errortrace.ss" "errortrace") +(require-library "errortrace.ss" "errortrace") (error-print-width 80) (let* ([errs null] [sema (make-semaphore 1)] @@ -15,9 +15,9 @@ [exception->string (lambda (x) (if (exn? x) - (if (defined? 'errortrace-print-trace) + (if (defined? 'print-error-trace) (let ([p (open-output-string)]) - (errortrace-print-trace p x) + (print-error-trace p x) (string-append (exn-message x) (string #\newline) (get-output-string p))) (exn-message x)) (format "~s" x)))])