Updated to latest API

[clg] / examples / testcairo.lisp

diff --git a/examples/testcairo.lisp b/examples/testcairo.lisp
index 677b81504c153bf2ebdff9c06e2d65056b07c988..b135ef67d9b3ef87f4efa566f57c81a873c0f496 100644 (file)
--- 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"))
 (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 ()
     `(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
               (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)
                    (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)
 (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))
        (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"))
 
 (define-snippet librsvg (cr)
   (snippet-set-bg-svg cr "clg:examples;home.svg"))