Moved from main gtk source directory

[clg] / gtk / gtkcontainer.lisp

diff --git a/gtk/gtkcontainer.lisp b/gtk/gtkcontainer.lisp
index 0e36a2cdaa8f01400f6012b7ee68b186c8019cfd..b4f9ac5c4ebf6e2086eaaaafe15494e3d4514dc2 100644 (file)
--- a/gtk/gtkcontainer.lisp
+++ b/gtk/gtkcontainer.lisp
@@ -15,21 +15,23 @@
 ;; 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.7 2002/03/24 12:58:34 espen Exp $
+;; $Id: gtkcontainer.lisp,v 1.9 2004/10/31 12:05:52 espen Exp $
 
 (in-package "GTK")
             
-(defmethod shared-initialize ((container container) names &rest initargs)
+(defmethod shared-initialize ((container container) names &rest initargs 
+                             &key child children child-args)
+  (declare (ignore child))
   (call-next-method)
-  (dolist (child (get-all initargs :child))
-    (apply #'container-add container (mklist child))))
+  (dolist (child (append children (get-all initargs :child)))
+    (apply #'container-add container (append (mklist child) child-args))))
 
 
 (defbinding %container-add () nil
   (container container)
   (widget widget))
 
-(defun container-add (container widget &rest args)
+(defmethod container-add ((container container) (widget widget) &rest args)
   (%container-add container widget)
   (when args
     (setf
@@ -44,7 +46,7 @@ (defbinding %container-remove () nil
   (container container)
   (widget widget))
 
-(defun container-remove (container widget)
+(defmethod container-remove ((container container) (widget widget))
   (%container-remove container widget)
   (slot-makunbound widget 'child-slots))
 
@@ -82,7 +84,7 @@ (defun container-foreach (container function)
 (defun map-container (seqtype func container)
   (case seqtype
     ((nil)
-     (%container-foreach container func)
+     (container-foreach container func)
      nil)
     (list
      (let ((list nil))