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

diff --git a/gtk/gtkcontainer.lisp b/gtk/gtkcontainer.lisp
index 2d127d5..ff44bf2 100644
--- a/gtk/gtkcontainer.lisp
+++ b/gtk/gtkcontainer.lisp
@@ -15,59 +15,69 @@
 ;; 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.3 2001-05-29 16:03:04 espen Exp $
+;; $Id: gtkcontainer.lisp,v 1.8 2002-03-24 21:56:34 espen Exp $
 
 (in-package "GTK")
+            
+(defmethod shared-initialize ((container container) names &rest initargs)
+  (call-next-method)
+  (dolist (child (get-all initargs :child))
+    (apply #'container-add container (mklist child))))
 
 
-(defmethod initialize-instance ((container container) &rest initargs
-				&key children)
-  (declare (ignore initargs))
-  (call-next-method)
-  (dolist (child children)
-    (cond
-     ((consp child)
-      (container-add container (first child))
-      (setf
-       (slot-value (first child) 'child-slots)
-       (apply
-	#'make-instance
-	(slot-value (class-of container) 'child-class)
-	:parent container :child (first child) (cdr child))))
-     (t
-      (container-add container child)))))
-
-(defbinding %container-child-getv () nil
+(defbinding %container-add () nil
   (container container)
-  (child widget)
-  (1 unsigned-int)
-  (arg arg))
+  (widget widget))
+
+(defmethod container-add ((container container) (widget widget) &rest args)
+  (%container-add container widget)
+  (when args
+    (setf
+     (slot-value widget 'child-slots)
+     (apply
+      #'make-instance
+      (gethash (class-of container) *container-to-child-class-mappings*)
+      :parent container :child widget args))))
 
-(defbinding %container-child-setv () nil
-  (container container)
-  (child widget)
-  (1 unsigned-int)
-  (arg arg))
-  
 
-(defbinding container-add () nil
+(defbinding %container-remove () nil
   (container container)
   (widget widget))
 
-(defbinding container-remove () nil
+(defmethod container-remove ((container container) (widget widget))
+  (%container-remove container widget)
+  (slot-makunbound widget 'child-slots))
+
+
+(defbinding %container-child-get-property () nil
   (container container)
-  (widget widget))
+  (child widget)
+  (property-name string)
+  (value gvalue))
+
+(defbinding %container-child-set-property () nil
+  (container container)
+  (child widget)
+  (property-name string)
+  (value gvalue))
+  
 
 (defbinding container-check-resize () nil
   (container container))
 
-(defbinding (%container-foreach "gtk_container_foreach_full")
-    (container function) nil
+(defvar *callback-marshal*
+  (system:foreign-symbol-address "gtk_callback_marshal"))
+
+(defbinding %container-foreach (container callback-id) nil
   (container container)
-  (0 unsigned-long)
   (*callback-marshal* pointer)
-  ((register-callback-function function) unsigned-long)
-  (*destroy-marshal* 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))))
 
 (defun map-container (seqtype func container)
   (case seqtype
@@ -76,15 +86,15 @@
      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))
@@ -94,7 +104,7 @@
 (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
@@ -104,19 +114,54 @@
 		(setq ,continue t)))))
        ,result)))
 
-(defbinding container-children () (glist widget)
-  (container container))
+;; (defbinding %container-get-children () (glist widget)
+;;   (container container))
+
+(defmethod container-children ((container container))
+;;   (%container-get-children container)
+  (map-container 'list #'identity container))
 
-(defun (setf container-children) (children container)
+(defmethod (setf container-children) (children (container container))
   (dolist (child (container-children container))
     (container-remove container child))
   (dolist (child children)
     (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)))