X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=gtk%2Fgtk.demo.lisp;h=d0c3645ec4b97c58c593f2c9d225abe945b1956f;hb=c5a046da8c5ca824b266ff48034a860790dc1aa3;hp=8273b796b37b0e13a9fb0d7bab72fd66bef9cc6f;hpb=e5655917fbab9dabc07ac1fa71cd437201f82b0f;p=cl-gtk2.git

diff --git a/gtk/gtk.demo.lisp b/gtk/gtk.demo.lisp
index 8273b79..d0c3645 100644
--- a/gtk/gtk.demo.lisp
+++ b/gtk/gtk.demo.lisp
@@ -54,12 +54,12 @@
                         (lambda (widget event)
                           (declare (ignore widget event))
                           (let* ((gdk-window (widget-window window))
-                                 (gc (gdk-gc-new gdk-window))
+                                 (gc (graphics-context-new gdk-window))
                                  (layout (widget-create-pango-layout window (format nil "X: ~F~%Y: ~F" x y))))
-                            (gdk-draw-layout gdk-window gc 0 0 layout)
-                            (gdk-gc-set-rgb-fg-color gc (make-color :red 65535 :green 0 :blue 0))
+                            (draw-layout gdk-window gc 0 0 layout)
+                            (setf (graphics-context-rgb-fg-color gc) (make-color :red 65535 :green 0 :blue 0))
                             (multiple-value-bind (x y) (drawable-get-size gdk-window)
-                              (gdk-draw-line gdk-window gc 0 0 x y)))))
+                              (draw-line gdk-window gc 0 0 x y)))))
       (g-signal-connect window "configure-event"
                         (lambda (widget event)
                           (declare (ignore widget event))
@@ -1029,7 +1029,7 @@
               (for it = (tree-store-insert-with-values l nil i n s))
               (iter (for j from 0 below 10)
                     (for n2 = (random 10000000))
-                    (for s2 = (format nil "~R" n))
+                    (for s2 = (format nil "~R" n2))
                     (tree-store-insert-with-values l it j n2 s2)))
         (setf (tree-view-model tv) l)
         (let ((column (make-instance 'tree-view-column :title "Number" :sort-column-id 0))
@@ -1056,7 +1056,7 @@
       (widget-show w))))
 
 (defun test-gdk-expose (gdk-window)
-  (let* ((gc (gdk-gc-new gdk-window)))
+  (let* ((gc (graphics-context-new gdk-window)))
     (multiple-value-bind (w h) (drawable-get-size gdk-window)
       (setf (graphics-context-rgb-bg-color gc) (make-color :red 0 :green 0 :blue 0))
       (draw-polygon gdk-window gc t (list (make-point :x 0 :y 0)
@@ -1093,8 +1093,7 @@
 (defun test-gdk ()
   "Test various gdk primitives"
   (within-main-loop
-    (let ((window (make-instance 'gtk-window :type :toplevel :app-paintable t))
-          x y)
+    (let ((window (make-instance 'gtk-window :type :toplevel :app-paintable t)))
       (g-signal-connect window "destroy" (lambda (widget)
                                            (declare (ignore widget))
                                            (leave-gtk-main)))