From edbc3d62576b50526a217c13b9436d256abbaa48 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 20 Jul 1999 22:06:07 +0000 Subject: [PATCH] . original commit: 58377f467612bbaab63cc52fe50b030ef378a191 --- collects/framework/editor.ss | 2 +- collects/framework/frame.ss | 2 +- collects/framework/group.ss | 2 +- collects/framework/panel.ss | 4 ++-- collects/framework/prefs.ss | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/collects/framework/editor.ss b/collects/framework/editor.ss index f975954e..6df99171 100644 --- a/collects/framework/editor.ss +++ b/collects/framework/editor.ss @@ -29,7 +29,7 @@ ; (override ; [copy-self ; (lambda () -; (let ([editor (make-object (object-class this))]) +; (let ([editor (make-object (object-interface this))]) ; (copy-self-to editor) ; editor))]) diff --git a/collects/framework/frame.ss b/collects/framework/frame.ss index 5c87a7ca..a5c26da2 100644 --- a/collects/framework/frame.ss +++ b/collects/framework/frame.ss @@ -93,7 +93,7 @@ [on-drop-file (lambda (filename) (handler:edit-file filename))] - [on-new-child + [after-new-child (lambda (child) (when after-init? (error 'frame:basic-mixin diff --git a/collects/framework/group.ss b/collects/framework/group.ss index e1f58d55..47307da0 100644 --- a/collects/framework/group.ss +++ b/collects/framework/group.ss @@ -55,7 +55,7 @@ (lambda (frame) (let ([label (send frame get-label)]) (if (string=? label "") - (if (ivar-in-class? 'get-entire-label (object-class frame)) + (if (ivar-in-interface? 'get-entire-label (object-interface frame)) (let ([label (send frame get-entire-label)]) (if (string=? label "") default-name diff --git a/collects/framework/panel.ss b/collects/framework/panel.ss index 9ee86049..ea0983d4 100644 --- a/collects/framework/panel.ss +++ b/collects/framework/panel.ss @@ -8,9 +8,9 @@ (define single-mixin (mixin (area-container<%>) (single<%>) args (inherit get-alignment) - (rename [super-on-new-child on-new-child]) + (rename [super-after-new-child after-new-child]) (override - [on-new-child + [after-new-child (lambda (c) (if current-active-child (send c show #f) diff --git a/collects/framework/prefs.ss b/collects/framework/prefs.ss index 27a95dd4..e30f01fd 100644 --- a/collects/framework/prefs.ss +++ b/collects/framework/prefs.ss @@ -537,7 +537,7 @@ (unless (ppanel-panel ppanel) (let ([panel ((ppanel-container ppanel) single-panel)]) (unless (and (object? panel) - (implementation? (object-class panel) area-container<%>)) + (is-a? panel area-container<%>)) (error 'preferences-dialog "expected the result of the function passed to preferences:add-panel to implement the area-container% interface. Got ~a~n" panel))