Typo.

[cl-gtk2.git] / gdk / gdk.objects.lisp

diff --git a/gdk/gdk.objects.lisp b/gdk/gdk.objects.lisp
index dfd3b30..dede160 100644 (file)
--- a/gdk/gdk.objects.lisp
+++ b/gdk/gdk.objects.lisp
@@ -435,6 +435,22 @@
   (:bilevel 0)
   (:full 1))
 
+(define-g-enum "GdkInterpType"
+    gdk-interp-type
+    (:export t :type-initializer "gdk_interp_type_get_type")
+  (:nearest 0)
+  (:tiles 1)
+  (:bilinear 2)
+  (:hyper 3))
+
+(define-g-enum "GdkPixbufRotation"
+    gdk-pixbuf-rotation
+    (:export t :type-initializer "gdk_pixbuf_rotation_get_type")
+  (:none 0)
+  (:counterclockwise 90)
+  (:upsidedown 180)
+  (:clockwise 270))
+
 (define-g-enum "GdkColorspace" colorspace ()
   :rgb)
 
@@ -595,7 +611,8 @@
    (:cffi visible-region drawable-visible-region (g-boxed-foreign region :return)
           "gdk_drawable_get_visible_region" nil)))
 
-(define-g-object-class "GdkWindow" gdk-window (:superclass drawable)
+(define-g-object-class "GdkWindow" gdk-window (:superclass drawable
+                                               :type-initializer "gdk_window_object_get_type")
    (#+gtk-2.18
     (cursor gdk-window-cursor "cursor"
             "GdkCursor" t t)
@@ -693,6 +710,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)
@@ -723,10 +750,10 @@
              (time :uint32)
              (x :double)
              (y :double)
-             (axes (fixed-array :double 2))
+             (axes (fixed-array :double 7))
              (state :uint)
              (button :uint)
-             (device (g-object device))
+             (device (g-object gdk-device))
              (x-root :double)
              (y-root :double))
             ((:scroll) event-scroll
@@ -735,17 +762,17 @@
              (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
              (time :uint32)
              (x :double)
              (y :double)
-             (axes (fixed-array :double 2))
+             (axes (fixed-array :double 7))
              (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 +824,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)