Updated for gtk+-1.3.9 and misc changes

[clg] / gtk / gtkcontainer.lisp

diff --git a/gtk/gtkcontainer.lisp b/gtk/gtkcontainer.lisp
index 5b47b2c18ea4b7963efbeadd32c3cf1cad2a87e8..e103c1908ef3bc36c71ad22963afe3293c493f27 100644 (file)
--- a/gtk/gtkcontainer.lisp
+++ b/gtk/gtkcontainer.lisp
@@ -1,5 +1,5 @@
 ;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 2000 Espen S. Johnsen <espejohn@online.no>
+;; Copyright (C) 2000 Espen S. Johnsen <esj@stud.cs.uit.no>
 ;;
 ;; This library is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU Lesser General Public
@@ -15,118 +15,49 @@
 ;; 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.1 2000-08-14 16:45:02 espen Exp $
+;; $Id: gtkcontainer.lisp,v 1.4 2001-10-21 23:20:13 espen Exp $
 
 (in-package "GTK")
 
-(defclass container (widget)
-  ((border-width
-    :allocation :arg
-    :accessor container-border-width
-    :initarg :border-width
-    :type unsigned-long)
-   (resize-mode
-    :allocation :arg
-    :accessor container-resize-mode
-    :initarg :resize-mode
-    :type resize-mode)
-   (children
-    :allocation :virtual
-    :location container-children
-;    :initarg :children
-    )
-   (focus-child
-    :allocation :virtual
-    :location ("gtk_container_get_focus_child" "gtk_container_set_focus_child")
-    :accessor container-focus-child
-    :initarg :focus-child
-    :type widget)
-   (focus-hadjustment
-    :allocation :virtual
-    :location (nil "gtk_container_set_focus_hadjustment")
-    :writer (setf container-focus-hadjustment)
-    :initarg :focus-hadjustment
-    :type adjustment)   
-   (focus-vadjustment
-    :allocation :virtual
-    :location (nil "gtk_container_set_focus_vadjustment")
-    :writer (setf container-focus-vadjustment)
-    :initarg :focus-vadjustment
-    :type adjustment))
-  (:metaclass widget-class)
-  (:alien-name "GtkContainer"))
-
-
-(defmethod initialize-instance ((container container) &rest initargs
-                               &key children)
-  (declare (ignore initargs))
+(defmethod initialize-instance ((container container) &rest 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)))))
-
+  (dolist (child (get-all initargs :child))
+    (apply #'container-add container (mklist child))))
 
 
-(define-foreign ("gtk_container_child_getv" container-child-get-arg) () nil
-  (container container)
-  (child widget)
-  (1 unsigned-int)
-  (arg arg))
-
-(define-foreign ("gtk_container_child_setv" container-child-set-arg) () nil
-  (container container)
-  (child widget)
-  (1 unsigned-int)
-  (arg arg))
-
-(defun container-child-arg (container child name)
-  (with-gc-disabled
-    (let ((arg (arg-new 0)))
-      (setf (arg-name arg) name)
-      (container-child-get-arg container child arg) ; probably memory leak
-      (let ((type (type-from-number (arg-type arg))))
-       (prog1
-           (arg-value arg type)
-         (arg-free arg nil))))))
-
-(defun (setf container-child-arg) (value container child name)
-  (with-gc-disabled
-    (let ((arg (arg-new 0)))
-      (setf (arg-name arg) name)
-      (container-child-get-arg container child arg) ; probably memory leak
-      (let ((type (type-from-number (arg-type arg))))
-       (setf (arg-value arg type) value)
-       (container-child-set-arg container child arg)
-       (arg-free arg nil))))
-  value)
-
-
-(define-foreign container-add () nil
+(defbinding %container-add () nil
   (container container)
   (widget widget))
 
-(define-foreign container-remove () nil
+(defun container-add (container 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-remove () nil
   (container container)
   (widget widget))
 
-(define-foreign container-check-resize () nil
+(defun container-remove (container widget)
+  (%container-remove container widget)
+  (slot-makunbound widget 'child-slots))
+
+
+(defbinding container-check-resize () nil
   (container container))
 
-(define-foreign ("gtk_container_foreach_full" %container-foreach)
+(defbinding (%container-foreach "gtk_container_foreach_full")
     (container function) nil
   (container container)
   (0 unsigned-long)
   (*callback-marshal* pointer)
-  ((register-callback-function function) unsigned-long)
+  ((register-callback-function function) pointer)
   (*destroy-marshal* pointer))
 
 (defun map-container (seqtype func container)
@@ -164,10 +95,13 @@ (defmacro do-container ((var container &optional (result nil)) &body body)
                (setq ,continue t)))))
        ,result)))
 
-(define-foreign container-children () (double-list widget)
+(defbinding %container-get-children () (glist widget)
   (container container))
 
-(defun (setf container-children) (children container)
+(defmethod container-children ((container container))
+  (%container-get-children container))
+
+(defmethod (setf container-children) (children (container container))
   (dolist (child (container-children container))
     (container-remove container child))
   (dolist (child children)
@@ -178,5 +112,5 @@ (defun (setf container-children) (children container)
 (defun container-num-children (container)
   (length (container-children container)))
 
-(define-foreign container-resize-children () nil
+(defbinding container-resize-children () nil
   (container container))