Remove do-copy, do-paste, and do-paste-x-selection from editor<%>.

text% and pasteboard% now do not override the methods.
This commit is contained in:
Asumu Takikawa 2010-12-07 21:57:07 -05:00 committed by Stevie Strickland
parent 9fa957e780
commit 24050a5bc6
3 changed files with 9 additions and 13 deletions

View File

@ -447,10 +447,6 @@
(define/public (set-caret-owner snip focus) (void))
(define/public (read-from-file mf) #f)
(define/public (do-copy time) (void))
(define/public (do-paste time) (void))
(define/public (do-paste-x-selection time) (void))
(def/public (do-edit-operation [symbol? op] [any? [recursive? #t]] [exact-integer? [time 0]])
(if (and recursive?
s-caret-snip)

View File

@ -1751,7 +1751,7 @@
(copy extend? time)
(clear))
(def/override (do-copy [exact-integer? time] [bool? extend?])
(def/public (do-copy [exact-integer? time] [bool? extend?])
(set-common-copy-region-data! #f)
(let ([sl (if (and extend?
copy-style-list)
@ -1814,10 +1814,10 @@
(add-selected snip)
(loop (snip->next snip))))))))
(def/override (do-paste [exact-integer? time])
(def/public (do-paste [exact-integer? time])
(do-generic-paste the-clipboard time))
(def/override (do-paste-x-selection [exact-integer? time])
(def/public (do-paste-x-selection [exact-integer? time])
(do-generic-paste the-x-selection-clipboard time))
(define/private (generic-paste x-sel? time)

View File

@ -2032,10 +2032,10 @@
(copy extend? time start end)
(delete start end))))
(def/override (do-copy [exact-nonnegative-integer? startp]
[exact-nonnegative-integer? endp]
[exact-integer? time]
[bool? extend?])
(def/public (do-copy [exact-nonnegative-integer? startp]
[exact-nonnegative-integer? endp]
[exact-integer? time]
[bool? extend?])
(let ([startp (max startp 0)]
[endp (min endp len)])
(unless (endp . <= . startp)
@ -2094,10 +2094,10 @@
(set! prev-paste-start start)
(set! prev-paste-end (+ start delta)))))
(define/override (do-paste start time)
(define/public (do-paste start time)
(do-generic-paste the-clipboard start time))
(define/override (do-paste-x-selection start time)
(define/public (do-paste-x-selection start time)
(do-generic-paste the-x-selection-clipboard start time))
(define/private (generic-paste x-sel? time start end)