original commit: 6a8eedc688d420e03fb194b26cdf328e1b619f71
This commit is contained in:
Robby Findler 1999-02-07 20:24:45 +00:00
parent d7e0ae2e5f
commit 9fcac3dfa1
3 changed files with 13 additions and 15 deletions

View File

@ -101,6 +101,7 @@
(define-signature framework:pasteboard^ (define-signature framework:pasteboard^
(basic% (basic%
keymap%
file% file%
backup-autosave% backup-autosave%
info%)) info%))
@ -119,6 +120,7 @@
clever-file-format-mixin clever-file-format-mixin
basic% basic%
keymap%
return% return%
file% file%
clever-file-format% clever-file-format%

View File

@ -2,7 +2,8 @@
(import mred-interfaces^ (import mred-interfaces^
[editor : framework:editor^]) [editor : framework:editor^])
(define basic% (editor:keymap-mixin (editor:basic-mixin pasteboard%))) (define basic% (editor:basic-mixin pasteboard%))
(define file% (editor:file-mixin basic%)) (define keymap% (editor:keymap-mixin basic%))
(define file% (editor:file-mixin keymap%))
(define backup-autosave% (editor:backup-autosave-mixin file%)) (define backup-autosave% (editor:backup-autosave-mixin file%))
(define info% (editor:info-mixin backup-autosave%))) (define info% (editor:info-mixin backup-autosave%)))

View File

@ -13,7 +13,7 @@
;; unless matthew makes it primitive ;; unless matthew makes it primitive
(define basic<%> (define basic<%>
(interface (editor:keymap<%> text<%>) (interface (text<%>)
highlight-range highlight-range
get-styles-fixed get-styles-fixed
set-styles-fixed set-styles-fixed
@ -21,7 +21,7 @@
initial-autowrap-bitmap)) initial-autowrap-bitmap))
(define basic-mixin (define basic-mixin
(mixin (editor:keymap<%> text<%>) (basic<%>) args (mixin (editor:basic<%> text<%>) (basic<%>) args
(inherit get-canvases get-admin split-snip get-snip-position (inherit get-canvases get-admin split-snip get-snip-position
delete find-snip invalidate-bitmap-cache delete find-snip invalidate-bitmap-cache
set-autowrap-bitmap set-autowrap-bitmap
@ -297,12 +297,6 @@
(public (public
[initial-autowrap-bitmap (lambda () #f)]) [initial-autowrap-bitmap (lambda () #f)])
(rename [super-get-keymaps get-keymaps])
(override
[get-keymaps
(lambda ()
(cons (keymap:get-global) (super-get-keymaps)))])
(sequence (sequence
(apply super-init args) (apply super-init args)
(set-autowrap-bitmap (initial-autowrap-bitmap))))) (set-autowrap-bitmap (initial-autowrap-bitmap)))))
@ -311,7 +305,7 @@
(interface () (interface ()
find-string-embedded)) find-string-embedded))
(define searching-mixin (define searching-mixin
(mixin (basic<%>) (searching<%>) args (mixin (editor:keymap<%> basic<%>) (searching<%>) args
(inherit get-end-position get-start-position last-position (inherit get-end-position get-start-position last-position
find-string get-snip-position get-admin find-snip) find-string get-snip-position get-admin find-snip)
(public (public
@ -424,7 +418,7 @@
(define info<%> (interface (editor:basic<%> text<%>))) (define info<%> (interface (editor:basic<%> text<%>)))
(define info-mixin (define info-mixin
(mixin (editor:basic<%> text<%>) (info<%>) args (mixin (editor:keymap<%> text<%>) (info<%>) args
(inherit get-start-position get-end-position get-canvas (inherit get-start-position get-end-position get-canvas
run-after-edit-sequence) run-after-edit-sequence)
(rename [super-after-set-position after-set-position] (rename [super-after-set-position after-set-position]
@ -521,9 +515,10 @@
#f))))]) #f))))])
(sequence (apply super-init args)))) (sequence (apply super-init args))))
(define basic% (basic-mixin (editor:keymap-mixin (editor:basic-mixin text%)))) (define basic% (basic-mixin (editor:basic-mixin text%)))
(define return% (return-mixin basic%)) (define keymap% (editor:keymap-mixin basic))
(define file% (editor:file-mixin basic%)) (define return% (return-mixin keymap%))
(define file% (editor:file-mixin keymap%))
(define clever-file-format% (clever-file-format-mixin file%)) (define clever-file-format% (clever-file-format-mixin file%))
(define backup-autosave% (editor:backup-autosave-mixin clever-file-format%)) (define backup-autosave% (editor:backup-autosave-mixin clever-file-format%))
(define searching% (searching-mixin backup-autosave%)) (define searching% (searching-mixin backup-autosave%))