fixed bugs in read and mis other bugs

original commit: 38dc7ee480ceffd065d80da911677003ec992706
This commit is contained in:
Robby Findler 1998-03-12 17:57:32 +00:00
parent b6e91ca4af
commit 1ade9da766
2 changed files with 22 additions and 39 deletions

View File

@ -175,10 +175,6 @@
(error 'after-edit-sequence (error 'after-edit-sequence
"extra call to after-edit-sequence")) "extra call to after-edit-sequence"))
(super-after-edit-sequence) (super-after-edit-sequence)
(when (= 0 edit-sequence-counter)
(mred:debug:printf 'lock-icon
"queue: ~a"
edit-sequence-queue)
(let ([queue edit-sequence-queue] (let ([queue edit-sequence-queue]
[ht edit-sequence-ht] [ht edit-sequence-ht]
[find-enclosing-edit [find-enclosing-edit
@ -186,30 +182,20 @@
(let ([admin (send edit get-admin)]) (let ([admin (send edit get-admin)])
(cond (cond
[(is-a? admin wx:media-snip-media-admin%) [(is-a? admin wx:media-snip-media-admin%)
(send (send admin get-snip) get-media)] (send (send (send admin get-snip) get-admin) get-media)]
;; assume that any non-media-snip ;; assume that any non-media-snip
;; administrator doesn't have embedded edits. ;; administrator doesn't have embedded edits.
[else #f])))]) [else #f])))])
(unless (null? queue)
(set! edit-sequence-queue null) (set! edit-sequence-queue null)
(set! edit-sequence-ht (make-hash-table)) (set! edit-sequence-ht (make-hash-table))
(let loop ([edit (find-enclosing-edit this)]) (let loop ([edit (find-enclosing-edit this)])
(cond (cond
[(and edit (= 0 (ivar edit edit-sequence-counter))) [(and edit (not (ivar edit local-edit-sequence?)))
(loop (find-enclosing-edit edit))] (loop (find-enclosing-edit edit))]
[edit [edit (send edit extend-edit-sequence-queue queue ht)]
(mred:debug:printf 'lock-icon
"passing queue to another edit ~a"
edit
edit-sequence-counter)
(send edit extend-edit-sequence-queue queue ht)]
[else [else
(mred:debug:printf 'lock-icon
"running queue")
(hash-table-for-each ht (lambda (k t) (t))) (hash-table-for-each ht (lambda (k t) (t)))
(for-each (lambda (t) (t)) queue)]))))))]) (for-each (lambda (t) (t)) queue)]))))])
(public (public
[locked? #f] [locked? #f]
[lock [lock

View File

@ -177,10 +177,7 @@
(wx:message-box "Checkout Failed")))))]))))))))] (wx:message-box "Checkout Failed")))))]))))))))]
[save-file-as [save-file-as
(lambda (edit event) (lambda (edit event)
(let ([file (let ([file (mred:finder:put-file)])
(parameterize ([mred:finder:dialog-parent-parameter
(mred:test:test:get-active-frame)])
(mred:finder:put-file))])
(if file (if file
(send edit save-file file))) (send edit save-file file)))
#t)] #t)]