diff --git a/collects/framework/gui-utils.ss b/collects/framework/gui-utils.ss index f0229cdc..03f4c7c6 100644 --- a/collects/framework/gui-utils.ss +++ b/collects/framework/gui-utils.ss @@ -1,7 +1,14 @@ -(require-library "refer.ss") -(require-library "guiutilss.ss" "framework") -(define-values/invoke-unit/sig - framework:gui-utils^ - (require-library "guiutilsr.ss" "framework") - gui-utils - mred^) +(module gui-utils mzscheme + (require (lib "unitsig.ss") + "gui-utils-sig.ss" + "gui-utils-unit.ss" + (lib "mred-sig.ss" "mred") + (lib "mred.ss" "mred")) + + (provide-signature-elements framework:gui-utils^) + + (define-values/invoke-unit/sig + framework:gui-utils^ + gui-utils@ + #f + mred^)) diff --git a/collects/framework/private/autosave.ss b/collects/framework/private/autosave.ss index 689e43d6..fbff0f0f 100644 --- a/collects/framework/private/autosave.ss +++ b/collects/framework/private/autosave.ss @@ -1,5 +1,6 @@ (module autosave mzscheme (require (lib "unitsig.ss") + (lib "class.ss") "sig.ss" (lib "mred-sig.ss" "mred")) diff --git a/collects/framework/private/canvas.ss b/collects/framework/private/canvas.ss index 6895e272..74affbd7 100644 --- a/collects/framework/private/canvas.ss +++ b/collects/framework/private/canvas.ss @@ -1,5 +1,6 @@ (module canvas mzscheme (require (lib "unitsig.ss") + (lib "class.ss") "sig.ss" (lib "mred-sig.ss" "mred")) diff --git a/collects/framework/private/color-model.ss b/collects/framework/private/color-model.ss index e6f61db3..8c3be1db 100644 --- a/collects/framework/private/color-model.ss +++ b/collects/framework/private/color-model.ss @@ -1,5 +1,6 @@ (module color-model mzscheme (require (lib "unitsig.ss") + (lib "class.ss") "sig.ss" (lib "mred-sig.ss" "mred") (lib "list.ss")) diff --git a/collects/framework/private/editor.ss b/collects/framework/private/editor.ss index ad12c3f0..cda83dbd 100644 --- a/collects/framework/private/editor.ss +++ b/collects/framework/private/editor.ss @@ -1,5 +1,6 @@ (module editor mzscheme (require (lib "unitsig.ss") + (lib "class.ss") "sig.ss" "../gui-utils-sig.ss" (lib "mred-sig.ss" "mred") diff --git a/collects/framework/private/exit.ss b/collects/framework/private/exit.ss index 98e249a7..2a26040c 100644 --- a/collects/framework/private/exit.ss +++ b/collects/framework/private/exit.ss @@ -1,5 +1,6 @@ (module exit mzscheme (require (lib "unitsig.ss") + (lib "class.ss") "sig.ss" "../gui-utils-sig.ss" (lib "mred-sig.ss" "mred") diff --git a/collects/framework/private/finder.ss b/collects/framework/private/finder.ss index 703e8e12..3250e795 100644 --- a/collects/framework/private/finder.ss +++ b/collects/framework/private/finder.ss @@ -1,5 +1,6 @@ (module finder mzscheme (require (lib "unitsig.ss") + (lib "class.ss") "sig.ss" "../gui-utils-sig.ss" (lib "mred-sig.ss" "mred") diff --git a/collects/framework/private/frame.ss b/collects/framework/private/frame.ss index 8d578917..3b7bdec2 100644 --- a/collects/framework/private/frame.ss +++ b/collects/framework/private/frame.ss @@ -1,5 +1,6 @@ (module frame mzscheme (require (lib "unitsig.ss") + (lib "class.ss") "sig.ss" "../gui-utils-sig.ss" (lib "mred-sig.ss" "mred") diff --git a/collects/framework/private/group.ss b/collects/framework/private/group.ss index 20f40d1d..2a793ad2 100644 --- a/collects/framework/private/group.ss +++ b/collects/framework/private/group.ss @@ -1,5 +1,6 @@ (module group mzscheme (require (lib "unitsig.ss") + (lib "class.ss") "sig.ss" (lib "mred-sig.ss" "mred") (lib "list.ss") diff --git a/collects/framework/private/handler.ss b/collects/framework/private/handler.ss index f3dbf0f6..e56f6804 100644 --- a/collects/framework/private/handler.ss +++ b/collects/framework/private/handler.ss @@ -1,5 +1,6 @@ (module handle mzscheme (require (lib "unitsig.ss") + (lib "class.ss") "sig.ss" "../gui-utils-sig.ss" (lib "mred-sig.ss" "mred") diff --git a/collects/framework/private/icon.ss b/collects/framework/private/icon.ss index 6eeabe77..038f1f8e 100644 --- a/collects/framework/private/icon.ss +++ b/collects/framework/private/icon.ss @@ -1,5 +1,6 @@ (module icon mzscheme (require (lib "unitsig.ss") + (lib "class.ss") "sig.ss" (lib "mred-sig.ss" "mred") (lib "mred-sig.ss" "mred")) diff --git a/collects/framework/private/keymap.ss b/collects/framework/private/keymap.ss index 816ad45b..f45bde7c 100644 --- a/collects/framework/private/keymap.ss +++ b/collects/framework/private/keymap.ss @@ -1,5 +1,6 @@ (module keymap mzscheme (require (lib "unitsig.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 3e75a36c..ef57d321 100644 --- a/collects/framework/private/main.ss +++ b/collects/framework/private/main.ss @@ -1,5 +1,6 @@ (module main mzscheme (require (lib "unitsig.ss") + (lib "class.ss") "sig.ss" (lib "mred-sig.ss" "mred")) diff --git a/collects/framework/private/menu.ss b/collects/framework/private/menu.ss index d5b64650..4f3fee84 100644 --- a/collects/framework/private/menu.ss +++ b/collects/framework/private/menu.ss @@ -1,5 +1,6 @@ (module menu mzscheme (require (lib "unitsig.ss") + (lib "class.ss") "sig" (lib "mred-sig.ss" "mred")) diff --git a/collects/framework/private/panel.ss b/collects/framework/private/panel.ss index e4eda36b..499467d9 100644 --- a/collects/framework/private/panel.ss +++ b/collects/framework/private/panel.ss @@ -1,5 +1,6 @@ (module panel mzscheme (require (lib "unitsig.ss") + (lib "class.ss") "sig" (lib "mred-sig.ss" "mred") (lib "list.ss")) diff --git a/collects/framework/private/pasteboard.ss b/collects/framework/private/pasteboard.ss index 2452ac86..c4fa3018 100644 --- a/collects/framework/private/pasteboard.ss +++ b/collects/framework/private/pasteboard.ss @@ -1,5 +1,6 @@ (module pasteboard mzscheme (require (lib "unitsig.ss") + (lib "class.ss") "sig" (lib "mred-sig.ss" "mred")) diff --git a/collects/framework/private/path-util.ss b/collects/framework/private/path-util.ss index d9307562..6ae95124 100644 --- a/collects/framework/private/path-util.ss +++ b/collects/framework/private/path-util.ss @@ -1,5 +1,6 @@ (module path-utils mzscheme (require (lib "unitsig.ss") + (lib "class.ss") "sig" (lib "mred-sig.ss" "mred")) diff --git a/collects/framework/private/preferences.ss b/collects/framework/private/preferences.ss index 3aa6b421..a06dfd28 100644 --- a/collects/framework/private/preferences.ss +++ b/collects/framework/private/preferences.ss @@ -1,5 +1,6 @@ (module preferences mzscheme (require (lib "unitsig.ss") + (lib "class.ss") "sig" (lib "mred-sig.ss" "mred") (lib "pretty.ss")) diff --git a/collects/framework/private/scheme.ss b/collects/framework/private/scheme.ss index 2d1e46e2..52b92745 100644 --- a/collects/framework/private/scheme.ss +++ b/collects/framework/private/scheme.ss @@ -5,6 +5,7 @@ (module scheme mzscheme (require (lib "unitsig.ss") + (lib "class.ss") "sig" (lib "mred-sig.ss" "mred") (lib "list.ss") diff --git a/collects/framework/private/text.ss b/collects/framework/private/text.ss index c93b68ae..8e79d7fe 100644 --- a/collects/framework/private/text.ss +++ b/collects/framework/private/text.ss @@ -1,5 +1,6 @@ (module text mzscheme (require (lib "unitsig.ss") + (lib "class.ss") "sig" "../gui-utils-sig.ss" (lib "mred-sig.ss" "mred")