From 040b36b035c48ee0f281447c4ee6b1028b4e2860 Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Wed, 16 Feb 2005 01:11:16 +0000 Subject: [PATCH] . original commit: e9b58213637cefa6278641a1c7299fd738e0c5d6 --- collects/framework/framework.ss | 4 +--- collects/framework/private/canvas.ss | 1 - collects/framework/private/color.ss | 3 +-- collects/framework/private/editor.ss | 1 - collects/framework/private/frame.ss | 1 - collects/framework/private/keymap.ss | 1 - collects/framework/private/main.ss | 1 - collects/framework/private/menu.ss | 1 - collects/framework/private/panel.ss | 1 - collects/framework/private/scheme.ss | 1 - collects/framework/private/text.ss | 1 - collects/mrlib/graph.ss | 1 - .../private/aligned-pasteboard/aligned-pasteboard.ss | 11 ++++------- .../private/aligned-pasteboard/locked-pasteboard.ss | 3 +-- .../tests/test-locked-pasteboard.ss | 1 - 15 files changed, 7 insertions(+), 25 deletions(-) diff --git a/collects/framework/framework.ss b/collects/framework/framework.ss index 397b999c..43fef894 100644 --- a/collects/framework/framework.ss +++ b/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")) diff --git a/collects/framework/private/canvas.ss b/collects/framework/private/canvas.ss index 65baacc0..63800e76 100644 --- a/collects/framework/private/canvas.ss +++ b/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@) diff --git a/collects/framework/private/color.ss b/collects/framework/private/color.ss index 1731f759..cda4c5c3 100644 --- a/collects/framework/private/color.ss +++ b/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@) diff --git a/collects/framework/private/editor.ss b/collects/framework/private/editor.ss index d5bd4b2f..7170e72f 100644 --- a/collects/framework/private/editor.ss +++ b/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")) diff --git a/collects/framework/private/frame.ss b/collects/framework/private/frame.ss index 3999fa9b..96f81ef2 100644 --- a/collects/framework/private/frame.ss +++ b/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") diff --git a/collects/framework/private/keymap.ss b/collects/framework/private/keymap.ss index 9f044bbd..bbf81e1d 100644 --- a/collects/framework/private/keymap.ss +++ b/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") diff --git a/collects/framework/private/main.ss b/collects/framework/private/main.ss index 9b6b610a..ef397ec6 100644 --- a/collects/framework/private/main.ss +++ b/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")) diff --git a/collects/framework/private/menu.ss b/collects/framework/private/menu.ss index 5949937c..ce73b79e 100644 --- a/collects/framework/private/menu.ss +++ b/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@) diff --git a/collects/framework/private/panel.ss b/collects/framework/private/panel.ss index c7f83f80..e4da6112 100644 --- a/collects/framework/private/panel.ss +++ b/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")) diff --git a/collects/framework/private/scheme.ss b/collects/framework/private/scheme.ss index 9be6263e..f9241304 100644 --- a/collects/framework/private/scheme.ss +++ b/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") diff --git a/collects/framework/private/text.ss b/collects/framework/private/text.ss index 67c1e701..ff15471c 100644 --- a/collects/framework/private/text.ss +++ b/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") diff --git a/collects/mrlib/graph.ss b/collects/mrlib/graph.ss index a7a6c6ec..48741a6e 100644 --- a/collects/mrlib/graph.ss +++ b/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")) diff --git a/collects/mrlib/private/aligned-pasteboard/aligned-pasteboard.ss b/collects/mrlib/private/aligned-pasteboard/aligned-pasteboard.ss index 145e316f..92d2628a 100644 --- a/collects/mrlib/private/aligned-pasteboard/aligned-pasteboard.ss +++ b/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))) diff --git a/collects/mrlib/private/aligned-pasteboard/locked-pasteboard.ss b/collects/mrlib/private/aligned-pasteboard/locked-pasteboard.ss index 1a4d060b..b6cf7dc1 100644 --- a/collects/mrlib/private/aligned-pasteboard/locked-pasteboard.ss +++ b/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)) diff --git a/collects/mrlib/private/aligned-pasteboard/tests/test-locked-pasteboard.ss b/collects/mrlib/private/aligned-pasteboard/tests/test-locked-pasteboard.ss index ae70b53f..a3853804 100644 --- a/collects/mrlib/private/aligned-pasteboard/tests/test-locked-pasteboard.ss +++ b/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")))