X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/1f518a5194eb0085bcd6f536c1608e9c38ad2729..f4267180bc6ba510900e7c5209a93c0ae66373de:/gtk/gtkcontainer.lisp

diff --git a/gtk/gtkcontainer.lisp b/gtk/gtkcontainer.lisp
index 10ab538..24de83d 100644
--- a/gtk/gtkcontainer.lisp
+++ b/gtk/gtkcontainer.lisp
@@ -15,25 +15,30 @@
 ;; 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.5 2001-10-25 08:16:17 espen Exp $
+;; $Id: gtkcontainer.lisp,v 1.14 2004-12-20 20:09:54 espen Exp $
 
 (in-package "GTK")
 
-(defmethod initialize-instance ((container container) &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))
 
 
 (defbinding %container-add () nil
   (container container)
   (widget widget))
 
-(defun container-add (container widget &rest args)
+(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*)
@@ -44,9 +49,9 @@ (defbinding %container-remove () nil
   (container container)
   (widget widget))
 
-(defun container-remove (container widget)
+(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,30 +70,33 @@ (defbinding %container-child-set-property () nil
 (defbinding container-check-resize () nil
   (container container))
 
-(defbinding (%container-foreach "gtk_container_foreach_full")
-    (container function) nil
+(def-callback-marshal %foreach-callback (nil widget))
+
+(defbinding %container-foreach (container callback-id) nil
   (container container)
-  (0 unsigned-long)
-  (*callback-marshal* pointer)
-  ((register-callback-function function) pointer)
-  (*destroy-marshal* pointer))
+  ((callback %foreach-callback) pointer)
+  (callback-id unsigned-int))
+
+(defun container-foreach (container function)
+  (with-callback-function (id function)
+    (%container-foreach container id)))
 
 (defun map-container (seqtype func container)
   (case seqtype
     ((nil)
-     (%container-foreach container func)
+     (container-foreach container func)
      nil)
     (list
      (let ((list nil))
-       (%container-foreach
+       (container-foreach
 	container
 	#'(lambda (child)
 	    (push (funcall func child) list)))
        (nreverse list)))
     (t
-     (let ((seq (make-sequence seqtype (container-num-children container)))
+     (let ((seq (make-sequence seqtype (container-length container)))
 	   (index 0))
-       (%container-foreach
+       (container-foreach
 	container
 	#'(lambda (child)
 	    (setf (elt seq index) (funcall func child))
@@ -98,7 +106,7 @@ (defun map-container (seqtype func container)
 (defmacro do-container ((var container &optional (result nil)) &body body)
   (let ((continue (make-symbol "CONTINUE")))
     `(let ((,continue t))
-       (%container-foreach
+       (container-foreach
 	,container
 	#'(lambda (,var)
 	    (when ,continue
@@ -108,11 +116,12 @@ (defmacro do-container ((var container &optional (result nil)) &body body)
 		(setq ,continue t)))))
        ,result)))
 
-(defbinding %container-get-children () (glist widget)
-  (container container))
+;; (defbinding %container-get-children () (glist widget)
+;;   (container container))
 
 (defmethod container-children ((container container))
-  (%container-get-children container))
+;;   (%container-get-children container)
+  (map-container 'list #'identity container))
 
 (defmethod (setf container-children) (children (container container))
   (dolist (child (container-children container))
@@ -121,9 +130,40 @@ (defmethod (setf container-children) (children (container container))
     (container-add container child))
   children)
 
-;; Should be implemented as a foreign function
-(defun container-num-children (container)
-  (length (container-children container)))
+(defun container-length (container)
+  (let ((n 0))
+    (container-foreach container
+     #'(lambda (child)
+	 (declare (ignore child))
+	 (incf n)))
+    n))
 
 (defbinding container-resize-children () nil
   (container container))
+
+(defbinding container-propagate-expose () nil
+  (container container)
+  (child widget)
+  (event gdk:expose-event))
+
+
+(defbinding %container-get-focus-chain () boolean
+  (container container)
+  (focusable-widgets (glist widget) :out))
+
+(defun container-focus-chain (container)
+  (multiple-value-bind (chain-set-p focusable-widgets)
+      (%container-get-focus-chain container)
+    (and chain-set-p focusable-widgets)))
+
+(defbinding %container-set-focus-chain () nil
+  (container container)
+  (focusable-widgets (glist widget)))
+
+(defbinding %container-unset-focus-chain () nil
+  (container container))
+
+(defun (setf container-focus-chain) (focusable-widgets container)
+  (if (null focusable-widgets)
+      (%container-unset-focus-chain container)
+    (%container-set-focus-chain container focusable-widgets)))