.

original commit: e9b58213637cefa6278641a1c7299fd738e0c5d6

collects/framework/framework.ss

@@ -12,13 +12,11 @@
            "framework-unit.ss"
            "framework-sig.ss"
            
-           "macro.ss"
            (lib "contract.ss"))
   
   (provide-signature-elements framework-class^)
 
-  (provide (all-from "macro.ss")
-           (all-from "test.ss")
+  (provide (all-from "test.ss")
            (all-from "gui-utils.ss")
            (all-from "decorated-editor-snip.ss"))
 

collects/framework/private/canvas.ss

@@ -2,7 +2,6 @@
   (require (lib "unitsig.ss")
 	   (lib "class.ss")
 	   "sig.ss"
-	   "../macro.ss"
 	   (lib "mred-sig.ss" "mred"))
 
   (provide canvas@)

collects/framework/private/color.ss

@@ -7,8 +7,7 @@
            (lib "token-tree.ss" "syntax-color")
            (lib "paren-tree.ss" "syntax-color")
            (lib "default-lexer.ss" "syntax-color")
-           "sig.ss"
-           "../macro.ss")
+           "sig.ss")
            
   
   (provide color@)

collects/framework/private/editor.ss

@@ -5,7 +5,6 @@
            (lib "string-constant.ss" "string-constants")
 	   "sig.ss"
 	   "../gui-utils.ss"
-	   "../macro.ss"
            (lib "etc.ss")
 	   (lib "mred-sig.ss" "mred")
 	   (lib "file.ss"))

collects/framework/private/frame.ss

@@ -6,7 +6,6 @@
 	   (lib "include.ss")
 	   "sig.ss"
 	   "../gui-utils.ss"
-	   "../macro.ss"
            "bday.ss"
 	   (lib "mred-sig.ss" "mred")
 	   (lib "list.ss")

collects/framework/private/keymap.ss

@@ -2,7 +2,6 @@
 (module keymap mzscheme
   (require (lib "string-constant.ss" "string-constants")
            (lib "unitsig.ss")
-	   "../macro.ss"
 	   (lib "class.ss")
 	   (lib "list.ss")
 	   (lib "mred-sig.ss" "mred")

collects/framework/private/main.ss

@@ -3,7 +3,6 @@
 	   (lib "class.ss")
 	   "sig.ss"
 	   "../gui-utils.ss"
-	   "../macro.ss"
            (lib "string-constant.ss" "string-constants")
 	   (lib "mred-sig.ss" "mred"))
   

collects/framework/private/menu.ss

@@ -2,7 +2,6 @@
   (require (lib "unitsig.ss")
 	   (lib "class.ss")
 	   "sig.ss"
-	   "../macro.ss"
 	   (lib "mred-sig.ss" "mred"))
   
   (provide menu@)

collects/framework/private/panel.ss

@@ -3,7 +3,6 @@
   (require (lib "unitsig.ss")
 	   (lib "class.ss")
 	   "sig.ss"
-	   "../macro.ss"
 	   (lib "mred-sig.ss" "mred")
 	   (lib "list.ss")
 	   (lib "etc.ss"))

collects/framework/private/scheme.ss

@@ -7,7 +7,6 @@
            (lib "unitsig.ss")
 	   (lib "class.ss")
 	   "sig.ss"
-	   "../macro.ss"
 	   (lib "mred-sig.ss" "mred")
            (lib "mred.ss" "mred")
 	   (lib "list.ss")

collects/framework/private/text.ss

@@ -11,7 +11,6 @@ WARNING: printf is rebound in the body of the unit to always
 	   (lib "class.ss")
            (lib "match.ss")
 	   "sig.ss"
-	   "../macro.ss"
 	   "../gui-utils.ss"
 	   (lib "mred-sig.ss" "mred")
 	   (lib "list.ss")

collects/mrlib/graph.ss

@@ -3,7 +3,6 @@
   (require (lib "class.ss")
            (lib "list.ss")
            (lib "math.ss")
-           (lib "macro.ss" "framework")
            (lib "mred.ss" "mred")
 	   (lib "contract.ss"))
   

collects/mrlib/private/aligned-pasteboard/aligned-pasteboard.ss

@@ -1,7 +1,6 @@
 (module aligned-pasteboard mzscheme
   
   (require
-   (lib "framework.ss" "framework")
    (lib "click-forwarding-editor.ss" "mrlib")
    "geometry-managed-pasteboard.ss"
    "locked-pasteboard.ss")
@@ -12,14 +11,12 @@
   
   ;; contruct the basic mixin that both pasteboards will be created from
   (define (click/lock type)
-    (editor:basic-mixin
-     (click-forwarding-editor-mixin
-      (locked-pasteboard-mixin
-       (make-aligned-pasteboard type)))))
+    (click-forwarding-editor-mixin
+     (locked-pasteboard-mixin
+      (make-aligned-pasteboard type))))
   
   (define vertical-pasteboard%
     (click/lock 'vertical))
   
   (define horizontal-pasteboard%
-    (click/lock 'horizontal))
-  )
+    (click/lock 'horizontal)))

collects/mrlib/private/aligned-pasteboard/locked-pasteboard.ss

@@ -8,8 +8,7 @@
    (lib "class.ss")
    (lib "mred.ss" "mred")
    (lib "etc.ss")
-   (lib "contract.ss")
-   (lib "framework.ss" "framework"))
+   (lib "contract.ss"))
   
   (provide/contract
    (locked-pasteboard-mixin mixin-contract))

collects/mrlib/private/aligned-pasteboard/tests/test-locked-pasteboard.ss

@@ -1,6 +1,5 @@
 (require
  "../locked-pasteboard.ss"
- (lib "framework.ss" "framework")
  (lib "click-forwarding-editor.ss" "mrlib"))
 
 (define f (new frame% (width 400) (height 500) (label "test")))