;; 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.8 2002-03-24 21:56:34 espen Exp $
+;; $Id: gtkcontainer.lisp,v 1.13 2004-12-17 00:15:16 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)
+ (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
(defbinding container-check-resize () nil
(container container))
-(defvar *callback-marshal*
- (system:foreign-symbol-address "gtk_callback_marshal"))
+(def-callback-marshal %foreach-callback (nil widget))
(defbinding %container-foreach (container callback-id) nil
(container container)
- (*callback-marshal* pointer)
+ ((callback %foreach-callback) 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))))
+ (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))