diff --git a/collects/mred/private/wxme/editor-data.rkt b/collects/mred/private/wxme/editor-data.rkt index ff32ff2cc2..2505f39771 100644 --- a/collects/mred/private/wxme/editor-data.rkt +++ b/collects/mred/private/wxme/editor-data.rkt @@ -3,11 +3,11 @@ (require scheme/class scheme/file file/convertible "../syntax.ss" - racket/snip/snip-flags + racket/snip/private/snip-flags "private.ss" "style.ss" - "load-one.rkt" - (only-in "cycle.ss" + racket/snip/private/load-one + (only-in "cycle.ss" editor-stream-in% editor-stream-out% get-editor-data-class set-get-editor-data-class!) "../wx/common/event.rkt" @@ -166,4 +166,4 @@ (set-get-editor-data-class! (lambda (name) - (load-one name 'editor-data-class editor-data-class%))) \ No newline at end of file + (load-one name 'editor-data-class editor-data-class%))) diff --git a/collects/mred/private/wxme/editor-snip-class.rkt b/collects/mred/private/wxme/editor-snip-class.rkt index 5ee5e2ef11..5a9c5a706e 100644 --- a/collects/mred/private/wxme/editor-snip-class.rkt +++ b/collects/mred/private/wxme/editor-snip-class.rkt @@ -3,7 +3,7 @@ (require racket/class racket/file file/convertible "../syntax.ss" - racket/snip/snip-flags + racket/snip/private/snip-flags "private.ss" "style.ss" racket/snip diff --git a/collects/mred/private/wxme/editor-snip.rkt b/collects/mred/private/wxme/editor-snip.rkt index bca02aa9e0..97f435e14b 100644 --- a/collects/mred/private/wxme/editor-snip.rkt +++ b/collects/mred/private/wxme/editor-snip.rkt @@ -4,7 +4,7 @@ "private.ss" "const.ss" racket/snip - racket/snip/snip-flags + racket/snip/private/snip-flags "standard-snip-admin.rkt" "editor.ss" "editor-admin.ss" diff --git a/collects/mred/private/wxme/editor.rkt b/collects/mred/private/wxme/editor.rkt index 8e7d482c71..010632c855 100644 --- a/collects/mred/private/wxme/editor.rkt +++ b/collects/mred/private/wxme/editor.rkt @@ -6,7 +6,7 @@ "private.ss" "style.ss" racket/snip - racket/snip/snip-flags + racket/snip/private/snip-flags "editor-admin.ss" "stream.ss" "undo.ss" diff --git a/collects/mred/private/wxme/mline.rkt b/collects/mred/private/wxme/mline.rkt index 497f1326d9..2194ec3797 100644 --- a/collects/mred/private/wxme/mline.rkt +++ b/collects/mred/private/wxme/mline.rkt @@ -3,7 +3,7 @@ "../syntax.ss" "const.ss" racket/snip - racket/snip/snip-flags + racket/snip/private/snip-flags "private.ss") (provide create-mline diff --git a/collects/mred/private/wxme/pasteboard.rkt b/collects/mred/private/wxme/pasteboard.rkt index fc7e53839b..bf15a50be0 100644 --- a/collects/mred/private/wxme/pasteboard.rkt +++ b/collects/mred/private/wxme/pasteboard.rkt @@ -10,7 +10,7 @@ "undo.ss" "style.ss" racket/snip - racket/snip/snip-flags + racket/snip/private/snip-flags "standard-snip-admin.rkt" "keymap.ss" (only-in "cycle.ss" set-pasteboard%!) diff --git a/collects/mred/private/wxme/text.rkt b/collects/mred/private/wxme/text.rkt index e8844c2c04..88794f917d 100644 --- a/collects/mred/private/wxme/text.rkt +++ b/collects/mred/private/wxme/text.rkt @@ -12,7 +12,7 @@ "undo.ss" "style.ss" racket/snip - racket/snip/snip-flags + racket/snip/private/snip-flags "standard-snip-admin.rkt" "keymap.ss" (only-in "cycle.ss" set-text%!) diff --git a/collects/mred/private/wxme/undo.rkt b/collects/mred/private/wxme/undo.rkt index 562d7a1ace..e76906d760 100644 --- a/collects/mred/private/wxme/undo.rkt +++ b/collects/mred/private/wxme/undo.rkt @@ -2,7 +2,7 @@ (require scheme/class "private.ss" racket/snip - racket/snip/snip-flags) + racket/snip/private/snip-flags) (provide change-record% proc-record% diff --git a/collects/racket/snip.rkt b/collects/racket/snip.rkt index b863bfaf9c..214201acd0 100644 --- a/collects/racket/snip.rkt +++ b/collects/racket/snip.rkt @@ -1,3 +1,3 @@ #lang racket/base -(require "snip/snip.rkt" "snip/snip-admin.rkt") -(provide (all-from-out "snip/snip.rkt" "snip/snip-admin.rkt")) \ No newline at end of file +(require "snip/private/snip.rkt" "snip/private/snip-admin.rkt") +(provide (all-from-out "snip/private/snip.rkt" "snip/private/snip-admin.rkt")) \ No newline at end of file diff --git a/collects/mred/private/wxme/load-one.rkt b/collects/racket/snip/private/load-one.rkt similarity index 100% rename from collects/mred/private/wxme/load-one.rkt rename to collects/racket/snip/private/load-one.rkt diff --git a/collects/racket/snip/snip-admin.rkt b/collects/racket/snip/private/snip-admin.rkt similarity index 97% rename from collects/racket/snip/snip-admin.rkt rename to collects/racket/snip/private/snip-admin.rkt index bca65c8e72..87dda1561d 100644 --- a/collects/racket/snip/snip-admin.rkt +++ b/collects/racket/snip/private/snip-admin.rkt @@ -1,6 +1,6 @@ #lang scheme/base (require scheme/class - mred/private/syntax + racket/draw/private/syntax "snip.ss") (provide snip-admin%) diff --git a/collects/racket/snip/snip-flags.rkt b/collects/racket/snip/private/snip-flags.rkt similarity index 100% rename from collects/racket/snip/snip-flags.rkt rename to collects/racket/snip/private/snip-flags.rkt diff --git a/collects/racket/snip/snip.rkt b/collects/racket/snip/private/snip.rkt similarity index 99% rename from collects/racket/snip/snip.rkt rename to collects/racket/snip/private/snip.rkt index 62cc827674..34111ac492 100644 --- a/collects/racket/snip/snip.rkt +++ b/collects/racket/snip/private/snip.rkt @@ -2,11 +2,10 @@ (require scheme/class scheme/file file/convertible "snip-flags.ss" - mred/private/syntax - mred/private/wxme/private + "load-one.rkt" + racket/draw/private/syntax mred/private/wxme/style - mred/private/wxme/load-one - mred/private/wx/common/event + mred/private/wxme/private racket/draw) (provide snip% @@ -54,8 +53,8 @@ ;; these are used only in contracts ;; we don't want the real definitions b/c they require the gui -(define-values (editor-stream-in% editor-stream-out% snip-admin%) - (values object% object% object%)) +(define-values (editor-stream-in% editor-stream-out% snip-admin% mouse-event% key-event%) + (values object% object% object% object% object%)) (define (symbol-list? l) (and (list? l) (andmap symbol? l)))