Replaced deprecated widgets combo and option-menu with combo-box and combo-box-entry

[clg] / gtk / gtkcontainer.lisp

diff --git a/gtk/gtkcontainer.lisp b/gtk/gtkcontainer.lisp
index 8a24bd0b374323265c988ae252a0a728dbb6e5f7..50284b190d7dd878b593d416f84907f7788a3a63 100644 (file)
--- 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.11 2004-11-07 01:23:38 espen Exp $
+;; $Id: gtkcontainer.lisp,v 1.12 2004-11-07 17:55:29 espen Exp $
 
 (in-package "GTK")
             
@@ -75,10 +75,8 @@ (defbinding %container-foreach (container callback-id) nil
   (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