X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=gtk%2Fgtk.tree-model.lisp;h=d7a4bdc80e2f5fe13b2a3fd4a7111f9247e0e799;hb=280cc197440f3dec31bcbcd88b001b740be6e697;hp=95ce681a8983ef95b973a60fff87c0862c41f1be;hpb=69a6b522dcf3fbbdbe5d68864b0fd904262c0322;p=cl-gtk2.git diff --git a/gtk/gtk.tree-model.lisp b/gtk/gtk.tree-model.lisp index 95ce681..d7a4bdc 100644 --- a/gtk/gtk.tree-model.lisp +++ b/gtk/gtk.tree-model.lisp @@ -34,7 +34,9 @@ (defclass array-list-store (g-object 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))) + (columns-types :initform (make-array 0 :adjustable t :fill-pointer t) :reader store-types)) + (:metaclass gobject-class) + (:g-type-name . "LispArrayListStore")) (export 'array-list-store) @@ -53,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))) @@ -94,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))) @@ -104,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) @@ -119,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)) @@ -143,7 +149,7 @@ (defcfun (tree-model-flags "gtk_tree_model_get_flags") tree-model-flags (tree-model g-object)) -(export 'tree-modelg-flags) +(export 'tree-model-flags) (defcfun (tree-model-n-columns "gtk_tree_model_get_n_columns") :int (tree-model g-object)) @@ -162,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))) @@ -175,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))) @@ -187,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))) @@ -227,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))) @@ -253,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))) @@ -266,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))) @@ -326,25 +332,27 @@ (adjust-array array (1- (length array)) :fill-pointer t) array) +(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 (g-object 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) (id-map :initform (make-hash-table) :reader tree-lisp-store-id-map) - (next-id-value :initform 0 :accessor tree-lisp-store-next-id-value))) + (next-id-value :initform 0 :accessor tree-lisp-store-next-id-value)) + (:metaclass gobject-class) + (:g-type-name . "LispTreeStore")) (defmethod initialize-instance :after ((object tree-lisp-store) &key &allow-other-keys) (setf (tree-node-tree (tree-lisp-store-root object)) object)) (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)) @@ -441,7 +449,7 @@ (defun get-node-by-iter (tree iter) (get-node-by-id tree (tree-iter-user-data iter))) -(defmethod tree-model-get-path-impl ((store array-list-store) iter) +(defmethod tree-model-get-path-impl ((store tree-lisp-store) iter) (let* ((path (make-instance 'tree-path)) (node (get-node-by-iter store iter)) (indices (get-node-path node))) @@ -502,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)) @@ -527,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))