From ff9ebbde05dbf1750985d918f789b493bfe4cf44 Mon Sep 17 00:00:00 2001 From: Ryan Culpepper Date: Mon, 16 Mar 2009 04:40:30 +0000 Subject: [PATCH] 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 --- collects/gui-debugger/debug-tool.ss | 16 ++++++++-------- collects/macro-debugger/tool.ss | 23 +++++++---------------- 2 files changed, 15 insertions(+), 24 deletions(-) diff --git a/collects/gui-debugger/debug-tool.ss b/collects/gui-debugger/debug-tool.ss index 3efc59a2b9..de7e2978b1 100644 --- a/collects/gui-debugger/debug-tool.ss +++ b/collects/gui-debugger/debug-tool.ss @@ -1006,14 +1006,6 @@ (define/public (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))) (define debug-bitmap @@ -1285,6 +1277,14 @@ (inherit register-toolbar-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 (instantiate button% () [label (make-pause-label this)] diff --git a/collects/macro-debugger/tool.ss b/collects/macro-debugger/tool.ss index af578c1620..1d1430aae2 100644 --- a/collects/macro-debugger/tool.ss +++ b/collects/macro-debugger/tool.ss @@ -79,7 +79,6 @@ (define drscheme-eventspace (current-eventspace)) (define-local-member-name check-language) - (define-local-member-name get-debug-button) (define macro-debugger-bitmap (make-object bitmap% @@ -113,6 +112,13 @@ (inherit register-toolbar-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) (execute #f)) @@ -120,8 +126,6 @@ (send (get-interactions-text) enable-macro-debugging debugging?) (super execute-callback)) - (define/public (get-debug-button) macro-debug-button) - ;; Hide button for inappropriate languages (define/augment (on-tab-change old new) @@ -157,17 +161,6 @@ (inner (void) after-set-next-settings s)) (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 %) (class % (super-new) @@ -268,7 +261,5 @@ macro-debugger-interactions-text-mixin) (drscheme:get/extend:extend-definitions-text macro-debugger-definitions-text-mixin) - (drscheme:get/extend:extend-tab - macro-debugger-tab-mixin) ))