-;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 2000 Espen S. Johnsen <esj@stud.cs.uit.no>
+;; Common Lisp bindings for GTK+ v2.x
+;; Copyright 2000-2005 Espen S. Johnsen <espen@users.sf.net>
;;
-;; This library is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 2 of the License, or (at your option) any later version.
+;; Permission is hereby granted, free of charge, to any person obtaining
+;; a copy of this software and associated documentation files (the
+;; "Software"), to deal in the Software without restriction, including
+;; without limitation the rights to use, copy, modify, merge, publish,
+;; distribute, sublicense, and/or sell copies of the Software, and to
+;; permit persons to whom the Software is furnished to do so, subject to
+;; the following conditions:
;;
-;; This library is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; Lesser General Public License for more details.
+;; The above copyright notice and this permission notice shall be
+;; included in all copies or substantial portions of the Software.
;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+;; IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+;; CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-;; $Id: gtkcontainer.lisp,v 1.17 2005/02/22 23:08:52 espen Exp $
+;; $Id: gtkcontainer.lisp,v 1.23 2007/01/14 23:18:17 espen Exp $
(in-package "GTK")
+(defgeneric container-add (container widget &rest args))
+(defgeneric container-remove (container widget))
+(defgeneric container-all-children (container))
+(defgeneric container-internal-children (container))
+(defgeneric (setf container-children) (children container))
+
+
+(defun initial-add (object function initargs key pkey)
+ (loop
+ as (initarg value . rest) = initargs then rest
+ do (cond
+ ((eq initarg key) (funcall function object value))
+ ((eq initarg pkey) (mapc #'(lambda (value)
+ (funcall function object value))
+ value)))
+ while rest))
+
+(defun initial-apply-add (object function initargs key pkey)
+ (initial-add object #'(lambda (object value)
+ (apply function object (mklist value)))
+ initargs key pkey))
+
+
(defmethod shared-initialize ((container container) names &rest initargs
&key child children child-args
- (show-children nil show-children-p))
- (declare (ignore child children))
+ (show-children nil show-children-p))
+ (declare (ignore names child children))
(when show-children-p
(if (not show-children)
(setf (user-data container 'show-recursive-p) nil)
initargs :child :children))
-(defmethod compute-signal-function ((container container) signal function object)
+(defmethod compute-signal-function ((container container) signal function object args)
+ (declare (ignore signal))
(if (eq object :children)
- #'(lambda (&rest args)
- (mapc #'(lambda (child)
- (apply function child (rest args)))
- (container-children container)))
+ #'(lambda (&rest emission-args)
+ (let ((all-args (nconc (rest emission-args) args)))
+ (container-foreach container
+ #'(lambda (child)
+ (apply function child all-args)))))
(call-next-method)))
(gethash (class-of container) *container-to-child-class-mappings*)
:parent container :child widget args))))
+(defmethod container-add ((container container) (widgets list) &rest args)
+ (dolist (widget widgets)
+ (apply #'container-add container widget args)))
+
(defbinding %container-remove () nil
(container container)
(widget widget))
(defbinding container-check-resize () nil
(container container))
-(def-callback-marshal %foreach-callback (nil widget))
+(define-callback-marshal %foreach-callback nil (widget))
(defbinding %container-foreach (container callback-id) nil
(container container)
- ((callback %foreach-callback) pointer)
+ (%foreach-callback callback)
(callback-id unsigned-int))
(defun container-foreach (container function)
(defbinding %container-forall (container callback-id) nil
(container container)
- ((callback %foreach-callback) pointer)
+ (%foreach-callback callback)
(callback-id unsigned-int))
(defun container-forall (container function)
nil)
(list
(let ((list nil))
- (container-foreach
- container
+ (container-foreach container
#'(lambda (child)
(push (funcall func child) list)))
(nreverse list)))
(t
(let ((seq (make-sequence seqtype (container-length container)))
(index 0))
- (container-foreach
- container
+ (container-foreach container
#'(lambda (child)
(setf (elt seq index) (funcall func child))
(incf index)))
seq))))
-(defmethod container-children ((container container))
- (map-container 'list #'identity container))
+(defmethod container-all-children ((container container))
+ (let ((internal ()))
+ (container-forall container
+ #'(lambda (child)
+ (push child internal)))
+ (nreverse internal)))
+
+(defmethod container-internal-children ((container container))
+ (let ((external-children (container-children container))
+ (all-children (container-all-children container)))
+ (loop
+ for child in all-children
+ unless (find child external-children)
+ collect child)))
(defmethod (setf container-children) (children (container container))
(dolist (child (container-children container))
(defgeneric container-show-recursive (container))
(defmethod container-show-recursive ((container container))
- "Recursively shows any child widgets except widgets explicit hidden during construction."
+ "Recursively show any child widgets except widgets explicit hidden during construction."
(labels ((recursive-show (widget)
(when (typep widget 'container)
(if (not (user-data-p widget 'show-recursive-p))
~mdw / clg / blobdiff