X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/1a1949c751306b0f02c8e76df425ffbae58c6e5d..3a63ef2a6c503a66bf1559fc60f5e3e07d0838be:/gtk/gtkcontainer.lisp?ds=sidebyside

diff --git a/gtk/gtkcontainer.lisp b/gtk/gtkcontainer.lisp
index 50284b1..24de83d 100644
--- a/gtk/gtkcontainer.lisp
+++ b/gtk/gtkcontainer.lisp
@@ -15,16 +15,19 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-;; $Id: gtkcontainer.lisp,v 1.12 2004-11-07 17:55:29 espen Exp $
+;; $Id: gtkcontainer.lisp,v 1.14 2004-12-20 20:09:54 espen Exp $
 
 (in-package "GTK")
-            
+
+
 (defmethod shared-initialize ((container container) names &rest initargs 
 			      &key child children child-args)
-  (declare (ignore child))
+  (declare (ignore child children))
   (call-next-method)
-  (dolist (child (append children (get-all initargs :child)))
-    (apply #'container-add container (append (mklist child) child-args))))
+  (initial-add container 
+   #'(lambda (container args) 
+       (apply #'container-add container (append (mklist args) child-args)))
+   initargs :child :children))
 
 
 (defbinding %container-add () nil
@@ -35,7 +38,7 @@
   (%container-add container widget)
   (when args
     (setf
-     (slot-value widget 'child-slots)
+     (slot-value widget 'child-properties)
      (apply
       #'make-instance
       (gethash (class-of container) *container-to-child-class-mappings*)
@@ -48,7 +51,7 @@
 
 (defmethod container-remove ((container container) (widget widget))
   (%container-remove container widget)
-  (slot-makunbound widget 'child-slots))
+  (slot-makunbound widget 'child-properties))
 
 
 (defbinding %container-child-get-property () nil