From 4a8bb854f067550a460b2ab872db545c414b2986 Mon Sep 17 00:00:00 2001 Message-Id: <4a8bb854f067550a460b2ab872db545c414b2986.1718847912.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sun, 14 Jan 2007 23:18:17 +0000 Subject: [PATCH] Added missing defgenrics Organization: Straylight/Edgeware From: espen --- gtk/gtk.lisp | 8 +++++++- gtk/gtkcontainer.lisp | 9 +++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/gtk/gtk.lisp b/gtk/gtk.lisp index faa8755..2e5e250 100644 --- a/gtk/gtk.lisp +++ b/gtk/gtk.lisp @@ -20,7 +20,7 @@ ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -;; $Id: gtk.lisp,v 1.67 2007/01/07 20:23:22 espen Exp $ +;; $Id: gtk.lisp,v 1.68 2007/01/14 23:18:17 espen Exp $ (in-package "GTK") @@ -1068,6 +1068,8 @@ (defun %add-activate-callback (widget signal function object after) (defmethod activate-radio-widget ((button radio-button)) (signal-emit button 'clicked)) +(defgeneric add-activate-callback (action function &key object after)) + (defmethod add-activate-callback ((button radio-button) function &key object after) (%add-activate-callback button 'clicked function object after)) @@ -1482,10 +1484,14 @@ (defun (setf window-default-icon-list) (icons) (defbinding %window-set-default-icon () nil (icons (glist gdk:pixbuf))) +(defgeneric (setf window-default-icon) (icon)) + (defmethod (setf window-default-icon) ((icon gdk:pixbuf)) (%window-set-default-icon icon) icon) +(defgeneric (setf window-group) (group window)) + (defmethod (setf window-group) ((group window-group) (window window)) (window-group-add-window group window) group) diff --git a/gtk/gtkcontainer.lisp b/gtk/gtkcontainer.lisp index 89634c1..9f810b5 100644 --- a/gtk/gtkcontainer.lisp +++ b/gtk/gtkcontainer.lisp @@ -20,13 +20,14 @@ ;; 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.22 2007/01/07 20:23:22 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-children (container)) +(defgeneric container-all-children (container)) +(defgeneric container-internal-children (container)) (defgeneric (setf container-children) (children container)) @@ -165,11 +166,11 @@ (defmethod container-all-children ((container container)) (nreverse internal))) (defmethod container-internal-children ((container container)) - (let ((public-children (container-children container)) + (let ((external-children (container-children container)) (all-children (container-all-children container))) (loop for child in all-children - unless (find child public-children) + unless (find child external-children) collect child))) (defmethod (setf container-children) (children (container container)) -- [mdw]