diff --git a/collects/mred/private/editor.rkt b/collects/mred/private/editor.rkt index 947ca83128..61819f4fc4 100644 --- a/collects/mred/private/editor.rkt +++ b/collects/mred/private/editor.rkt @@ -5,7 +5,7 @@ mzlib/list mzlib/file (prefix wx: "kernel.rkt") - (prefix wx: racket/snip) + (prefix wx: racket/snip/private/style) (prefix wx: "wxme/keymap.rkt") (prefix wx: "wxme/editor.rkt") (prefix wx: "wxme/text.rkt") diff --git a/collects/mred/private/helper.rkt b/collects/mred/private/helper.rkt index dd10a7823f..837633eff1 100644 --- a/collects/mred/private/helper.rkt +++ b/collects/mred/private/helper.rkt @@ -1,7 +1,7 @@ (module helper mzscheme (require mzlib/class (prefix wx: "kernel.rkt") - (prefix wx: racket/snip) + (prefix wx: racket/snip/private/style) "lock.rkt") (provide (protect (struct child-info (x-min y-min x-margin y-margin x-stretch y-stretch)) diff --git a/collects/mred/private/moredialogs.rkt b/collects/mred/private/moredialogs.rkt index 1430c3300e..4557c8289f 100644 --- a/collects/mred/private/moredialogs.rkt +++ b/collects/mred/private/moredialogs.rkt @@ -1,7 +1,7 @@ #lang racket/base (require racket/class (prefix-in wx: "kernel.rkt") - (prefix-in wx: racket/snip) + (prefix-in wx: racket/snip/private/style) "lock.rkt" "const.rkt" "check.rkt" diff --git a/collects/mred/private/path-dialog.rkt b/collects/mred/private/path-dialog.rkt index bb55947aed..1ccbe561fe 100644 --- a/collects/mred/private/path-dialog.rkt +++ b/collects/mred/private/path-dialog.rkt @@ -1,7 +1,7 @@ (module path-dialog mzscheme (require mzlib/class mzlib/list mzlib/string mzlib/file (prefix wx: "kernel.rkt") - (prefix wx: racket/snip) + (prefix wx: racket/snip/private/style) racket/snip/private/prefs "helper.rkt" "mrtop.rkt" "mritem.rkt" "mrpanel.rkt" "mrtextfield.rkt" "messagebox.rkt" "mrmenu.rkt" diff --git a/collects/mred/private/repl.rkt b/collects/mred/private/repl.rkt index a5a9bce4c3..8529e78f13 100644 --- a/collects/mred/private/repl.rkt +++ b/collects/mred/private/repl.rkt @@ -2,7 +2,7 @@ (require mzlib/class mzlib/class100 (prefix wx: "kernel.rkt") - (prefix wx: racket/snip) + (prefix wx: racket/snip/private/style) "editor.rkt" "app.rkt" "mrtop.rkt" diff --git a/collects/mred/private/snipfile.rkt b/collects/mred/private/snipfile.rkt index 63916291aa..d2c96928a1 100644 --- a/collects/mred/private/snipfile.rkt +++ b/collects/mred/private/snipfile.rkt @@ -3,7 +3,7 @@ racket/port syntax/moddep (prefix-in wx: "kernel.rkt") - (prefix-in wx: racket/snip) + (prefix-in wx: racket/snip/private/snip) "check.rkt" "editor.rkt") diff --git a/collects/mred/private/wx/cocoa/canvas.rkt b/collects/mred/private/wx/cocoa/canvas.rkt index 7c5af3ef51..e023ebe73e 100644 --- a/collects/mred/private/wx/cocoa/canvas.rkt +++ b/collects/mred/private/wx/cocoa/canvas.rkt @@ -4,8 +4,8 @@ racket/class racket/draw racket/draw/private/gl-context - racket/draw/private/color - racket/draw/private/bitmap + (except-in racket/draw/private/color color%) + (only-in racket/draw/private/bitmap quartz-bitmap%) "pool.rkt" "utils.rkt" "const.rkt" diff --git a/collects/mred/private/wx/cocoa/procs.rkt b/collects/mred/private/wx/cocoa/procs.rkt index 68eb670cec..1d1400d10b 100644 --- a/collects/mred/private/wx/cocoa/procs.rkt +++ b/collects/mred/private/wx/cocoa/procs.rkt @@ -2,7 +2,7 @@ (require "../../syntax.rkt" racket/class racket/draw - racket/draw/private/bitmap + (only-in racket/draw/private/bitmap quartz-bitmap%) ffi/unsafe ffi/unsafe/objc "utils.rkt" diff --git a/collects/mred/private/wx/gtk/canvas.rkt b/collects/mred/private/wx/gtk/canvas.rkt index 03736853ea..fc8b44ff17 100644 --- a/collects/mred/private/wx/gtk/canvas.rkt +++ b/collects/mred/private/wx/gtk/canvas.rkt @@ -3,7 +3,7 @@ racket/class racket/draw ffi/unsafe/alloc - racket/draw/private/color + (except-in racket/draw/private/color color%) racket/draw/private/local "../common/backing-dc.rkt" "../common/canvas-mixin.rkt" diff --git a/collects/mred/private/wxme/editor-admin.rkt b/collects/mred/private/wxme/editor-admin.rkt index e6833af90e..20d0fe0744 100644 --- a/collects/mred/private/wxme/editor-admin.rkt +++ b/collects/mred/private/wxme/editor-admin.rkt @@ -1,7 +1,6 @@ #lang scheme/base (require scheme/class "../syntax.rkt" - racket/snip "private.rkt" racket/snip/private/private (only-in "cycle.rkt" popup-menu%)) diff --git a/collects/mred/private/wxme/editor-snip-class.rkt b/collects/mred/private/wxme/editor-snip-class.rkt index c30feeebbd..45ca3b4964 100644 --- a/collects/mred/private/wxme/editor-snip-class.rkt +++ b/collects/mred/private/wxme/editor-snip-class.rkt @@ -6,7 +6,7 @@ racket/snip/private/snip-flags "private.rkt" racket/snip/private/private - racket/snip + racket/snip/private/snip (only-in "cycle.rkt" editor-stream-in% editor-stream-out% extended-text% extended-pasteboard% extended-editor-snip% diff --git a/collects/mred/private/wxme/editor-snip.rkt b/collects/mred/private/wxme/editor-snip.rkt index 1adb76d825..e539b59cbf 100644 --- a/collects/mred/private/wxme/editor-snip.rkt +++ b/collects/mred/private/wxme/editor-snip.rkt @@ -4,7 +4,8 @@ "private.rkt" racket/snip/private/private "const.rkt" - racket/snip + racket/snip/private/snip + racket/snip/private/snip-admin racket/snip/private/snip-flags "standard-snip-admin.rkt" "editor.rkt" diff --git a/collects/mred/private/wxme/editor.rkt b/collects/mred/private/wxme/editor.rkt index 0ca48ea224..edb1c657bb 100644 --- a/collects/mred/private/wxme/editor.rkt +++ b/collects/mred/private/wxme/editor.rkt @@ -5,7 +5,7 @@ racket/port "../syntax.rkt" "private.rkt" - racket/snip + racket/snip/private/snip racket/snip/private/private racket/snip/private/style racket/snip/private/snip-flags diff --git a/collects/mred/private/wxme/mline.rkt b/collects/mred/private/wxme/mline.rkt index 788406689c..d2b9c8d3d7 100644 --- a/collects/mred/private/wxme/mline.rkt +++ b/collects/mred/private/wxme/mline.rkt @@ -2,7 +2,7 @@ (require scheme/class "../syntax.rkt" "const.rkt" - racket/snip + racket/snip/private/snip racket/snip/private/snip-flags "private.rkt" racket/snip/private/private) diff --git a/collects/mred/private/wxme/pasteboard.rkt b/collects/mred/private/wxme/pasteboard.rkt index 1234d036c5..7320720de3 100644 --- a/collects/mred/private/wxme/pasteboard.rkt +++ b/collects/mred/private/wxme/pasteboard.rkt @@ -9,8 +9,9 @@ "editor.rkt" "editor-data.rkt" "undo.rkt" - racket/snip + racket/snip/private/snip racket/snip/private/snip-flags + racket/snip/private/style "standard-snip-admin.rkt" "keymap.rkt" (only-in "cycle.rkt" diff --git a/collects/mred/private/wxme/standard-snip-admin.rkt b/collects/mred/private/wxme/standard-snip-admin.rkt index a55eca7256..0f2bb3147b 100644 --- a/collects/mred/private/wxme/standard-snip-admin.rkt +++ b/collects/mred/private/wxme/standard-snip-admin.rkt @@ -1,7 +1,8 @@ #lang scheme/base (require scheme/class "../syntax.rkt" - racket/snip + racket/snip/private/snip + racket/snip/private/snip-admin (only-in "cycle.rkt" popup-menu%) (prefix-in wx: "wx.rkt")) diff --git a/collects/mred/private/wxme/stream.rkt b/collects/mred/private/wxme/stream.rkt index 13cb1308a1..dbb32cbe9d 100644 --- a/collects/mred/private/wxme/stream.rkt +++ b/collects/mred/private/wxme/stream.rkt @@ -3,7 +3,7 @@ "../syntax.rkt" "private.rkt" racket/snip/private/private - racket/snip + racket/snip/private/snip "editor-data.rkt" (only-in "cycle.rkt" set-editor-stream-in%! diff --git a/collects/mred/private/wxme/text.rkt b/collects/mred/private/wxme/text.rkt index 73699b3dfa..f9da2b8f86 100644 --- a/collects/mred/private/wxme/text.rkt +++ b/collects/mred/private/wxme/text.rkt @@ -12,8 +12,9 @@ "editor.rkt" "editor-data.rkt" "undo.rkt" - racket/snip + racket/snip/private/snip racket/snip/private/snip-flags + racket/snip/private/style "standard-snip-admin.rkt" "keymap.rkt" (only-in "cycle.rkt" diff --git a/collects/mred/private/wxme/undo.rkt b/collects/mred/private/wxme/undo.rkt index 3b40aea659..a304d4ca36 100644 --- a/collects/mred/private/wxme/undo.rkt +++ b/collects/mred/private/wxme/undo.rkt @@ -2,7 +2,7 @@ (require scheme/class "private.rkt" racket/snip/private/private - racket/snip + racket/snip/private/snip racket/snip/private/snip-flags) (provide change-record% diff --git a/collects/mred/private/wxtextfield.rkt b/collects/mred/private/wxtextfield.rkt index 3640cd9616..6e4d6b395e 100644 --- a/collects/mred/private/wxtextfield.rkt +++ b/collects/mred/private/wxtextfield.rkt @@ -3,7 +3,7 @@ mzlib/class100 (prefix-in wx: "kernel.rkt") (prefix-in wx: "wxme/text.rkt") - (prefix-in wx: racket/snip) + (prefix-in wx: racket/snip/private/snip) (prefix-in wx: "wxme/editor-canvas.rkt") "lock.rkt" "const.rkt"