Fixing conflicts from stack checker changes

[factor.git] / extra / joystick-demo / joystick-demo.factor

diff --git a/extra/joystick-demo/joystick-demo.factor b/extra/joystick-demo/joystick-demo.factor
index 188095dd2ec56d54952b91c109534861a52897b6..c7a774af3157b969df62f74b7e92bcbf4820a051 100755 (executable)
--- a/extra/joystick-demo/joystick-demo.factor
+++ b/extra/joystick-demo/joystick-demo.factor
@@ -67,7 +67,7 @@ CONSTANT: pov-polygons
     pov-polygons [ add-pov-gadget ] assoc-map >>pov ;
 
 : <axis-gadget> ( -- gadget )
-    axis-gadget new-gadget
+    axis-gadget new
     add-pov-gadgets
     black <indicator-gadget> [ >>z-indicator ] [ add-gadget ] bi
     red   <indicator-gadget> [ >>indicator   ] [ add-gadget ] bi
@@ -76,7 +76,7 @@ CONSTANT: pov-polygons
 TUPLE: joystick-demo-gadget < pack axis raxis controller buttons alarm ;
 
 : add-gadget-with-border ( parent child -- parent )
-    2 <border> gray <solid> >>boundary add-gadget ;
+    { 2 2 } <border> gray <solid> >>boundary add-gadget ;
 
 : add-controller-label ( gadget controller -- gadget )
     [ >>controller ] [ product-string <label> add-gadget ] bi ;
@@ -97,7 +97,7 @@ TUPLE: joystick-demo-gadget < pack axis raxis controller buttons alarm ;
     [ (add-button-gadgets) ] 2keep ;
 
 : <joystick-demo-gadget> ( controller -- gadget )
-    joystick-demo-gadget new-gadget
+    joystick-demo-gadget new
     { 0 1 } >>orientation
     swap add-controller-label
     <shelf> add-axis-gadget add-raxis-gadget add-gadget