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

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

b359521e9075871a0deaf33b1437ff0f4dd42060
diff --combined gdk/gdk.objects.lisp
index dfd3b30,3c540be..4238442
--- a/gdk/gdk.objects.lisp
+++ b/gdk/gdk.objects.lisp
@@@ -693,6 -693,16 +693,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)
@@@ -745,7 -755,7 +755,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
@@@ -797,7 -807,7 +807,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)
@@@ -927,7 -937,7 +937,7 @@@
    ((:cffi visual colormap-visual (g-object visual)
            "gdk_colormap_get_visual" nil)
     (:cffi screen colormap-screen (g-object screen)
 -          "gdk_colormap_get_screeen" nil)))
 +          "gdk_colormap_get_screen" nil)))
  
  (define-g-object-class "GdkScreen" screen (:type-initializer "gdk_screen_get_type")
    ((font-options screen-font-options "font-options" "gpointer" t t)