From b8de3ff89a323f0e78bf5887667ee0e9bb9c1445 Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Sun, 7 Jan 2007 19:56:05 +0000 Subject: [PATCH] Added args argument to COMPUTE-SIGNAL-FUNCTION and some missing defgenerics Organization: Straylight/Edgeware From: espen --- gtk/gtktree.lisp | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/gtk/gtktree.lisp b/gtk/gtktree.lisp index 244271e..8dd9ea5 100644 --- a/gtk/gtktree.lisp +++ b/gtk/gtktree.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: gtktree.lisp,v 1.25 2006-10-17 15:27:52 espen Exp $ +;; $Id: gtktree.lisp,v 1.26 2007-01-07 19:56:05 espen Exp $ (in-package "GTK") @@ -75,8 +75,8 @@ (defbinding cell-layout-clear-attributes () nil ;;;; Cell Renderer -(defmethod compute-signal-function ((gobject cell-renderer-toggle) (signal (eql 'toggled)) function object) - (declare (ignore gobject signal function object)) +(defmethod compute-signal-function ((gobject cell-renderer-toggle) (signal (eql 'toggled)) function object args) + (declare (ignore gobject signal function object args)) (let ((function (call-next-method))) #'(lambda (object path) (funcall function object (ensure-tree-path path))))) @@ -354,6 +354,14 @@ (defun ensure-tree-path (path) ;;; Tree Model +(defgeneric tree-model-value (model row column)) +(defgeneric (setf tree-model-value) (value model row column)) +(defgeneric tree-model-row-data (model row)) +(defgeneric (setf tree-model-row-data) (data model row)) +(defgeneric tree-model-column-index (model column)) +(defgeneric tree-model-column-name (model index)) + + (defbinding %tree-row-reference-new () pointer (model tree-model) (path tree-path)) @@ -401,15 +409,11 @@ (defbinding %tree-model-get-value () nil (column int) (gvalue gvalue)) -(defgeneric tree-model-value (model row column)) - (defmethod tree-model-value ((model tree-model) row column) (let ((index (tree-model-column-index model column))) (with-gvalue (gvalue) (%tree-model-get-value model (ensure-tree-iter model row) index gvalue)))) -(defgeneric tree-model-row-data (model row)) - (defmethod tree-model-row-data ((model tree-model) row) (coerce (loop @@ -489,7 +493,6 @@ (defbinding tree-model-rows-reordered () nil (iter tree-iter) (new-order int)) - (defmethod tree-model-column-index ((model tree-model) column) (or (etypecase column @@ -502,10 +505,6 @@ (defmethod tree-model-column-name ((model tree-model) index) (svref (user-data model 'column-names) index)) -(defgeneric (setf tree-model-value) (value model row column)) - -(defgeneric (setf tree-model-row-data) (data model row)) - (defmethod (setf tree-model-row-data) ((data list) (model tree-model) (iter tree-iter)) (loop for (column value) on data by #'cddr -- [mdw]