From 34fc4df1d76a43b522bc3870afa4cbfae41a213e Mon Sep 17 00:00:00 2001
From: Robby Findler <robby@racket-lang.org>
Date: Tue, 6 Mar 2001 02:27:31 +0000
Subject: [PATCH] ...

original commit: 11e262af3cba199bba37e079522b21ec1415054a
---
 collects/framework/private/canvas.ss |  2 +-
 collects/framework/private/frame.ss  | 10 ++--------
 collects/framework/private/group.ss  | 10 +++++-----
 collects/framework/private/panel.ss  |  3 ++-
 collects/framework/private/sig.ss    |  4 ----
 collects/framework/test.ss           |  2 +-
 6 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/collects/framework/private/canvas.ss b/collects/framework/private/canvas.ss
index 83dd0ab7..4b4c9714 100644
--- a/collects/framework/private/canvas.ss
+++ b/collects/framework/private/canvas.ss
@@ -9,7 +9,7 @@
 
   (define canvas@
     (unit/sig framework:canvas^
-      (import [mred : mred^]
+      (import mred^
 	      [preferences : framework:preferences^]
 	      [frame : framework:frame^])
       
diff --git a/collects/framework/private/frame.ss b/collects/framework/private/frame.ss
index af2de23d..60dbeae0 100644
--- a/collects/framework/private/frame.ss
+++ b/collects/framework/private/frame.ss
@@ -1,6 +1,7 @@
 (module frame mzscheme
   (require (lib "unitsig.ss")
 	   (lib "class.ss")
+	   (lib "include.ss")
 	   "sig.ss"
 	   "../gui-utils-sig.ss"
 	   "../macro.ss"
@@ -159,14 +160,7 @@
       (public
 	[get-area-container (lambda () panel)])
       (sequence
-	(set! after-init? #t)
-	(when (getenv "MREDMEMORYDEBUG")
-	  (global-defined-value 'open-frames
-				(cons (make-weak-box this)
-				      (global-defined-value 'open-frames)))))))
-
-  (when (getenv "MREDMEMORYDEBUG")
-    (global-defined-value 'open-frames null))
+	(set! after-init? #t))))
 
   (define lock-canvas%
     (class canvas% (parent . args)
diff --git a/collects/framework/private/group.ss b/collects/framework/private/group.ss
index 11b18f87..975f3cda 100644
--- a/collects/framework/private/group.ss
+++ b/collects/framework/private/group.ss
@@ -231,10 +231,10 @@
 	  (sequence
 	    (super-init))))
       
-      (define the-frame-group #f)
+      (define (internal-get-the-frame-group)
+	(let ([the-frame-group (make-object %)])
+	  (set! internal-get-the-frame-group (lambda () the-frame-group))
+	  (internal-get-the-frame-group)))
       
       (define get-the-frame-group
-	(lambda ()
-	  (set! the-frame-group (make-object %))
-	  (set! get-the-frame-group (lambda () the-frame-group))
-	  (get-the-frame-group))))))
\ No newline at end of file
+	(internal-get-the-frame-group)))))
\ No newline at end of file
diff --git a/collects/framework/private/panel.ss b/collects/framework/private/panel.ss
index 29af164c..ac48124c 100644
--- a/collects/framework/private/panel.ss
+++ b/collects/framework/private/panel.ss
@@ -4,7 +4,8 @@
 	   "sig"
 	   "../macro.ss"
 	   (lib "mred-sig.ss" "mred")
-	   (lib "list.ss"))
+	   (lib "list.ss")
+	   (lib "etc.ss"))
 
   (provide panel@)
 
diff --git a/collects/framework/private/sig.ss b/collects/framework/private/sig.ss
index b605e568..e317ff89 100644
--- a/collects/framework/private/sig.ss
+++ b/collects/framework/private/sig.ss
@@ -2,7 +2,6 @@
   (require (lib "unitsig.ss"))
 
   (provide framework:menu^
-	   framework:prefs-file^
 	   framework:version^
 	   framework:panel^
 	   framework:exn^
@@ -34,9 +33,6 @@
      can-restore-menu-item%
      can-restore-checkable-menu-item%))
 
-  (define-signature framework:prefs-file^
-    (get-preferences-filename))
-
   (define-signature framework:version^
     (add-spec
      version))
diff --git a/collects/framework/test.ss b/collects/framework/test.ss
index 845e8556..baec53ed 100644
--- a/collects/framework/test.ss
+++ b/collects/framework/test.ss
@@ -8,6 +8,6 @@
   (provide-signature-elements framework:test^)
 
   (define-values/invoke-unit/sig framework:test^
-    test@
+    framework:test@
     #f
     mred^))
\ No newline at end of file