X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/4c371500f9bbd981090b5d3a93a7b6afa28c7f72..d1b6a54e578ad5b6980545e9132f90e3f3ebc95f:/gtk/gtkcontainer.lisp

diff --git a/gtk/gtkcontainer.lisp b/gtk/gtkcontainer.lisp
index 982a645..f352b25 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.22 2007-01-07 20:23:22 espen Exp $
+;; $Id: gtkcontainer.lisp,v 1.26 2008-05-06 00:04:42 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))
 
 
@@ -66,8 +67,8 @@
 (defmethod compute-signal-function ((container container) signal function object args)
   (declare (ignore signal))
   (if (eq object :children)
-      #'(lambda (&rest emission-args)
-	  (let ((all-args (nconc (rest emission-args) args)))
+      #'(lambda (container &rest emission-args)
+	  (let ((all-args (nconc emission-args args)))
 	    (container-foreach container
 	     #'(lambda (child)
 		 (apply function child all-args)))))
@@ -78,15 +79,27 @@
   (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)
@@ -165,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))