From 70c7476a383aeb1d9f1eb23912ae11adf357ac16 Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Sun, 19 Dec 2010 21:59:03 -0500 Subject: [PATCH] Move mred/private/wxme/style to racket/snip/private/style. `racket/snip' now exports the style classes and the add,mult-color interfaces. original commit: 491eeaa75940ececb9f1820a940a3d9547c80f1e --- collects/mred/mred.rkt | 9 +-------- collects/mred/private/editor.rkt | 2 +- collects/mred/private/filedialog.rkt | 2 +- collects/mred/private/helper.rkt | 2 +- collects/mred/private/moredialogs.rkt | 2 +- collects/mred/private/path-dialog.rkt | 2 +- collects/mred/private/repl.rkt | 2 +- collects/mred/private/wxme/editor-data.rkt | 8 ++++---- collects/mred/private/wxme/editor-snip-class.rkt | 1 - collects/mred/private/wxme/editor.rkt | 4 ++-- collects/mred/private/wxme/pasteboard.rkt | 1 - collects/mred/private/wxme/private.rkt | 3 +-- collects/mred/private/wxme/text.rkt | 1 - collects/mred/private/wxme/wx.rkt | 8 ++------ collects/scribblings/gui/editor-classes.scrbl | 9 --------- collects/scribblings/gui/snip-classes.scrbl | 9 +++++++++ collects/tests/gracket/wxme.rkt | 1 - 17 files changed, 25 insertions(+), 41 deletions(-) diff --git a/collects/mred/mred.rkt b/collects/mred/mred.rkt index 6a8a7a37..bd725f9d 100644 --- a/collects/mred/mred.rkt +++ b/collects/mred/mred.rkt @@ -7,7 +7,6 @@ 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") @@ -95,8 +94,7 @@ (define n k:n) ... (provide n ...)))))]))) - (propagate add-color<%> - add-editor-keymap-functions + (propagate add-editor-keymap-functions add-text-keymap-functions add-pasteboard-keymap-functions begin-busy-cursor @@ -134,7 +132,6 @@ editor-stream-out-bytes-base% editor-wordbreak-map% mouse-event% - mult-color<%> read-editor-global-footer read-editor-global-header read-editor-version @@ -143,9 +140,6 @@ special-option-key map-command-as-meta-key label->plain-label - style<%> - style-delta% - style-list% write-editor-global-footer write-editor-global-header write-editor-version @@ -154,7 +148,6 @@ eventspace-shutdown? get-panel-background - the-style-list the-editor-wordbreak-map make-screen-bitmap make-gl-bitmap) diff --git a/collects/mred/private/editor.rkt b/collects/mred/private/editor.rkt index 7740a207..e68b77c9 100644 --- a/collects/mred/private/editor.rkt +++ b/collects/mred/private/editor.rkt @@ -5,7 +5,7 @@ mzlib/list mzlib/file (prefix wx: "kernel.ss") - (prefix wx: "wxme/style.ss") + (prefix wx: racket/snip) (prefix wx: "wxme/keymap.ss") (prefix wx: "wxme/editor.ss") (prefix wx: "wxme/text.ss") diff --git a/collects/mred/private/filedialog.rkt b/collects/mred/private/filedialog.rkt index a6f24eb0..9bef19bb 100644 --- a/collects/mred/private/filedialog.rkt +++ b/collects/mred/private/filedialog.rkt @@ -3,7 +3,7 @@ mzlib/etc mzlib/list (prefix wx: "kernel.ss") - (prefix wx: "wxme/style.ss") + (prefix wx: racket/snip) (prefix wx: "wxme/cycle.ss") "lock.ss" "wx.ss" diff --git a/collects/mred/private/helper.rkt b/collects/mred/private/helper.rkt index b11e0718..e5dcc037 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.ss") - (prefix wx: "wxme/style.ss") + (prefix wx: racket/snip) "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/moredialogs.rkt b/collects/mred/private/moredialogs.rkt index 1ee3068d..53738403 100644 --- a/collects/mred/private/moredialogs.rkt +++ b/collects/mred/private/moredialogs.rkt @@ -3,7 +3,7 @@ mzlib/etc mzlib/list (prefix wx: "kernel.ss") - (prefix wx: "wxme/style.ss") + (prefix wx: racket/snip) "lock.ss" "const.ss" "check.ss" diff --git a/collects/mred/private/path-dialog.rkt b/collects/mred/private/path-dialog.rkt index 9b81def8..19b37a51 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.ss") - (prefix wx: "wxme/style.ss") + (prefix wx: racket/snip) "helper.ss" "mrtop.ss" "mritem.ss" "mrpanel.ss" "mrtextfield.ss" "messagebox.ss" "mrmenu.ss" (only scheme/base compose)) (provide path-dialog%) diff --git a/collects/mred/private/repl.rkt b/collects/mred/private/repl.rkt index a98c2c7a..173a8044 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.ss") - (prefix wx: "wxme/style.ss") + (prefix wx: racket/snip) "editor.ss" "app.ss" "mrtop.ss" diff --git a/collects/mred/private/wxme/editor-data.rkt b/collects/mred/private/wxme/editor-data.rkt index a36182e4..59ba72af 100644 --- a/collects/mred/private/wxme/editor-data.rkt +++ b/collects/mred/private/wxme/editor-data.rkt @@ -3,12 +3,12 @@ (require scheme/class scheme/file file/convertible "../syntax.ss" - racket/snip/private/snip-flags "private.ss" + racket/snip/private/snip-flags racket/snip/private/private - "style.ss" - racket/snip/private/load-one - (only-in "cycle.ss" + racket/snip/private/style + 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" diff --git a/collects/mred/private/wxme/editor-snip-class.rkt b/collects/mred/private/wxme/editor-snip-class.rkt index 05aa7c88..62da1a1f 100644 --- a/collects/mred/private/wxme/editor-snip-class.rkt +++ b/collects/mred/private/wxme/editor-snip-class.rkt @@ -6,7 +6,6 @@ racket/snip/private/snip-flags "private.ss" racket/snip/private/private - "style.ss" racket/snip (only-in "cycle.ss" editor-stream-in% editor-stream-out% diff --git a/collects/mred/private/wxme/editor.rkt b/collects/mred/private/wxme/editor.rkt index 74c99bbb..7f493970 100644 --- a/collects/mred/private/wxme/editor.rkt +++ b/collects/mred/private/wxme/editor.rkt @@ -4,9 +4,9 @@ scheme/file "../syntax.ss" "private.ss" - racket/snip/private/private - "style.ss" racket/snip + racket/snip/private/private + racket/snip/private/style racket/snip/private/snip-flags "editor-admin.ss" "stream.ss" diff --git a/collects/mred/private/wxme/pasteboard.rkt b/collects/mred/private/wxme/pasteboard.rkt index 1cb11b08..e3134c98 100644 --- a/collects/mred/private/wxme/pasteboard.rkt +++ b/collects/mred/private/wxme/pasteboard.rkt @@ -9,7 +9,6 @@ "editor.ss" "editor-data.rkt" "undo.ss" - "style.ss" racket/snip racket/snip/private/snip-flags "standard-snip-admin.rkt" diff --git a/collects/mred/private/wxme/private.rkt b/collects/mred/private/wxme/private.rkt index 852ad3b1..8e77adb8 100644 --- a/collects/mred/private/wxme/private.rkt +++ b/collects/mred/private/wxme/private.rkt @@ -82,8 +82,7 @@ (define-local-member-name set-s-read-format get-s-read-format - set-s-read-version - get-wxme-version) + set-s-read-version) ;; editor-snip% (define-local-member-name diff --git a/collects/mred/private/wxme/text.rkt b/collects/mred/private/wxme/text.rkt index a71ff6d9..3333020b 100644 --- a/collects/mred/private/wxme/text.rkt +++ b/collects/mred/private/wxme/text.rkt @@ -11,7 +11,6 @@ "editor.ss" "editor-data.rkt" "undo.ss" - "style.ss" racket/snip racket/snip/private/snip-flags "standard-snip-admin.rkt" diff --git a/collects/mred/private/wxme/wx.rkt b/collects/mred/private/wxme/wx.rkt index 4ab20d6c..759edf5b 100644 --- a/collects/mred/private/wxme/wx.rkt +++ b/collects/mred/private/wxme/wx.rkt @@ -1,5 +1,5 @@ #lang scheme/base -(require "../kernel.ss" "symbol-predicates.rkt") +(require "../kernel.ss" racket/draw/private/font-syms) (define the-clipboard (get-the-clipboard)) (define the-x-selection-clipboard (get-the-x-selection)) @@ -7,7 +7,7 @@ (define (size? v) (and (exact-positive-integer? v) (byte? v))) -(provide (all-from-out "symbol-predicates.rkt") +(provide (all-from-out racket/draw/private/font-syms) event% mouse-event% key-event% @@ -39,10 +39,6 @@ hide-cursor run-printout current-ps-setup - family-symbol? - style-symbol? - weight-symbol? - smoothing-symbol? get-highlight-background-color get-highlight-text-color) diff --git a/collects/scribblings/gui/editor-classes.scrbl b/collects/scribblings/gui/editor-classes.scrbl index c90bd8b3..dbd346a9 100644 --- a/collects/scribblings/gui/editor-classes.scrbl +++ b/collects/scribblings/gui/editor-classes.scrbl @@ -16,10 +16,6 @@ Displays, Administrators, and Mappings: @diagram->table[editor-admin-diagram] -Styles: - -@diagram->table[style-diagram] - Streams for Saving and Cut-and-Paste: @diagram->table[stream-diagram] @@ -28,7 +24,6 @@ Alphabetical: @local-table-of-contents[] -@include-section["add-color-intf.scrbl"] @include-section["editor-intf.scrbl"] @include-section["editor-admin-class.scrbl"] @include-section["editor-canvas-class.scrbl"] @@ -45,9 +40,5 @@ Alphabetical: @include-section["editor-stream-out-bytes-base-class.scrbl"] @include-section["editor-wordbreak-map-class.scrbl"] @include-section["keymap-class.scrbl"] -@include-section["mult-color-intf.scrbl"] @include-section["pasteboard-class.scrbl"] -@include-section["style-intf.scrbl"] -@include-section["style-delta-class.scrbl"] -@include-section["style-list-class.scrbl"] @include-section["text-class.scrbl"] diff --git a/collects/scribblings/gui/snip-classes.scrbl b/collects/scribblings/gui/snip-classes.scrbl index 6afe9a3d..03d91383 100644 --- a/collects/scribblings/gui/snip-classes.scrbl +++ b/collects/scribblings/gui/snip-classes.scrbl @@ -18,15 +18,24 @@ Snip Lists: @diagram->table[snip-list-diagram] +Styles: + +@diagram->table[style-diagram] + Alphabetical: @local-table-of-contents[] +@include-section["add-color-intf.scrbl"] @include-section["image-snip-class.scrbl"] +@include-section["mult-color-intf.scrbl"] @include-section["readable-snip-intf.scrbl"] @include-section["snip-class.scrbl"] @include-section["snip-admin-class.scrbl"] @include-section["snip-class-class.scrbl"] @include-section["snip-class-list-intf.scrbl"] @include-section["string-snip-class.scrbl"] +@include-section["style-intf.scrbl"] +@include-section["style-delta-class.scrbl"] +@include-section["style-list-class.scrbl"] @include-section["tab-snip-class.scrbl"] diff --git a/collects/tests/gracket/wxme.rkt b/collects/tests/gracket/wxme.rkt index a5d3c73e..a4b8f3f6 100644 --- a/collects/tests/gracket/wxme.rkt +++ b/collects/tests/gracket/wxme.rkt @@ -9,7 +9,6 @@ mouse-event%) racket/snip mred/private/wxme/mline - mred/private/wxme/style mred/private/wxme/editor mred/private/wxme/text mred/private/wxme/pasteboard