X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/1047e159d403df191a35ed684e3c80517fbf3807..1a1949c751306b0f02c8e76df425ffbae58c6e5d:/gtk/gtkcontainer.lisp?ds=sidebyside

diff --git a/gtk/gtkcontainer.lisp b/gtk/gtkcontainer.lisp
index a31a49d..50284b1 100644
--- a/gtk/gtkcontainer.lisp
+++ b/gtk/gtkcontainer.lisp
@@ -15,7 +15,7 @@
 ;; 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.9 2004-10-31 12:05:52 espen Exp $
+;; $Id: gtkcontainer.lisp,v 1.12 2004-11-07 17:55:29 espen Exp $
 
 (in-package "GTK")
             
@@ -67,19 +67,16 @@ (defbinding %container-child-set-property () nil
 (defbinding container-check-resize () nil
   (container container))
 
-(defvar *callback-marshal*
-  (system:foreign-symbol-address "gtk_callback_marshal"))
+(def-callback-marshal %foreach-callback (nil widget))
 
 (defbinding %container-foreach (container callback-id) nil
   (container container)
-  (*callback-marshal* pointer)
+  ((callback %foreach-callback) pointer)
   (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