diff --git a/collects/mred/mred.rkt b/collects/mred/mred.rkt index 114a98b367..6a8a7a3727 100644 --- a/collects/mred/mred.rkt +++ b/collects/mred/mred.rkt @@ -4,14 +4,13 @@ namespace-anchor->empty-namespace make-base-empty-namespace) scheme/class - racket/draw + racket/draw racket/snip mzlib/etc (prefix wx: "private/kernel.ss") (prefix wx: "private/wxme/style.ss") (prefix wx: "private/wxme/editor.ss") (prefix wx: "private/wxme/text.ss") (prefix wx: "private/wxme/pasteboard.ss") - (prefix wx: racket/snip) (prefix wx: "private/wxme/keymap.ss") (prefix wx: "private/wxme/editor-admin.ss") (prefix wx: "private/wxme/editor-data.ss") @@ -68,7 +67,7 @@ ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (define (make-eventspace) - (parameterize ([wx:the-snip-class-list (wx:make-the-snip-class-list)] + (parameterize ([the-snip-class-list (make-the-snip-class-list)] [wx:the-editor-data-class-list (wx:make-the-editor-data-class-list)]) (wx:make-eventspace))) @@ -120,8 +119,6 @@ get-highlight-background-color get-highlight-text-color get-the-editor-data-class-list - get-the-snip-class-list - image-snip% is-busy? is-color-display? key-event% @@ -142,19 +139,13 @@ read-editor-global-header read-editor-version scroll-event% - snip% - snip-admin% - snip-class% - snip-class-list<%> special-control-key special-option-key map-command-as-meta-key label->plain-label - string-snip% style<%> style-delta% style-list% - tab-snip% write-editor-global-footer write-editor-global-header write-editor-version @@ -183,7 +174,8 @@ [else ".gracketrc"]))] [else #f]))) - (provide (all-from racket/draw)) + (provide (all-from racket/draw) + (all-from racket/snip)) (provide button% canvas% @@ -274,7 +266,6 @@ view-control-font menu-control-font timer% - readable-snip<%> open-input-text-editor open-input-graphical-file open-output-text-editor diff --git a/collects/mred/private/snipfile.rkt b/collects/mred/private/snipfile.rkt index e44b3610e7..017fef6824 100644 --- a/collects/mred/private/snipfile.rkt +++ b/collects/mred/private/snipfile.rkt @@ -8,18 +8,13 @@ "check.ss" "editor.ss") - (provide readable-snip<%> - open-input-text-editor + (provide open-input-text-editor open-input-graphical-file text-editor-load-handler open-output-text-editor ) ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - (define readable-snip<%> - (interface () - read-special)) - (define empty-string (make-bytes 0)) ;; open-input-text-editor : (instanceof text%) num num -> input-port @@ -144,7 +139,7 @@ (next-snip empty-string) (lambda (file line col ppos) (if (is-a? the-snip wx:snip%) - (if (is-a? the-snip readable-snip<%>) + (if (is-a? the-snip wx:readable-snip<%>) (send the-snip read-special file line col ppos) (send the-snip copy)) the-snip)))] diff --git a/collects/racket/snip/snip.rkt b/collects/racket/snip/snip.rkt index 43dae3a96b..62cc827674 100644 --- a/collects/racket/snip/snip.rkt +++ b/collects/racket/snip/snip.rkt @@ -48,6 +48,8 @@ caret-status? + readable-snip<%> + image-type?) ;; these are used only in contracts @@ -1375,4 +1377,8 @@ ;; install the getters: (define get-snip-class (lambda (name) - (load-one name 'snip-class snip-class%))) \ No newline at end of file + (load-one name 'snip-class snip-class%))) + +(define readable-snip<%> + (interface () + read-special))