diff --git a/collects/mred/private/wxme/editor-admin.ss b/collects/mred/private/wxme/editor-admin.ss index d511cf9c0d..2a7e8cffbf 100644 --- a/collects/mred/private/wxme/editor-admin.ss +++ b/collects/mred/private/wxme/editor-admin.ss @@ -33,7 +33,7 @@ (def/public (get-max-view [maybe-box? x] [maybe-box? y] [maybe-box? w] [maybe-box? h] [any? [full? #f]]) - (get-view x y w h)) + (get-view x y w h full?)) (def/public (scroll-to [real? localx] [real? localy] [real? w] [real? h] [any? [refresh? #t]] [(symbol-in start none end) [bias 'none]]) @@ -50,7 +50,7 @@ (def/public (update-cursor) (void)) - (def/public (delay-refresh?) #f) + (def/public (refresh-delayed?) #f) (def/public (popup-menu [popup-menu% m] [real? x] [real? y]) #f) diff --git a/collects/mred/private/wxme/editor-canvas.ss b/collects/mred/private/wxme/editor-canvas.ss index 670fa5c69c..2fc6df3bbe 100644 --- a/collects/mred/private/wxme/editor-canvas.ss +++ b/collects/mred/private/wxme/editor-canvas.ss @@ -1121,12 +1121,3 @@ 1))) (def/override (modified [bool? modified?]) (void))) - - -;; For editor-admin%: -#;( - (define/override (get-max-view fx fy fw fh full?) - (get-view fx fy fh fw full?)) - - (define/override (delay-refresh?) #f) -) diff --git a/collects/mred/private/wxme/editor-snip.ss b/collects/mred/private/wxme/editor-snip.ss index 791925d18b..29ee21aa2a 100644 --- a/collects/mred/private/wxme/editor-snip.ss +++ b/collects/mred/private/wxme/editor-snip.ss @@ -184,7 +184,7 @@ (and editor (send editor can-do-edit-operation? op recur?))) - (def/override (match [snip% s]) + (def/override (match? [snip% s]) #f) (def/override (size-cache-invalid) @@ -699,7 +699,7 @@ (+ x (send snip do-get-left-margin)) (+ y (send snip do-get-top-margin)))))) - (def/override (delay-refresh?) + (def/override (refresh-delayed?) (let ([sadmin (send snip get-admin)]) (or (not sadmin) (and (sadmin . is-a? . standard-snip-admin%) diff --git a/collects/mred/private/wxme/editor.ss b/collects/mred/private/wxme/editor.ss index da7bd4cb00..8fdb73f800 100644 --- a/collects/mred/private/wxme/editor.ss +++ b/collects/mred/private/wxme/editor.ss @@ -182,6 +182,7 @@ (def/public (size-cache-invalid) (void)) (def/public (locked-for-read?) #f) (def/public (locked-for-write?) #f) + (def/public (locked-for-flow?) #f) (def/public (resized) (void)) (def/public (recounted) (void)) diff --git a/collects/mred/private/wxme/pasteboard.ss b/collects/mred/private/wxme/pasteboard.ss index fcba8bf550..b7bb324ca6 100644 --- a/collects/mred/private/wxme/pasteboard.ss +++ b/collects/mred/private/wxme/pasteboard.ss @@ -1681,7 +1681,7 @@ (def/override (get-descent) 0.0) (def/override (get-space) 0.0) - (define/private (get-center) + (def/public (get-center) (let-boxes ([x 0.0] [y 0.0] [w 0.0] @@ -1971,7 +1971,7 @@ (def/override (refresh-delayed?) (or (positive? sequence) (not s-admin) - (send s-admin delay-refresh?))) + (send s-admin refresh-delayed?))) (def/override (in-edit-sequence?) (positive? sequence)) diff --git a/collects/mred/private/wxme/snip.ss b/collects/mred/private/wxme/snip.ss index b7e7acb45c..a7e0297de9 100644 --- a/collects/mred/private/wxme/snip.ss +++ b/collects/mred/private/wxme/snip.ss @@ -180,7 +180,7 @@ (def/public (can-do-edit-operation? [symbol? op] [any? [recur? #t]]) #f) - (def/public (match [snip% other]) + (def/public (match? [snip% other]) (and (eq? s-snipclass (snip->snipclass other)) (= s-count (get-field s-count other)))) @@ -1365,6 +1365,8 @@ (properties [[bool? required?] #f]) (define/public (get-s-required?) required?) + (def/public (read [editor-stream-in% f]) (void)) + (super-new)) (defclass location-editor-data-class% editor-data-class% @@ -1376,7 +1378,7 @@ (set-classname "wxloc") (set-required? #t) - (def/public (read [editor-stream-in% f]) + (def/override (read [editor-stream-in% f]) (let ([x (send f get-inexact)] [y (send f get-inexact)]) (new location-editor-data% [x x][y y])))) diff --git a/collects/mred/private/wxme/text.ss b/collects/mred/private/wxme/text.ss index 2cd842adf2..aa13638161 100644 --- a/collects/mred/private/wxme/text.ss +++ b/collects/mred/private/wxme/text.ss @@ -336,7 +336,7 @@ (send m set-wordbreak-func word-break) (send m set-wordbreak-map (get-wordbreak-map)) (send m set-between-threshold (get-between-threshold)) - (send m hide-caret (caret-hidden)) + (send m hide-caret (caret-hidden?)) (send m set-overwrite-mode (get-overwrite-mode)) (send m set-autowrap-bitmap auto-wrap-bitmap) @@ -619,7 +619,7 @@ (def/override (locked-for-read?) read-locked?) - (def/public (locked-for-flow?) + (def/override (locked-for-flow?) flow-locked?) (def/override (locked-for-write?) write-locked?) @@ -710,7 +710,7 @@ (def/override (refresh-delayed?) (or (delay-refresh . > . 0) (not s-admin) - (send s-admin delay-refresh?))) + (send s-admin refresh-delayed?))) (def/override (in-edit-sequence?) (delay-refresh . > . 0)) @@ -3852,7 +3852,7 @@ (when (or s-own-caret? (not (= endpos startpos))) (need-caret-refresh)))) - (def/public (caret-hidden) (not hilite-on?)) + (def/public (caret-hidden?) (not hilite-on?)) (def/public (get-between-threshold) between-threshold) @@ -4324,7 +4324,7 @@ (define/override (init-new-admin) (when (and (zero? delay-refresh) - (or (not s-admin) (not (send s-admin delay-refresh?)))) + (or (not s-admin) (not (send s-admin refresh-delayed?)))) (redraw))) (define/private (end-streaks exceptions) @@ -4655,7 +4655,7 @@ (unless (or flow-locked? (not s-admin)) (let-values ([(continue? notify?) - (if (send s-admin delay-refresh?) + (if (send s-admin refresh-delayed?) ;; does the admin know the refresh box already? (if (and (not (= delayedscroll -1)) (not delayedscrollbox?) @@ -5200,7 +5200,7 @@ (define/private (continue-refresh) (if (and (zero? delay-refresh) (not (super is-printing?)) - (or (not s-admin) (not (send s-admin delay-refresh?)))) + (or (not s-admin) (not (send s-admin refresh-delayed?)))) (redraw) (begin (when (and (zero? delay-refresh)