fix PR 9398: debugger and macro stepper buttons get out of sync wrt tabs
move enable/disable-evaluation extensions from tab mixin to unit-frame mixin svn: r14118
This commit is contained in:
parent
a75a83add2
commit
ff9ebbde05
|
@ -1006,14 +1006,6 @@
|
||||||
(define/public (hide-debug)
|
(define/public (hide-debug)
|
||||||
(send (get-frame) hide-debug))
|
(send (get-frame) hide-debug))
|
||||||
|
|
||||||
(define/override (enable-evaluation)
|
|
||||||
(send (send (get-frame) get-debug-button) enable #t)
|
|
||||||
(super enable-evaluation))
|
|
||||||
|
|
||||||
(define/override (disable-evaluation)
|
|
||||||
(send (send (get-frame) get-debug-button) enable #f)
|
|
||||||
(super disable-evaluation))
|
|
||||||
|
|
||||||
(super-new)))
|
(super-new)))
|
||||||
|
|
||||||
(define debug-bitmap
|
(define debug-bitmap
|
||||||
|
@ -1285,6 +1277,14 @@
|
||||||
(inherit register-toolbar-button)
|
(inherit register-toolbar-button)
|
||||||
(register-toolbar-button debug-button)
|
(register-toolbar-button debug-button)
|
||||||
|
|
||||||
|
(define/augment (enable-evaluation)
|
||||||
|
(send debug-button enable #t)
|
||||||
|
(inner (void) enable-evaluation))
|
||||||
|
|
||||||
|
(define/augment (disable-evaluation)
|
||||||
|
(send debug-button enable #f)
|
||||||
|
(inner (void) disable-evaluation))
|
||||||
|
|
||||||
(define pause-button
|
(define pause-button
|
||||||
(instantiate button% ()
|
(instantiate button% ()
|
||||||
[label (make-pause-label this)]
|
[label (make-pause-label this)]
|
||||||
|
|
|
@ -79,7 +79,6 @@
|
||||||
(define drscheme-eventspace (current-eventspace))
|
(define drscheme-eventspace (current-eventspace))
|
||||||
|
|
||||||
(define-local-member-name check-language)
|
(define-local-member-name check-language)
|
||||||
(define-local-member-name get-debug-button)
|
|
||||||
|
|
||||||
(define macro-debugger-bitmap
|
(define macro-debugger-bitmap
|
||||||
(make-object bitmap%
|
(make-object bitmap%
|
||||||
|
@ -113,6 +112,13 @@
|
||||||
(inherit register-toolbar-button)
|
(inherit register-toolbar-button)
|
||||||
(register-toolbar-button macro-debug-button)
|
(register-toolbar-button macro-debug-button)
|
||||||
|
|
||||||
|
(define/augment (enable-evaluation)
|
||||||
|
(send macro-debug-button enable #t)
|
||||||
|
(inner (void) enable-evaluation))
|
||||||
|
(define/augment (disable-evaluation)
|
||||||
|
(send macro-debug-button enable #f)
|
||||||
|
(inner (void) disable-evaluation))
|
||||||
|
|
||||||
(define/override (execute-callback)
|
(define/override (execute-callback)
|
||||||
(execute #f))
|
(execute #f))
|
||||||
|
|
||||||
|
@ -120,8 +126,6 @@
|
||||||
(send (get-interactions-text) enable-macro-debugging debugging?)
|
(send (get-interactions-text) enable-macro-debugging debugging?)
|
||||||
(super execute-callback))
|
(super execute-callback))
|
||||||
|
|
||||||
(define/public (get-debug-button) macro-debug-button)
|
|
||||||
|
|
||||||
;; Hide button for inappropriate languages
|
;; Hide button for inappropriate languages
|
||||||
|
|
||||||
(define/augment (on-tab-change old new)
|
(define/augment (on-tab-change old new)
|
||||||
|
@ -157,17 +161,6 @@
|
||||||
(inner (void) after-set-next-settings s))
|
(inner (void) after-set-next-settings s))
|
||||||
(super-new)))
|
(super-new)))
|
||||||
|
|
||||||
(define (macro-debugger-tab-mixin %)
|
|
||||||
(class %
|
|
||||||
(inherit get-frame)
|
|
||||||
(define/override (enable-evaluation)
|
|
||||||
(super enable-evaluation)
|
|
||||||
(send (send (get-frame) get-debug-button) enable #t))
|
|
||||||
(define/override (disable-evaluation)
|
|
||||||
(super disable-evaluation)
|
|
||||||
(send (send (get-frame) get-debug-button) enable #f))
|
|
||||||
(super-new)))
|
|
||||||
|
|
||||||
(define (macro-debugger-interactions-text-mixin %)
|
(define (macro-debugger-interactions-text-mixin %)
|
||||||
(class %
|
(class %
|
||||||
(super-new)
|
(super-new)
|
||||||
|
@ -268,7 +261,5 @@
|
||||||
macro-debugger-interactions-text-mixin)
|
macro-debugger-interactions-text-mixin)
|
||||||
(drscheme:get/extend:extend-definitions-text
|
(drscheme:get/extend:extend-definitions-text
|
||||||
macro-debugger-definitions-text-mixin)
|
macro-debugger-definitions-text-mixin)
|
||||||
(drscheme:get/extend:extend-tab
|
|
||||||
macro-debugger-tab-mixin)
|
|
||||||
|
|
||||||
))
|
))
|
||||||
|
|
Loading…
Reference in New Issue
Block a user