Work in progress.

[jlisp] / rolling.lisp

diff --git a/rolling.lisp b/rolling.lisp
index 18a67bdddf565281ff3496c041aec9eaba9fef6c..7f9b34203774368c68203ff47f63497d0f961a7f 100644 (file)
--- a/rolling.lisp
+++ b/rolling.lisp
@@ -24,11 +24,11 @@
 (install-dep-syntax)
 
 (defwindow rolling-window () ("Rolling")
-  (let* ((width (make-leaf-dep))
-        (thick (make-leaf-dep))
-        (length (make-leaf-dep))
-        (stock-type (make-leaf-dep :round))
-        (stock-size (make-leaf-dep))
+  (let* ((width (make-dep))
+        (thick (make-dep))
+        (length (make-dep))
+        (stock-type (make-dep :round))
+        (stock-size (make-dep))
         (volume #[(* ?width ?thick ?length)])
         (stock-length #[(/ ?volume
                            (case ?stock-type
@@ -48,8 +48,8 @@ (defwindow rolling-window () ("Rolling")
       (make-output "Length:" start-length))
     (within-group ("Initial stock")
       (make-radio-dep stock-type
-                     :round "Round section"
-                     :square "Square section")
+                     '(:round "Round section"
+                       :square "Square section"))
       (make-input "Stock size:" stock-size)
       (make-output "Stock length:" stock-length))
     #+ no