X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/560af5c515eb5b6206040a9334de4254d2650147..18eed2a0a52c23fea78a40dccb17736419b5f931:/gtk/gtkcontainer.lisp

diff --git a/gtk/gtkcontainer.lisp b/gtk/gtkcontainer.lisp
index 5b47b2c..2d127d5 100644
--- 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,47 +15,10 @@
 ;; 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.3 2001-05-29 16:03:04 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)
@@ -74,54 +37,31 @@ (defmethod initialize-instance ((container container) &rest initargs
      (t
       (container-add container child)))))
 
-
-
-(define-foreign ("gtk_container_child_getv" container-child-get-arg) () nil
+(defbinding %container-child-getv () nil
   (container container)
   (child widget)
   (1 unsigned-int)
   (arg arg))
 
-(define-foreign ("gtk_container_child_setv" container-child-set-arg) () nil
+(defbinding %container-child-setv () 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
+(defbinding container-remove () nil
   (container container)
   (widget widget))
 
-(define-foreign container-check-resize () nil
+(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)
@@ -164,7 +104,7 @@ (defmacro do-container ((var container &optional (result nil)) &body body)
 		(setq ,continue t)))))
        ,result)))
 
-(define-foreign container-children () (double-list widget)
+(defbinding container-children () (glist widget)
   (container container))
 
 (defun (setf container-children) (children container)
@@ -178,5 +118,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))