Callbacks from C done properly

[clg] / gtk / gtkcontainer.lisp

diff --git a/gtk/gtkcontainer.lisp b/gtk/gtkcontainer.lisp
index a31a49dcfaa33e865ef3dc2cb740c10ea8a4f7ee..530b1b495c2a655d0eb23d060f77bb955585cd37 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
 
 ;; 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.10 2004-11-01 00:08:50 espen Exp $

 
 (in-package "GTK")
             
 
 (in-package "GTK")
             


@@ -67,12 +67,13 @@ (defbinding %container-child-set-property () nil
 (defbinding container-check-resize () nil
   (container container))
 
 (defbinding container-check-resize () nil
   (container container))
 

-(defvar *callback-marshal*
-  (system:foreign-symbol-address "gtk_callback_marshal"))
+(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)))

 
 (defbinding %container-foreach (container callback-id) nil
   (container container)
 
 (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)
   (callback-id unsigned-int))
 
 (defun container-foreach (container function)