diff --git a/collects/mred/private/app.ss b/collects/mred/private/app.ss index dbc04ff393..ffa9aa4f3d 100644 --- a/collects/mred/private/app.ss +++ b/collects/mred/private/app.ss @@ -1,7 +1,7 @@ (module app mzscheme (require (lib "class.ss") (lib "class100.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "lock.ss" "helper.ss" "wx.ss" diff --git a/collects/mred/private/check.ss b/collects/mred/private/check.ss index 67771b7b74..0d3809e45a 100644 --- a/collects/mred/private/check.ss +++ b/collects/mred/private/check.ss @@ -1,6 +1,6 @@ (module check mzscheme (require (lib "class.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "wx.ss" "const.ss") (provide (protect (all-defined))) diff --git a/collects/mred/private/const.ss b/collects/mred/private/const.ss index d19fee2138..e83ed00b67 100644 --- a/collects/mred/private/const.ss +++ b/collects/mred/private/const.ss @@ -1,7 +1,7 @@ (module const mzscheme (require (lib "class.ss") (lib "file.ss") - (prefix wx: "kernel.ss")) + "wxkernel.ss") (provide (protect (all-defined))) ;; default spacing between items. diff --git a/collects/mred/private/editor.ss b/collects/mred/private/editor.ss index 29a135aa5d..0d5006abcc 100644 --- a/collects/mred/private/editor.ss +++ b/collects/mred/private/editor.ss @@ -4,7 +4,7 @@ (lib "etc.ss") (lib "list.ss") (lib "file.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "seqcontract.ss" "lock.ss" "check.ss" diff --git a/collects/mred/private/filedialog.ss b/collects/mred/private/filedialog.ss index ba3667a27d..197238e9a3 100644 --- a/collects/mred/private/filedialog.ss +++ b/collects/mred/private/filedialog.ss @@ -3,7 +3,7 @@ (lib "class100.ss") (lib "etc.ss") (lib "list.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "lock.ss" "wx.ss" "cycle.ss" diff --git a/collects/mred/private/fontdialog.ss b/collects/mred/private/fontdialog.ss index d2aa036090..33c81904c8 100644 --- a/collects/mred/private/fontdialog.ss +++ b/collects/mred/private/fontdialog.ss @@ -3,7 +3,7 @@ (lib "class100.ss") (lib "etc.ss") (lib "list.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "lock.ss" "wx.ss" "cycle.ss" diff --git a/collects/mred/private/gdi.ss b/collects/mred/private/gdi.ss index f9dd070ced..7192772f65 100644 --- a/collects/mred/private/gdi.ss +++ b/collects/mred/private/gdi.ss @@ -1,7 +1,7 @@ (module gdi mzscheme (require (lib "class.ss") (lib "class100.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "lock.ss" "check.ss" "wx.ss" diff --git a/collects/mred/private/helper.ss b/collects/mred/private/helper.ss index b938d13892..3f431c5098 100644 --- a/collects/mred/private/helper.ss +++ b/collects/mred/private/helper.ss @@ -1,6 +1,6 @@ (module helper mzscheme (require (lib "class.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "lock.ss") (provide (protect (struct child-info (x-min y-min x-margin y-margin x-stretch y-stretch)) diff --git a/collects/mred/private/lock.ss b/collects/mred/private/lock.ss index e63d9aff5a..ae67553704 100644 --- a/collects/mred/private/lock.ss +++ b/collects/mred/private/lock.ss @@ -1,5 +1,5 @@ (module lock mzscheme - (require (prefix wx: "kernel.ss")) + (require "wxkernel.ss") (provide (protect as-entry as-exit entry-point diff --git a/collects/mred/private/messagebox.ss b/collects/mred/private/messagebox.ss index 903c83af52..99eaacf9d5 100644 --- a/collects/mred/private/messagebox.ss +++ b/collects/mred/private/messagebox.ss @@ -2,7 +2,7 @@ (require (lib "class.ss") (lib "class100.ss") (lib "etc.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "const.ss" "check.ss" "helper.ss" diff --git a/collects/mred/private/misc.ss b/collects/mred/private/misc.ss index a41e27aaa4..9839169976 100644 --- a/collects/mred/private/misc.ss +++ b/collects/mred/private/misc.ss @@ -2,7 +2,7 @@ (require (lib "class.ss") (lib "file.ss") (lib "process.ss") - (prefix wx: "kernel.ss")) + "wxkernel.ss") (provide file-creator-and-type hide-cursor-until-moved diff --git a/collects/mred/private/moredialogs.ss b/collects/mred/private/moredialogs.ss index 70b462b395..e85ed2f8d3 100644 --- a/collects/mred/private/moredialogs.ss +++ b/collects/mred/private/moredialogs.ss @@ -3,7 +3,7 @@ (lib "class100.ss") (lib "etc.ss") (lib "list.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "lock.ss" "const.ss" "check.ss" diff --git a/collects/mred/private/mrcanvas.ss b/collects/mred/private/mrcanvas.ss index 03fd9ea95e..d9e3130a7d 100644 --- a/collects/mred/private/mrcanvas.ss +++ b/collects/mred/private/mrcanvas.ss @@ -2,7 +2,7 @@ (require (lib "class.ss") (lib "class100.ss") (lib "list.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "lock.ss" "const.ss" "kw.ss" diff --git a/collects/mred/private/mrcontainer.ss b/collects/mred/private/mrcontainer.ss index 21f38ce65e..2935a76d32 100644 --- a/collects/mred/private/mrcontainer.ss +++ b/collects/mred/private/mrcontainer.ss @@ -2,7 +2,7 @@ (require (lib "class.ss") (lib "class100.ss") (lib "list.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "lock.ss" "helper.ss" "const.ss" diff --git a/collects/mred/private/mrgroupbox.ss b/collects/mred/private/mrgroupbox.ss index f556dc0a4c..f486362c0a 100644 --- a/collects/mred/private/mrgroupbox.ss +++ b/collects/mred/private/mrgroupbox.ss @@ -1,7 +1,7 @@ (module mrgroupbox mzscheme (require (lib "class.ss") (lib "class100.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "lock.ss" "const.ss" "check.ss" diff --git a/collects/mred/private/mritem.ss b/collects/mred/private/mritem.ss index 32f0042fa0..629ad25a0b 100644 --- a/collects/mred/private/mritem.ss +++ b/collects/mred/private/mritem.ss @@ -2,7 +2,7 @@ (require (lib "class.ss") (lib "class100.ss") (lib "list.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "lock.ss" "const.ss" "kw.ss" diff --git a/collects/mred/private/mrmenu.ss b/collects/mred/private/mrmenu.ss index ed655ee62a..a91ac20a68 100644 --- a/collects/mred/private/mrmenu.ss +++ b/collects/mred/private/mrmenu.ss @@ -2,7 +2,7 @@ (require (lib "class.ss") (lib "class100.ss") (lib "list.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "lock.ss" "const.ss" "helper.ss" diff --git a/collects/mred/private/mrpanel.ss b/collects/mred/private/mrpanel.ss index 11d327b60f..011d315d9b 100644 --- a/collects/mred/private/mrpanel.ss +++ b/collects/mred/private/mrpanel.ss @@ -1,7 +1,7 @@ (module mrpanel mzscheme (require (lib "class.ss") (lib "class100.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "lock.ss" "const.ss" "check.ss" diff --git a/collects/mred/private/mrpopup.ss b/collects/mred/private/mrpopup.ss index dfa3d2ffbf..64750db7ff 100644 --- a/collects/mred/private/mrpopup.ss +++ b/collects/mred/private/mrpopup.ss @@ -2,7 +2,7 @@ (require (lib "class.ss") (lib "class100.ss") (lib "list.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "lock.ss" "const.ss" "helper.ss" diff --git a/collects/mred/private/mrtabgroup.ss b/collects/mred/private/mrtabgroup.ss index 2483e1418b..a60a9dce41 100644 --- a/collects/mred/private/mrtabgroup.ss +++ b/collects/mred/private/mrtabgroup.ss @@ -1,7 +1,7 @@ (module mrtabgroup mzscheme (require (lib "class.ss") (lib "class100.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "lock.ss" "const.ss" "check.ss" diff --git a/collects/mred/private/mrtextfield.ss b/collects/mred/private/mrtextfield.ss index 2769a55f99..efc60fb8c2 100644 --- a/collects/mred/private/mrtextfield.ss +++ b/collects/mred/private/mrtextfield.ss @@ -2,7 +2,7 @@ (require (lib "class.ss") (lib "class100.ss") (lib "list.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "lock.ss" "const.ss" "check.ss" diff --git a/collects/mred/private/mrtop.ss b/collects/mred/private/mrtop.ss index 8a8d420579..9f03ca2d92 100644 --- a/collects/mred/private/mrtop.ss +++ b/collects/mred/private/mrtop.ss @@ -3,7 +3,7 @@ (lib "class100.ss") (lib "etc.ss") (lib "list.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "lock.ss" "helper.ss" "const.ss" diff --git a/collects/mred/private/mrwindow.ss b/collects/mred/private/mrwindow.ss index 63b466d957..1749bbcc72 100644 --- a/collects/mred/private/mrwindow.ss +++ b/collects/mred/private/mrwindow.ss @@ -1,7 +1,7 @@ (module mrwindow mzscheme (require (lib "class.ss") (lib "class100.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "lock.ss" "helper.ss" "const.ss" diff --git a/collects/mred/private/repl.ss b/collects/mred/private/repl.ss index a75a1252df..058800db2d 100644 --- a/collects/mred/private/repl.ss +++ b/collects/mred/private/repl.ss @@ -1,7 +1,7 @@ (module repl mzscheme (require (lib "class.ss") (lib "class100.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "editor.ss" "app.ss" "mrtop.ss" diff --git a/collects/mred/private/snipfile.ss b/collects/mred/private/snipfile.ss index 76de33485a..3c7675d085 100644 --- a/collects/mred/private/snipfile.ss +++ b/collects/mred/private/snipfile.ss @@ -3,7 +3,7 @@ (lib "etc.ss") (lib "port.ss") (lib "moddep.ss" "syntax") - (prefix wx: "kernel.ss") + "wxkernel.ss" "check.ss" "editor.ss") diff --git a/collects/mred/private/wxcanvas.ss b/collects/mred/private/wxcanvas.ss index f9b7f88042..fbda8d0994 100644 --- a/collects/mred/private/wxcanvas.ss +++ b/collects/mred/private/wxcanvas.ss @@ -1,7 +1,7 @@ (module wxcanvas mzscheme (require (lib "class.ss") (lib "class100.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "lock.ss" "helper.ss" "wx.ss" diff --git a/collects/mred/private/wxcontainer.ss b/collects/mred/private/wxcontainer.ss index bb823a26ea..904843458f 100644 --- a/collects/mred/private/wxcontainer.ss +++ b/collects/mred/private/wxcontainer.ss @@ -2,7 +2,7 @@ (require (lib "class.ss") (lib "class100.ss") (lib "list.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "lock.ss" "helper.ss" "wx.ss") diff --git a/collects/mred/private/wxgroupbox.ss b/collects/mred/private/wxgroupbox.ss index d8b9d95d4a..e89fddd71a 100644 --- a/collects/mred/private/wxgroupbox.ss +++ b/collects/mred/private/wxgroupbox.ss @@ -1,7 +1,7 @@ (module wxgroupbox mzscheme (require (lib "class.ss") (lib "class100.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "lock.ss" "wx.ss" "const.ss" diff --git a/collects/mred/private/wxitem.ss b/collects/mred/private/wxitem.ss index aa1688d1db..7f08f35b4e 100644 --- a/collects/mred/private/wxitem.ss +++ b/collects/mred/private/wxitem.ss @@ -3,7 +3,7 @@ (lib "class100.ss") (lib "etc.ss") (lib "file.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "lock.ss" "helper.ss" "const.ss" diff --git a/collects/mred/private/wxkernel.ss b/collects/mred/private/wxkernel.ss new file mode 100644 index 0000000000..146e7d0ac6 --- /dev/null +++ b/collects/mred/private/wxkernel.ss @@ -0,0 +1,7 @@ + +;; Adding the "wx:" prefix here can prevent keeping +;; redundant import information in all the other files. +(module wxkernel mzscheme + (require (prefix wx: "kernel.ss")) + (provide (all-from "kernel.ss"))) + diff --git a/collects/mred/private/wxmenu.ss b/collects/mred/private/wxmenu.ss index 8b6835a4ba..23a980cf33 100644 --- a/collects/mred/private/wxmenu.ss +++ b/collects/mred/private/wxmenu.ss @@ -2,7 +2,7 @@ (require (lib "class.ss") (lib "class100.ss") (lib "list.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "lock.ss" "const.ss" "helper.ss" diff --git a/collects/mred/private/wxpanel.ss b/collects/mred/private/wxpanel.ss index bcc04f9820..f712395d6f 100644 --- a/collects/mred/private/wxpanel.ss +++ b/collects/mred/private/wxpanel.ss @@ -2,7 +2,7 @@ (require (lib "class.ss") (lib "class100.ss") (lib "list.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "lock.ss" "const.ss" "helper.ss" diff --git a/collects/mred/private/wxtabgroup.ss b/collects/mred/private/wxtabgroup.ss index 0381e3a079..f5dc347513 100644 --- a/collects/mred/private/wxtabgroup.ss +++ b/collects/mred/private/wxtabgroup.ss @@ -1,7 +1,7 @@ (module wxtabgroup mzscheme (require (lib "class.ss") (lib "class100.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "lock.ss" "wx.ss" "const.ss" diff --git a/collects/mred/private/wxtextfield.ss b/collects/mred/private/wxtextfield.ss index 3f5af68ac6..a4cd97bb38 100644 --- a/collects/mred/private/wxtextfield.ss +++ b/collects/mred/private/wxtextfield.ss @@ -1,7 +1,7 @@ (module wxtextfield mzscheme (require (lib "class.ss") (lib "class100.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "lock.ss" "const.ss" "check.ss" diff --git a/collects/mred/private/wxtop.ss b/collects/mred/private/wxtop.ss index a310f2f76d..c85d2916e4 100644 --- a/collects/mred/private/wxtop.ss +++ b/collects/mred/private/wxtop.ss @@ -3,7 +3,7 @@ (lib "class100.ss") (lib "etc.ss") (lib "list.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "lock.ss" "helper.ss" "const.ss" diff --git a/collects/mred/private/wxwindow.ss b/collects/mred/private/wxwindow.ss index 1d838645a9..55edc2fd68 100644 --- a/collects/mred/private/wxwindow.ss +++ b/collects/mred/private/wxwindow.ss @@ -1,7 +1,7 @@ (module wxwindow mzscheme (require (lib "class.ss") (lib "class100.ss") - (prefix wx: "kernel.ss") + "wxkernel.ss" "lock.ss" "helper.ss" "wx.ss")