From: Dmitry Kalyanov <Kalyanov.Dmitry@gmail.com>
Date: Sat, 29 Aug 2009 19:17:13 +0000 (+0400)
Subject: Take :default-initargs into account when creating instances of gobject classes
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=5676656f5ce09de10f7c1d71a292812456769346;p=cl-gtk2.git

Take :default-initargs into account when creating instances of gobject classes
---

diff --git a/glib/gobject.meta.lisp b/glib/gobject.meta.lisp
index 086a5ac..7fba65e 100644
--- a/glib/gobject.meta.lisp
+++ b/glib/gobject.meta.lisp
@@ -207,8 +207,11 @@
       (progn
         (assert (= (length initargs) 2) nil "POINTER can not be combined with other initargs (~A)" initargs)
         (call-next-method))
-      (let ((pointer (create-gobject-from-class-and-initargs class initargs)))
-        (apply #'call-next-method class :pointer pointer initargs))))
+      (let* ((default-initargs (iter (for (arg value) in (class-default-initargs class))
+                                     (nconcing (list arg value))))
+             (effective-initargs (append initargs default-initargs))
+             (pointer (create-gobject-from-class-and-initargs class effective-initargs)))
+        (apply #'call-next-method class :pointer pointer effective-initargs))))
 
 (defmethod slot-boundp-using-class ((class gobject-class) object (slot gobject-property-effective-slot-definition))
   (handler-case