Skip to content

Commit bdd1b4e

Browse files
committed
fix clickback highlighting
Highlighting seems to have been broken in the C++-to-Racket port of 2009, where a method call was turned into a structure update, probably because the names are the same except for a trailing `?!`. The method was still present, but not quite all there. Closes #2909
1 parent 831bc97 commit bdd1b4e

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

gui-lib/mred/private/wxme/editor.rkt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,7 @@
856856
(define/public (add-undo-rec rec)
857857
(cond
858858
[interceptmode?
859-
(send intercepted append rec)]
859+
(set! intercepted (cons rec intercepted))]
860860
[undomode?
861861
(append-undo rec #t)]
862862
[(zero? s-noundomode)
@@ -1024,9 +1024,9 @@
10241024

10251025
(def/public (s-end-intercept)
10261026
(begin0
1027-
intercepted
1028-
(set! interceptmode? #f)
1029-
(set! intercepted null)))
1027+
(reverse intercepted)
1028+
(set! interceptmode? #f)
1029+
(set! intercepted null)))
10301030

10311031
(define/public (undo-preserves-all-history?)
10321032
emacs-style-undo?)

gui-lib/mred/private/wxme/text.rkt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@
538538
(set! track-clickback click)
539539
(when s-admin
540540
(send s-admin update-cursor))
541-
(set-clickback-hilited?! track-clickback #t)))
541+
(set-clickback-hilited track-clickback #t)))
542542
(begin
543543
(set! dragstart now)
544544
(set! dragging? #t)
@@ -561,15 +561,15 @@
561561
(let ([cb (if (x . >= . 0)
562562
(find-clickback now y)
563563
#f)])
564-
(set-clickback-hilited?! track-clickback (eq? cb track-clickback)))])]
564+
(set-clickback-hilited track-clickback (eq? cb track-clickback)))])]
565565
[(send event button-up?)
566566
(cond
567567
[dragging?
568568
(set! dragging? #f)]
569569
[tracking?
570570
(set! tracking? #f)
571571
(when (clickback-hilited? track-clickback)
572-
(set-clickback-hilited?! track-clickback #f)
572+
(set-clickback-hilited track-clickback #f)
573573
(let ([click track-clickback])
574574
((clickback-f click) this (clickback-start click) (clickback-end click))))
575575
(when s-admin
@@ -579,7 +579,7 @@
579579
(when tracking?
580580
(set! tracking? #f)
581581
(when (clickback-hilited? track-clickback)
582-
(set-clickback-hilited?! track-clickback #f)
582+
(set-clickback-hilited track-clickback #f)
583583
(let ([click track-clickback])
584584
((clickback-f click) this (clickback-start click) (clickback-end click)))))
585585
(when s-admin
@@ -2532,15 +2532,15 @@
25322532

25332533
(begin-edit-sequence)
25342534
(flash-on (clickback-start c) (clickback-end c) #f #f 0)
2535-
(do-change-style (clickback-start c) (clickback-end c) #f (clickback-delta c) #f)
2535+
(do-change-style (clickback-start c) (clickback-end c) #f (clickback-delta c) #f #f)
25362536
(end-edit-sequence)
25372537

25382538
(set-clickback-unhilite! c (s-end-intercept))]
25392539
[else
25402540
(perform-undo-list (clickback-unhilite c))
25412541
(set-clickback-unhilite! c null)
25422542
(flash-off)])
2543-
(set-clickback-hilited?! (and on? #t))))
2543+
(set-clickback-hilited?! c (and on? #t))))
25442544

25452545
;; ----------------------------------------
25462546

0 commit comments

Comments
 (0)