Added *REENTRANT-MAIN-ITERATION* to control if MAIN-ITERATE-ALL can be

[clg] / examples / testcairo.lisp

diff --git a/examples/testcairo.lisp b/examples/testcairo.lisp
index f7b6b7167c5bb7a69ce776a6a475d0da32fefc8b..e184c5b6f1e707d8efb5aeecd39b757b887289c3 100644 (file)
--- a/examples/testcairo.lisp
+++ b/examples/testcairo.lisp
@@ -506,11 +506,13 @@ (defun create-tests ()
     (make-instance 'v-box
      :parent main-window
      :child-args '(:expand nil)
     (make-instance 'v-box
      :parent main-window
      :child-args '(:expand nil)

-     :child (list (make-instance 'label :label (gtk-version)) :fill nil)
+     :child (list (make-instance 'label 
+                  :label (format nil "Cairo ~A" (cairo:version-string)))
+                 :fill nil)

      :child (list (make-instance 'label :label (clg-version)) :fill nil)
      :child (list (make-instance 'label                          
                   :label #-cmu
      :child (list (make-instance 'label :label (clg-version)) :fill nil)
      :child (list (make-instance 'label                          
                   :label #-cmu

-                         (format nil "~A (~A)" 
+                         (format nil "~A ~A" 

                           (lisp-implementation-type)
                           #-clisp
                           (lisp-implementation-version)
                           (lisp-implementation-type)
                           #-clisp
                           (lisp-implementation-version)


@@ -540,7 +542,6 @@ (defun create-tests ()
 
 
 (clg-init)
 
 
 (clg-init)

-#?(pkg-config:pkg-exists-p "librsvg-2.0" :atleast-version "2.13.93")

 (rsvg:init)
 
 ;; We need to turn off floating point exceptions, because Cairo is
 (rsvg:init)
 
 ;; We need to turn off floating point exceptions, because Cairo is


@@ -549,4 +550,4 @@ (rsvg:init)
 #+sbcl(sb-int:set-floating-point-modes :traps nil) 
 #+cmu(ext:set-floating-point-modes :traps nil)
 
 #+sbcl(sb-int:set-floating-point-modes :traps nil) 
 #+cmu(ext:set-floating-point-modes :traps nil)
 

-(create-tests)
+(within-main-loop (create-tests))