X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/76ff9f3924bb9aa1b98b42e6e218918706e731e9..953030a3519ecb9d66d9f55d46f8c8b6906094ed:/gtk/gtkcontainer.lisp

diff --git a/gtk/gtkcontainer.lisp b/gtk/gtkcontainer.lisp
index 4dcc7d8..ac0a836 100644
--- a/gtk/gtkcontainer.lisp
+++ b/gtk/gtkcontainer.lisp
@@ -20,13 +20,14 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: gtkcontainer.lisp,v 1.21 2006-04-26 12:31:34 espen Exp $
+;; $Id: gtkcontainer.lisp,v 1.25 2008-03-06 22:02:08 espen Exp $
 
 (in-package "GTK")
 
 (defgeneric container-add (container widget &rest args))
 (defgeneric container-remove (container widget))
-(defgeneric container-children (container))
+(defgeneric container-all-children (container))
+(defgeneric container-internal-children (container))
 (defgeneric (setf container-children) (children container))
 
 
@@ -63,13 +64,14 @@
    initargs :child :children))
 
 
-(defmethod compute-signal-function ((container container) signal function object)
+(defmethod compute-signal-function ((container container) signal function object args)
   (declare (ignore signal))
   (if (eq object :children)
-      #'(lambda (&rest args)
-	  (container-foreach container
-	   #'(lambda (child)
-	       (apply function child (rest args)))))
+      #'(lambda (&rest emission-args)
+	  (let ((all-args (nconc (rest emission-args) args)))
+	    (container-foreach container
+	     #'(lambda (child)
+		 (apply function child all-args)))))
     (call-next-method)))
 
 
@@ -77,15 +79,31 @@
   (container container)
   (widget widget))
 
-(defmethod container-add ((container container) (widget widget) &rest args)
-  (%container-add container widget)
+(defun find-child-class (container-class)
+  (or
+   (gethash container-class *container-to-child-class-mappings*)
+   (setf (gethash container-class *container-to-child-class-mappings*)
+    (or
+     (when (eq container-class (find-class 'container))
+       (find-class 'container-child))
+     (find-child-class (find-class (supertype container-class)))))))
+
+(defun init-child-slots (container child args)
   (when args
     (setf
-     (slot-value widget 'child-properties)
+     (slot-value child 'child-properties)
      (apply
-      #'make-instance
-      (gethash (class-of container) *container-to-child-class-mappings*)
-      :parent container :child widget args))))
+      #'make-instance (find-child-class (class-of container))
+      :parent container :child child args))))
+
+(defmethod container-add ((container container) (widget widget) &rest args)
+  (%container-add container widget)
+  (init-child-slots container widget args)
+  widget)
+
+(defmethod container-add ((container container) (widgets list) &rest args)
+  (dolist (widget widgets)
+    (apply #'container-add container widget args)))
 
 (defbinding %container-remove () nil
   (container container)
@@ -160,11 +178,11 @@
     (nreverse internal)))
 
 (defmethod container-internal-children ((container container))
-  (let ((public-children (container-children container))
+  (let ((external-children (container-children container))
 	(all-children (container-all-children container)))
     (loop
      for child in all-children
-     unless (find child public-children)
+     unless (find child external-children)
      collect child)))
 
 (defmethod (setf container-children) (children (container container))