diff --git a/collects/mred/private/app.ss b/collects/mred/private/app.ss index ffa9aa4f3d..dbc04ff393 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "lock.ss" "helper.ss" "wx.ss" diff --git a/collects/mred/private/check.ss b/collects/mred/private/check.ss index 0d3809e45a..67771b7b74 100644 --- a/collects/mred/private/check.ss +++ b/collects/mred/private/check.ss @@ -1,6 +1,6 @@ (module check mzscheme (require (lib "class.ss") - "wxkernel.ss" + (prefix wx: "kernel.ss") "wx.ss" "const.ss") (provide (protect (all-defined))) diff --git a/collects/mred/private/const.ss b/collects/mred/private/const.ss index e83ed00b67..d19fee2138 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") - "wxkernel.ss") + (prefix wx: "kernel.ss")) (provide (protect (all-defined))) ;; default spacing between items. diff --git a/collects/mred/private/editor.ss b/collects/mred/private/editor.ss index 0d5006abcc..29a135aa5d 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "seqcontract.ss" "lock.ss" "check.ss" diff --git a/collects/mred/private/filedialog.ss b/collects/mred/private/filedialog.ss index 197238e9a3..ba3667a27d 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "lock.ss" "wx.ss" "cycle.ss" diff --git a/collects/mred/private/fontdialog.ss b/collects/mred/private/fontdialog.ss index 33c81904c8..d2aa036090 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "lock.ss" "wx.ss" "cycle.ss" diff --git a/collects/mred/private/gdi.ss b/collects/mred/private/gdi.ss index 7192772f65..f9dd070ced 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "lock.ss" "check.ss" "wx.ss" diff --git a/collects/mred/private/helper.ss b/collects/mred/private/helper.ss index 3f431c5098..b938d13892 100644 --- a/collects/mred/private/helper.ss +++ b/collects/mred/private/helper.ss @@ -1,6 +1,6 @@ (module helper mzscheme (require (lib "class.ss") - "wxkernel.ss" + (prefix wx: "kernel.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 ae67553704..e63d9aff5a 100644 --- a/collects/mred/private/lock.ss +++ b/collects/mred/private/lock.ss @@ -1,5 +1,5 @@ (module lock mzscheme - (require "wxkernel.ss") + (require (prefix wx: "kernel.ss")) (provide (protect as-entry as-exit entry-point diff --git a/collects/mred/private/messagebox.ss b/collects/mred/private/messagebox.ss index 99eaacf9d5..903c83af52 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "const.ss" "check.ss" "helper.ss" diff --git a/collects/mred/private/misc.ss b/collects/mred/private/misc.ss index 9839169976..a41e27aaa4 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") - "wxkernel.ss") + (prefix wx: "kernel.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 e85ed2f8d3..70b462b395 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "lock.ss" "const.ss" "check.ss" diff --git a/collects/mred/private/mrcanvas.ss b/collects/mred/private/mrcanvas.ss index d9e3130a7d..03fd9ea95e 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "lock.ss" "const.ss" "kw.ss" diff --git a/collects/mred/private/mrcontainer.ss b/collects/mred/private/mrcontainer.ss index 2935a76d32..21f38ce65e 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "lock.ss" "helper.ss" "const.ss" diff --git a/collects/mred/private/mrgroupbox.ss b/collects/mred/private/mrgroupbox.ss index f486362c0a..f556dc0a4c 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "lock.ss" "const.ss" "check.ss" diff --git a/collects/mred/private/mritem.ss b/collects/mred/private/mritem.ss index 629ad25a0b..32f0042fa0 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "lock.ss" "const.ss" "kw.ss" diff --git a/collects/mred/private/mrmenu.ss b/collects/mred/private/mrmenu.ss index a91ac20a68..ed655ee62a 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "lock.ss" "const.ss" "helper.ss" diff --git a/collects/mred/private/mrpanel.ss b/collects/mred/private/mrpanel.ss index 011d315d9b..11d327b60f 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "lock.ss" "const.ss" "check.ss" diff --git a/collects/mred/private/mrpopup.ss b/collects/mred/private/mrpopup.ss index 64750db7ff..dfa3d2ffbf 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "lock.ss" "const.ss" "helper.ss" diff --git a/collects/mred/private/mrtabgroup.ss b/collects/mred/private/mrtabgroup.ss index a60a9dce41..2483e1418b 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "lock.ss" "const.ss" "check.ss" diff --git a/collects/mred/private/mrtextfield.ss b/collects/mred/private/mrtextfield.ss index efc60fb8c2..2769a55f99 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "lock.ss" "const.ss" "check.ss" diff --git a/collects/mred/private/mrtop.ss b/collects/mred/private/mrtop.ss index 9f03ca2d92..8a8d420579 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "lock.ss" "helper.ss" "const.ss" diff --git a/collects/mred/private/mrwindow.ss b/collects/mred/private/mrwindow.ss index 1749bbcc72..63b466d957 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "lock.ss" "helper.ss" "const.ss" diff --git a/collects/mred/private/repl.ss b/collects/mred/private/repl.ss index 058800db2d..a75a1252df 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "editor.ss" "app.ss" "mrtop.ss" diff --git a/collects/mred/private/snipfile.ss b/collects/mred/private/snipfile.ss index 3c7675d085..76de33485a 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "check.ss" "editor.ss") diff --git a/collects/mred/private/wxcanvas.ss b/collects/mred/private/wxcanvas.ss index fbda8d0994..f9b7f88042 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "lock.ss" "helper.ss" "wx.ss" diff --git a/collects/mred/private/wxcontainer.ss b/collects/mred/private/wxcontainer.ss index 904843458f..bb823a26ea 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "lock.ss" "helper.ss" "wx.ss") diff --git a/collects/mred/private/wxgroupbox.ss b/collects/mred/private/wxgroupbox.ss index e89fddd71a..d8b9d95d4a 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "lock.ss" "wx.ss" "const.ss" diff --git a/collects/mred/private/wxitem.ss b/collects/mred/private/wxitem.ss index 7f08f35b4e..aa1688d1db 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "lock.ss" "helper.ss" "const.ss" diff --git a/collects/mred/private/wxkernel.ss b/collects/mred/private/wxkernel.ss deleted file mode 100644 index 146e7d0ac6..0000000000 --- a/collects/mred/private/wxkernel.ss +++ /dev/null @@ -1,7 +0,0 @@ - -;; 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 23a980cf33..8b6835a4ba 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "lock.ss" "const.ss" "helper.ss" diff --git a/collects/mred/private/wxpanel.ss b/collects/mred/private/wxpanel.ss index f712395d6f..bcc04f9820 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "lock.ss" "const.ss" "helper.ss" diff --git a/collects/mred/private/wxtabgroup.ss b/collects/mred/private/wxtabgroup.ss index f5dc347513..0381e3a079 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "lock.ss" "wx.ss" "const.ss" diff --git a/collects/mred/private/wxtextfield.ss b/collects/mred/private/wxtextfield.ss index a4cd97bb38..3f5af68ac6 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "lock.ss" "const.ss" "check.ss" diff --git a/collects/mred/private/wxtop.ss b/collects/mred/private/wxtop.ss index c85d2916e4..f24b14b6d0 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "lock.ss" "helper.ss" "const.ss" @@ -655,4 +655,4 @@ (make-top-level-window-glue% (class100 (make-top-container% wx:dialog% #t) args (sequence - (apply super-init args)))))) \ No newline at end of file + (apply super-init args)))))) diff --git a/collects/mred/private/wxwindow.ss b/collects/mred/private/wxwindow.ss index 55edc2fd68..1d838645a9 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") - "wxkernel.ss" + (prefix wx: "kernel.ss") "lock.ss" "helper.ss" "wx.ss")