Fix canvas gadget

diff --git a/basis/ui/gadgets/canvas/canvas-tests.factor b/basis/ui/gadgets/canvas/canvas-tests.factor
new file mode 100755 (executable)
index 0000000..bc87064
--- /dev/null
+++ b/basis/ui/gadgets/canvas/canvas-tests.factor
@@ -0,0 +1,4 @@
+IN: ui.gadgets.canvas.tests\r
+USING: ui.gadgets.canvas tools.test kernel ;\r
+\r
+{ 1 0 } [ [ drop ] draw-canvas ] must-infer-as\r

diff --git a/basis/ui/gadgets/canvas/canvas.factor b/basis/ui/gadgets/canvas/canvas.factor
old mode 100644 (file)
new mode 100755 (executable)
index b137fd8..85149f4
--- a/basis/ui/gadgets/canvas/canvas.factor
+++ b/basis/ui/gadgets/canvas/canvas.factor
@@ -16,8 +16,8 @@ TUPLE: canvas < gadget dlist ;
     [ f >>dlist drop ] tri ;
 
 : make-canvas-dlist ( canvas quot -- dlist )
-    [ GL_COMPILE ] dip make-dlist
-    [ >>dlist drop ] keep ;
+    [ drop ] [ GL_COMPILE swap make-dlist ] 2bi
+    [ >>dlist drop ] keep ; inline
 
 : cache-canvas-dlist ( canvas quot -- dlist )
     over dlist>> dup