;; 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.10 2004/11/01 00:08:50 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))
(call-next-method)
- (dolist (child (get-all initargs :child))
- (apply #'container-add container (mklist child))))
+ (dolist (child (append children (get-all initargs :child)))
+ (apply #'container-add container (append (mklist child) child-args))))
(defbinding %container-add () nil
(defbinding container-check-resize () nil
(container container))
-(defvar *callback-marshal*
- (system:foreign-symbol-address "gtk_callback_marshal"))
+(def-callback %foreach-callback (c-call:void (widget system-area-pointer)
+ (callback-id c-call:unsigned-int))
+ (invoke-callback callback-id nil (ensure-proxy-instance 'widget widget nil)))
(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)
(defun map-container (seqtype func container)
(case seqtype
((nil)
- (%container-foreach container func)
+ (container-foreach container func)
nil)
(list
(let ((list nil))