Unitized macro stepper view; tool uses different base frame

svn: r4309

collects/macro-debugger/expand.ss

@@ -1,6 +1,7 @@
 
 (module expand mzscheme
-  (require "view/gui.ss")
+  (require (lib "unitsig.ss"))
+  (require "view/view.ss")
   (provide expand/step)
 
   (define (expand/step stx)

collects/macro-debugger/tool.ss

@@ -13,6 +13,19 @@
            (lib "bitmap-label.ss" "mrlib")
            (lib "string-constant.ss" "string-constants"))
 
+  (define view-base/tool@
+    (unit/sig view:view-base^
+        (import)
+      (define base-frame%
+        (frame:standard-menus-mixin frame:basic%))))
+
+  (define-values/invoke-unit/sig view:view^
+    (compound-unit/sig
+      (import)
+      (link (BASE : view:view-base^ (view-base/tool@))
+            (VIEW : view:view^ (view:view@ BASE)))
+      (export (open VIEW))))
+
   (provide tool@)
 
   (define tool@
@@ -117,7 +130,7 @@
                  (current-module-name-resolver mnr)))))
 
           (define/private (make-handlers original-eval-handler original-module-name-resolver)
-            (let ([stepper (delay (view:make-macro-stepper (new-standard-hiding-policy)))]
+            (let ([stepper (delay (make-macro-stepper (new-standard-hiding-policy)))]
                   [debugging? debugging?])
               (values
                (lambda (expr)

collects/macro-debugger/view/view.ss

@@ -0,0 +1,13 @@
+
+(module view mzscheme
+  (require (lib "unitsig.ss"))
+  (require "gui.ss")
+  (provide (all-defined))
+
+  (define-values/invoke-unit/sig view^
+    (compound-unit/sig
+      (import)
+      (link (BASE : view-base^ (view-base@))
+            (VIEW : view^ (view@ BASE)))
+      (export (open VIEW))))
+  )