Dependency fix

[clg] / gtk / gtkcontainer.lisp

diff --git a/gtk/gtkcontainer.lisp b/gtk/gtkcontainer.lisp
index 9dab14cd44b69045b786afaa9357fb121154362d..767b0fa429e88f74a22c9fcd741231b48bb4e5a8 100644 (file)
--- a/gtk/gtkcontainer.lisp
+++ b/gtk/gtkcontainer.lisp
@@ -15,14 +15,28 @@
 ;; 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.8 2002/03/24 21:56:34 espen Exp $
+;; $Id: gtkcontainer.lisp,v 1.16 2005/01/06 21:00:53 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 children))
   (call-next-method)
-  (dolist (child (get-all initargs :child))
-    (apply #'container-add container (mklist child))))
+  (initial-add container 
+   #'(lambda (container args) 
+       (apply #'container-add container (append (mklist args) child-args)))
+   initargs :child :children))
+
+
+(defmethod create-callback-function ((container container) function arg1)
+  (if (eq arg1 :children)
+      #'(lambda (&rest args)
+         (mapc #'(lambda (child)
+                   (apply function child (rest args)))
+               (container-children container)))
+    (call-next-method)))
 
 
 (defbinding %container-add () nil
@@ -33,7 +47,7 @@ (defmethod container-add ((container container) (widget widget) &rest args)
   (%container-add container widget)
   (when args
     (setf
-     (slot-value widget 'child-slots)
+     (slot-value widget 'child-properties)
      (apply
       #'make-instance
       (gethash (class-of container) *container-to-child-class-mappings*)
@@ -46,7 +60,7 @@ (defbinding %container-remove () nil
 
 (defmethod container-remove ((container container) (widget widget))
   (%container-remove container widget)
-  (slot-makunbound widget 'child-slots))
+  (slot-makunbound widget 'child-properties))
 
 
 (defbinding %container-child-get-property () nil
@@ -65,24 +79,30 @@ (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)))
+
+(defbinding %container-forall (container callback-id) nil
+  (container container)
+  ((callback %foreach-callback) pointer)
+  (callback-id unsigned-int))
+
+(defun container-forall (container function)
+  (with-callback-function (id function)
+    (%container-forall container id)))
 
 (defun map-container (seqtype func container)
   (case seqtype
     ((nil)
-     (%container-foreach container func)
+     (container-foreach container func)
      nil)
     (list
      (let ((list nil))
@@ -101,31 +121,14 @@ (defun map-container (seqtype func container)
            (incf index)))
        seq))))
 
-(defmacro do-container ((var container &optional (result nil)) &body body)
-  (let ((continue (make-symbol "CONTINUE")))
-    `(let ((,continue t))
-       (container-foreach
-       ,container
-       #'(lambda (,var)
-           (when ,continue
-             (setq ,continue nil)
-             (block nil
-               ,@body
-               (setq ,continue t)))))
-       ,result)))
-
-;; (defbinding %container-get-children () (glist widget)
-;;   (container container))
-
 (defmethod container-children ((container container))
-;;   (%container-get-children container)
   (map-container 'list #'identity container))
 
 (defmethod (setf container-children) (children (container container))
   (dolist (child (container-children container))
     (container-remove container child))
   (dolist (child children)
-    (container-add container child))
+    (apply #'container-add container (mklist child)))
   children)
 
 (defun container-length (container)