Merge subset of commit '4a6ca9e91e82da3047bd0029296e00e9030a3686' of git://github...

I.e. it's not obvious to me why the axes should be length 7 and PROG1
should instead either return all values or use UNWIND-PROTECT, but that
part is adapted from CL-CAIRO2 in the first place (and should probably
be fixed there as well).

diff --git a/gdk/gdk.drawing-primitives.lisp b/gdk/gdk.drawing-primitives.lisp
index bdd09c9..b1b6db6 100644 (file)
--- a/gdk/gdk.drawing-primitives.lisp
+++ b/gdk/gdk.drawing-primitives.lisp
@@ -92,6 +92,8 @@
   (width :int)
   (height :int))
 
+(export 'draw-rectangle)
+
 (defcfun (draw-arc "gdk_draw_arc") :void
   (drawable (g-object drawable))
   (gc (g-object graphics-context))

diff --git a/gdk/gdk.objects.lisp b/gdk/gdk.objects.lisp
index 14cb5be..b62007e 100644 (file)
--- a/gdk/gdk.objects.lisp
+++ b/gdk/gdk.objects.lisp
@@ -752,7 +752,7 @@
              (axes (fixed-array :double 2))
              (state :uint)
              (button :uint)
-             (device (g-object device))
+             (device (g-object gdk-device))
              (x-root :double)
              (y-root :double))
             ((:scroll) event-scroll
@@ -761,7 +761,7 @@
              (y :double)
              (state modifier-type)
              (direction scroll-direction)
-             (device (g-object device))
+             (device (g-object gdk-device))
              (x-root :double)
              (y-root :double))
             ((:motion-notify) event-motion