X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/34f9e1d49c0b952ab3042362c54d85520992927f..aa9ceddc987ea92cb20b319ff7b1a51bc176b6e8:/gtk/gtkcontainer.lisp?ds=inline

diff --git a/gtk/gtkcontainer.lisp b/gtk/gtkcontainer.lisp
index 530b1b4..29a4316 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.10 2004-11-01 00:08:50 espen Exp $
+;; $Id: gtkcontainer.lisp,v 1.13 2004-12-17 00:15:16 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
@@ -67,9 +70,7 @@
 (defbinding container-check-resize () nil
   (container container))
 
-(def-callback %foreach-callback (c-call:void (widget system-area-pointer) 
-					    (callback-id c-call:unsigned-int))
-  (invoke-callback callback-id nil (ensure-proxy-instance 'widget widget nil)))
+(def-callback-marshal %foreach-callback (nil widget))
 
 (defbinding %container-foreach (container callback-id) nil
   (container container)
@@ -77,10 +78,8 @@
   (callback-id unsigned-int))
 
 (defun container-foreach (container function)
-  (let ((callback-id (register-callback-function function)))
-    (unwind-protect
-	(%container-foreach container callback-id)
-      (destroy-user-data callback-id))))
+  (with-callback-function (id function)
+    (%container-foreach container id)))
 
 (defun map-container (seqtype func container)
   (case seqtype