X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=gtk%2Fgtk.tree-model.lisp;h=3f257e36db18d67c1ef1e07a3dac1c101233780e;hb=af5ce50499aa0db8d068c00e0a25d8a1334c1740;hp=51e28141c57cef3c488666d4e80300a97fc8fe7f;hpb=13fb2122ab02dc9595b2205aa94779d1b682482a;p=cl-gtk2.git diff --git a/gtk/gtk.tree-model.lisp b/gtk/gtk.tree-model.lisp index 51e2814..3f257e3 100644 --- a/gtk/gtk.tree-model.lisp +++ b/gtk/gtk.tree-model.lisp @@ -31,7 +31,7 @@ ; TODO: GtkTreeModelFilter -(defclass array-list-store (g-object tree-model) +(defclass array-list-store (tree-model) ((items :initform (make-array 0 :adjustable t :fill-pointer t) :reader store-items) (columns-getters :initform (make-array 0 :adjustable t :fill-pointer t) :reader store-getters) (columns-types :initform (make-array 0 :adjustable t :fill-pointer t) :reader store-types)) @@ -55,7 +55,7 @@ (defun store-add-item (store item) (vector-push-extend item (store-items store)) (let* ((path (make-instance 'tree-path)) - (iter (make-instance 'tree-iter))) + (iter (make-tree-iter))) (setf (tree-path-indices path) (list (1- (length (store-items store))))) (setf (tree-iter-stamp iter) 0 (tree-iter-user-data iter) (1- (length (store-items store)))) (emit-signal store "row-inserted" path iter))) @@ -96,8 +96,10 @@ (setf (tree-iter-stamp iter) 0 (tree-iter-user-data iter) (first indices)) t))) -(defmethod tree-model-ref-node-impl ((model array-list-store) iter)) -(defmethod tree-model-unref-node-impl ((model array-list-store) iter)) +(defmethod tree-model-ref-node-impl ((model array-list-store) iter) + (declare (ignorable model iter))) +(defmethod tree-model-unref-node-impl ((model array-list-store) iter) + (declare (ignorable model iter))) (defmethod tree-model-iter-next-impl ((model array-list-store) iter) (let ((n (tree-iter-user-data iter))) @@ -106,6 +108,7 @@ t))) (defmethod tree-model-iter-nth-child-impl ((model array-list-store) iter parent n) + (declare (ignorable parent)) (setf (tree-iter-stamp iter) 0 (tree-iter-user-data iter) n) t) @@ -121,6 +124,7 @@ path)) (defmethod tree-model-iter-has-child-impl ((model array-list-store) iter) + (declare (ignorable iter)) nil) (defgeneric tree-model-item (model iter-or-path)) @@ -164,7 +168,7 @@ (path (g-boxed-foreign tree-path))) (defun tree-model-iter-by-path (tree-model tree-path) - (let ((iter (make-instance 'tree-iter))) + (let ((iter (make-tree-iter))) (if (tree-model-set-iter-to-path tree-model iter tree-path) iter nil))) @@ -177,7 +181,7 @@ (path-string :string)) (defun tree-model-iter-from-string (tree-model path-string) - (let ((iter (make-instance 'tree-iter))) + (let ((iter (make-tree-iter))) (if (tree-model-set-iter-from-string tree-model iter path-string) iter nil))) @@ -189,7 +193,7 @@ (iter (g-boxed-foreign tree-iter))) (defun tree-model-iter-first (tree-model) - (let ((iter (make-instance 'tree-iter))) + (let ((iter (make-tree-iter))) (if (tree-model-set-iter-to-first tree-model iter) iter nil))) @@ -229,7 +233,7 @@ (parent (g-boxed-foreign tree-iter))) (defun tree-model-iter-first-child (tree-model parent) - (let ((iter (make-instance 'tree-iter))) + (let ((iter (make-tree-iter))) (if (gtk-tree-model-iter-children tree-model iter parent) iter nil))) @@ -255,7 +259,7 @@ (n :int)) (defun tree-model-iter-nth-child (tree-model parent n) - (let ((iter (make-instance 'tree-iter))) + (let ((iter (make-tree-iter))) (if (gtk-tree-model-iter-nth-child tree-model iter parent n) iter n))) @@ -268,7 +272,7 @@ (parent (g-boxed-foreign tree-iter))) (defun tree-model-iter-parent (tree-model iter) - (let ((parent (make-instance 'tree-iter))) + (let ((parent (make-tree-iter))) (if (gtk-tree-model-iter-parent tree-model iter parent) parent nil))) @@ -328,7 +332,14 @@ (adjust-array array (1- (length array)) :fill-pointer t) array) -(defclass tree-lisp-store (g-object tree-model) +(defstruct tree-node + (tree nil) + (parent nil) + (id nil) + (item nil) + (children (make-array 0 :element-type 'tree-node :adjustable t :fill-pointer t))) + +(defclass tree-lisp-store (tree-model) ((columns-getters :initform (make-array 0 :adjustable t :fill-pointer t) :reader tree-lisp-store-getters) (columns-types :initform (make-array 0 :adjustable t :fill-pointer t) :reader tree-lisp-store-types) (root :initform (make-tree-node) :reader tree-lisp-store-root) @@ -342,13 +353,6 @@ (register-object-type-implementation "LispTreeStore" tree-lisp-store "GObject" ("GtkTreeModel") nil) -(defstruct tree-node - (tree nil) - (parent nil) - (id nil) - (item nil) - (children (make-array 0 :element-type 'tree-node :adjustable t :fill-pointer t))) - (defun map-subtree (node fn) (funcall fn node) (iter (for child in-vector (tree-node-children node)) @@ -506,16 +510,16 @@ (tree-iter-user-data iter) (get-assigned-id store (tree-node-parent node)))))) (defmethod tree-model-ref-node-impl ((store tree-lisp-store) iter) - ) + (declare (ignorable iter))) (defmethod tree-model-unref-node-impl ((store tree-lisp-store) iter) - ) + (declare (ignorable iter))) (defun notice-tree-node-insertion (tree node child index) (declare (ignore node index)) (when tree (let* ((path (make-instance 'tree-path)) - (iter (make-instance 'tree-iter))) + (iter (make-tree-iter))) (setf (tree-path-indices path) (get-node-path child) (tree-iter-stamp iter) 0 (tree-iter-user-data iter) (get-assigned-id tree child)) @@ -531,7 +535,7 @@ (emit-signal tree "row-deleted" path)) (when (zerop (length (tree-node-children node))) (let* ((path (make-instance 'tree-path)) - (iter (make-instance 'tree-iter))) + (iter (make-tree-iter))) (setf (tree-path-indices path) (get-node-path node) (tree-iter-stamp iter) 0 (tree-iter-user-data iter) (get-assigned-id tree node))