From e962922e9d92dc6b837491cd0aa83c5e99e65140 Mon Sep 17 00:00:00 2001
From: Ryan Culpepper <ryanc@racket-lang.org>
Date: Sun, 8 Oct 2006 04:17:12 +0000
Subject: [PATCH] Added show/hide props to context menu Added refresh after
 policy change through context menu

svn: r4523
---
 collects/macro-debugger/tool.ss              |  2 +-
 collects/macro-debugger/view/gui.ss          | 17 ++++++++++++-----
 collects/macro-debugger/view/hiding-panel.ss |  2 +-
 collects/macro-debugger/view/warning.ss      |  4 ++--
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/collects/macro-debugger/tool.ss b/collects/macro-debugger/tool.ss
index 7e6f346784..51e9d7f693 100644
--- a/collects/macro-debugger/tool.ss
+++ b/collects/macro-debugger/tool.ss
@@ -28,7 +28,7 @@
             [SBMENU : sb:context-menu^ (sb:context-menu@ SBSNIP)]
             [SBSNIP : sb:snip^ (sb:global-snip@)]
             [SBWMENU : sb:context-menu^ (sb:widget-context-menu-extension@ SBMENU)]
-            [VMENU : sb:context-menu^ (view:context-menu-extension@ SBMENU)]
+            [VMENU : sb:context-menu^ (view:context-menu-extension@ SBWMENU)]
             [SBWIDGET : sb:widget^ (sb:widget@ SBKEYMAP SBWMENU)]
             [VWIDGET : sb:widget^ (view:browser-extension@ SBWIDGET VMENU)]
             [BASE : view:view-base^ (view-base/tool@)]
diff --git a/collects/macro-debugger/view/gui.ss b/collects/macro-debugger/view/gui.ss
index 3749f9dbd7..fd5b8f5cb2 100644
--- a/collects/macro-debugger/view/gui.ss
+++ b/collects/macro-debugger/view/gui.ss
@@ -423,7 +423,10 @@
                                     (lambda (tag message)
                                       (unless warnings-frame
                                         (set! warnings-frame (new warnings-frame%)))
-                                      (send warnings-frame add-warning tag))))
+                                      (send warnings-frame add-warning tag)
+                                      #;
+                                      (send warnings-frame add-text
+                                            (format "Warning: ~a~n" message)))))
                       (let-values ([(d s) (hide/policy deriv show-macro?)])
                         d)))
                   deriv)))
@@ -531,9 +534,14 @@
             (void))
           
           (define/private (do-show)
-            (send (get-prefs-panel) add-show-identifier))
+            (send* (get-prefs-panel)
+              (add-show-identifier)
+              (refresh)))
+            
           (define/private (do-hide)
-            (send (get-prefs-panel) add-hide-identifier))
+            (send* (get-prefs-panel)
+              (add-hide-identifier)
+              (refresh)))
           
           (define/override (on-demand)
             (define-values (opaque transparent)
@@ -561,11 +569,10 @@
       (define syntax-widget%
         (class pre:syntax-widget%
           (init-field macro-stepper)
-          (inherit get-controller)
           
           (define/override (make-context-menu)
             (new context-menu%
-                 (controller (get-controller))
+                 (widget this)
                  (macro-stepper macro-stepper)))
           (super-new)))))
   )
diff --git a/collects/macro-debugger/view/hiding-panel.ss b/collects/macro-debugger/view/hiding-panel.ss
index a2f466e818..b8c25c7473 100644
--- a/collects/macro-debugger/view/hiding-panel.ss
+++ b/collects/macro-debugger/view/hiding-panel.ss
@@ -109,7 +109,7 @@
       (define/public (get-policy) policy)
       
       ;; refresh
-      (define/private (refresh)
+      (define/public (refresh)
         (when enabled?
           (send stepper refresh/resynth)))
       
diff --git a/collects/macro-debugger/view/warning.ss b/collects/macro-debugger/view/warning.ss
index 3a5668def9..3e2ba9f72f 100644
--- a/collects/macro-debugger/view/warning.ss
+++ b/collects/macro-debugger/view/warning.ss
@@ -37,7 +37,7 @@
                     "The macro stepper is only hiding macro after the "
                     "lifts are caught.")))
 
-      (define/private (add-text . strs)
+      (define/public (add-text . strs)
         (send text lock #f)
         (for-each (lambda (s) (send text insert s)) strs)
         (send text insert "\n\n")
@@ -51,7 +51,7 @@
            (add-localactions-text))
           ((lifts)
            (add-lifts-text))))
-      
+
       (send this show #t)))
   
   )
\ No newline at end of file