X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/0f2634d21adfe672833024f98bdc4095b759113c..9706ddd7b4d93a327d83e2bb9e4dcf1de8675245:/gtk/gtkcontainer.lisp

diff --git a/gtk/gtkcontainer.lisp b/gtk/gtkcontainer.lisp
index 073dd36..da076f0 100644
--- a/gtk/gtkcontainer.lisp
+++ b/gtk/gtkcontainer.lisp
@@ -15,38 +15,57 @@
 ;; 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.6 2001-11-20 18:25:53 espen Exp $
+;; $Id: gtkcontainer.lisp,v 1.17 2005-02-22 23:08:52 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 
+			           (show-children nil show-children-p))
+  (declare (ignore child children))
+  (when show-children-p
+    (if (not show-children)
+	(setf (user-data container 'show-recursive-p) nil)
+      (signal-connect container 'show #'container-show-recursive 
+       :object t :remove t)))
+
   (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 compute-signal-function ((container container) signal function object)
+  (if (eq object :children)
+      #'(lambda (&rest args)
+	  (mapc #'(lambda (child)
+		    (apply function child (rest args)))
+		(container-children container)))
+    (call-next-method)))
 
 
 (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*)
       :parent container :child widget args))))
 
-
 (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,65 +84,105 @@
 (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)))
+
+(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))
-       (%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))
 	    (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)
 
-;; 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)))
+
+(defgeneric container-show-recursive (container))
+
+(defmethod container-show-recursive ((container container))
+  "Recursively shows any child widgets except widgets explicit hidden during construction."
+  (labels ((recursive-show (widget)
+	     (when (typep widget 'container)
+	       (if (not (user-data-p widget 'show-recursive-p))
+		   (container-foreach widget #'recursive-show)
+		 (unset-user-data widget 'show-recursive-p)))
+	     (unless (widget-hidden-p widget)
+	       (widget-show widget))))
+    (container-foreach container #'recursive-show)))