X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/8bb987b4f7849a7604c5bbbe6381ffca971d35d3..1dea177e44bef96e14991417c97fa0ee9643fb4b:/examples/testcairo.lisp?ds=sidebyside

diff --git a/examples/testcairo.lisp b/examples/testcairo.lisp
index 677b815..b135ef6 100644
--- a/examples/testcairo.lisp
+++ b/examples/testcairo.lisp
@@ -29,7 +29,7 @@ (defvar *snippets* ())
 (defmacro define-snippet (name (cr) &body body)
   (let ((widget (make-symbol "WIDGET"))
 	(window (make-symbol "WINDOW"))
-	(pointer (make-symbol "POINTER")))
+	(event (make-symbol "EVENT")))
     `(let ((,window nil))
        (pushnew ',name *snippets*)
        (defun ,name ()
@@ -43,8 +43,8 @@        (defun ,name ()
 	       (signal-connect ,window 'destroy 
                 #'(lambda () (setq ,window nil)))
 	       (signal-connect ,widget 'expose-event
-		#'(lambda (,pointer)
-		    (declare (ignore ,pointer))
+		#'(lambda (,event)
+		    (declare (ignore ,event))
 		    (let ((,cr (gdk:cairo-create (widget-window ,widget))))
 		      (multiple-value-bind (width height) 
 			  (widget-get-size-allocation ,widget)
@@ -305,9 +305,9 @@ (define-snippet image-pattern (cr)
 (defun snippet-set-bg-svg (cr filename)
   (let ((handle (make-instance 'rsvg:handle :filename filename)))
     (cairo:with-context (cr)
-      (with-slots (rsvg:width rsvg:height) (rsvg:handle-dimensions handle)
+      (with-slots (rsvg:width rsvg:height) handle
 	(cairo:scale cr (/ 1.0 rsvg:width) (/ 1.0 rsvg:height))
-	(rsvg:cairo-render cr handle)))))
+	(rsvg:render-cairo handle cr)))))
 
 (define-snippet librsvg (cr)
   (snippet-set-bg-svg cr "clg:examples;home.svg"))