From: Olof-Joachim Frahm <Olof.Frahm@web.de>
Date: Sun, 5 Sep 2010 23:58:00 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/dmitryvk/cl-gtk2 into gdk-pixbuf
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=2eb955f84e825417a84ceb0a6e6f32ea5385c548;hp=58ad3e06bbe08ac3489b52316c41411140429430;p=cl-gtk2.git

Merge branch 'master' of git://github.com/dmitryvk/cl-gtk2 into gdk-pixbuf
---

diff --git a/gdk/gdk.objects.lisp b/gdk/gdk.objects.lisp
index 83da54d..14cb5be 100644
--- a/gdk/gdk.objects.lisp
+++ b/gdk/gdk.objects.lisp
@@ -709,6 +709,16 @@
          do (setf (aref result i) (mem-aref ptr el-type i)))
       result)))
 
+(defmethod translate-to-foreign (value (type fixed-array))
+  (if (null value)
+      (null-pointer)
+      (foreign-alloc (fixed-array-element-type type) :count (length value) :initial-contents value)))
+
+(defmethod free-translated-object (value (type fixed-array) param)
+  (declare (ignore param))
+  (unless (null-pointer-p value)
+    (foreign-free value)))
+
 (define-g-boxed-cstruct rectangle "GdkRectangle"
   (x :int :initform 0)
   (y :int :initform 0)
@@ -761,7 +771,7 @@
              (axes (fixed-array :double 2))
              (state modifier-type)
              (is-hint :int16)
-             (device (g-object device))
+             (device (g-object gdk-device))
              (x-root :double)
              (y-root :double))
             ((:expose) event-expose
@@ -813,7 +823,7 @@
             ((:proximity-in
               :proximity-out) event-proximity
              (time :uint32)
-             (device (g-object device)))
+             (device (g-object gdk-device)))
             ((:client-event) event-client
              (message-time gdk-atom)
              (data-format :ushort)