X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=gtk%2Fgtk.tree-model.lisp;h=4b8f8131ca3a8f1eb921428368495a13a750ed47;hb=96aa7293addaacdfe29ce32e60e2feac7df6ffce;hp=9b80f09d9f09610c8021226fb13ba1bde4621e48;hpb=5fe17678137c04ece910ae65a35ee58a0c7761c7;p=cl-gtk2.git

diff --git a/gtk/gtk.tree-model.lisp b/gtk/gtk.tree-model.lisp
index 9b80f09..4b8f813 100644
--- a/gtk/gtk.tree-model.lisp
+++ b/gtk/gtk.tree-model.lisp
@@ -1,6 +1,6 @@
 (in-package :gtk)
 
-(define-vtable ("GtkTreeModel" c-gtk-tree-model)
+(define-vtable ("GtkTreeModel" tree-model)
   (:skip parent-instance g-type-interface)
   ;;some signals
   (:skip tree-model-row-changed :pointer)
@@ -9,32 +9,137 @@
   (:skip tree-model-row-deleted :pointer)
   (:skip tree-model-rows-reordered :pointer)
   ;;methods
-  (tree-model-get-flags-impl tree-model-get-flags-cb tree-model-flags (tree-model g-object))
-  (tree-model-get-n-columns-impl tree-model-get-n-columns-cb :int (tree-model g-object))
-  (tree-model-get-column-type-impl tree-model-get-column-type-cb g-type-designator (tree-model g-object) (index :int))
-  (tree-model-get-iter-impl tree-model-get-iter-cb :boolean (tree-model g-object) (iter (g-boxed-foreign tree-iter)) (path (g-boxed-foreign tree-path)))
-  (tree-model-get-path-impl tree-model-get-path-cb (g-boxed-foreign tree-path :return) (tree-model g-object) (iter (g-boxed-foreign tree-iter)))
-  (tree-model-get-value-impl tree-model-get-value-cb :void (tree-model g-object) (iter (g-boxed-foreign tree-iter)) (n :int) (value (:pointer g-value)))
-  (tree-model-iter-next-impl tree-model-iter-next-cb :boolean (tree-model g-object) (iter (g-boxed-foreign tree-iter)))
-  (tree-model-iter-children-impl tree-model-iter-children-cb :boolean (tree-model g-object) (iter (g-boxed-foreign tree-iter)) (parent (g-boxed-foreign tree-iter)))
-  (tree-model-iter-has-child-impl tree-model-iter-has-child-cb :boolean (tree-model g-object) (iter (g-boxed-foreign tree-iter)))
-  (tree-model-iter-n-children-impl tree-model-iter-n-children-cb :int (tree-model g-object) (iter (g-boxed-foreign tree-iter)))
-  (tree-model-iter-nth-child-impl tree-model-iter-nth-child-cb :boolean (tree-model g-object) (iter (g-boxed-foreign tree-iter)) (parent (g-boxed-foreign tree-iter)) (n :int))
-  (tree-model-iter-parent-impl tree-model-iter-parent-cb :boolean (tree-model g-object) (iter (g-boxed-foreign tree-iter)) (child (g-boxed-foreign tree-iter)))
-  (tree-model-ref-node-impl tree-model-ref-node-cb :void (tree-model g-object) (iter (g-boxed-foreign tree-iter)))
-  (tree-model-unref-node-impl tree-model-unref-node-cb :void (tree-model g-object) (iter (g-boxed-foreign tree-iter))))
-
-; TODO: GtkTreeSortable
-
-; TODO: GtkTreeModelSort
+  (get-flags (tree-model-flags (tree-model g-object)))
+  (get-n-columns (:int (tree-model g-object)))
+  (get-column-type (g-type-designator
+                    (tree-model g-object)
+                    (index :int)))
+  (get-iter (:boolean
+             (tree-model g-object)
+             (iter (g-boxed-foreign tree-iter))
+             (path (g-boxed-foreign tree-path))))
+  (get-path ((g-boxed-foreign tree-path :return)
+             (tree-model g-object)
+             (iter (g-boxed-foreign tree-iter))))
+  (get-value (:void
+              (tree-model g-object)
+              (iter (g-boxed-foreign tree-iter))
+              (n :int)
+              (value (:pointer g-value)))
+             :impl-call
+             ((tree-model iter n)
+              (multiple-value-bind (v type) (tree-model-get-value-impl tree-model iter n)
+                (set-g-value value v type))))
+  (iter-next (:boolean
+              (tree-model g-object)
+              (iter (g-boxed-foreign tree-iter))))
+  (iter-children (:boolean
+                  (tree-model g-object)
+                  (iter (g-boxed-foreign tree-iter))
+                  (parent (g-boxed-foreign tree-iter))))
+  (iter-has-child (:boolean
+                   (tree-model g-object)
+                   (iter (g-boxed-foreign tree-iter))))
+  (iter-n-children (:int
+                    (tree-model g-object)
+                    (iter (g-boxed-foreign tree-iter))))
+  (iter-nth-child (:boolean
+                   (tree-model g-object)
+                   (iter (g-boxed-foreign tree-iter))
+                   (parent (g-boxed-foreign tree-iter))
+                   (n :int)))
+  (iter-parent (:boolean
+                (tree-model g-object)
+                (iter (g-boxed-foreign tree-iter))
+                (child (g-boxed-foreign tree-iter))))
+  (ref-node (:void
+             (tree-model g-object)
+             (iter (g-boxed-foreign tree-iter))))
+  (unref-node (:void
+               (tree-model g-object)
+               (iter (g-boxed-foreign tree-iter)))))
+
+(define-vtable ("GtkTreeSortable" tree-sortable)
+  (:skip parent-instance g-type-interface)
+  ;; signal
+  (:skip sort-columns-changed :pointer)
+  ;; methods
+  (get-sort-column-id
+   (:boolean (sortable (g-object tree-sortable))
+             (sort-column-id (:pointer :int))
+             (order (:pointer sort-type)))
+   :impl-call ((sortable)
+               (multiple-value-bind (sorted-p r-sort-column-id r-order) (tree-sortable-get-sort-column-id-impl sortable)
+                 (unless (null-pointer-p sort-column-id)
+                   (setf (mem-ref sort-column-id :int) r-sort-column-id))
+                 (unless (null-pointer-p order)
+                   (setf (mem-ref order 'sort-type) r-order))
+                 sorted-p)))
+  (set-sort-column-id (:void (sortable (g-object tree-sortable)) (sort-column-id :int) (order sort-type)))
+  (set-sort-func (:void (sortable (g-object tree-sortable)) (sort-column-id :int) (func :pointer) (data :pointer) (destroy-notify :pointer)))
+  (set-default-sort-func (:void (sortable (g-object tree-sortable)) (func :pointer) (data :pointer) (destroy-notify :pointer)))
+  (has-default-sort-func (:boolean (sortable (g-object tree-sortable)))))
+
+(defcfun (tree-model-sort-convert-child-path-to-path "gtk_tree_model_sort_convert_child_path_to_path") (g-boxed-foreign tree-path :return)
+  (tree-model-sort (g-object tree-model-sort))
+  (child-path (g-boxed-foreign tree-path)))
+
+(export 'tree-model-sort-convert-child-path-to-path)
+
+(defcfun gtk-tree-model-sort-convert-child-iter-to-iter :boolean
+  (tree-model-sort (g-object tree-model-sort))
+  (sort-iter (g-boxed-foreign tree-iter))
+  (child-iter (g-boxed-foreign tree-iter)))
+
+(defun tree-model-sort-convert-child-iter-to-iter (tree-model-sort child-iter)
+  (let ((sort-iter (make-tree-iter)))
+    (when (gtk-tree-model-sort-convert-child-iter-to-iter tree-model-sort sort-iter child-iter)
+      sort-iter)))
+
+(export 'tree-model-sort-convert-child-iter-to-iter)
+
+(defcfun (tree-model-sort-convert-path-to-child-path "gtk_tree_model_sort_convert_path_to_child_path") (g-boxed-foreign tree-path :return)
+  (tree-model-sort (g-object tree-model-sort))
+  (sort-path (g-boxed-foreign tree-path)))
+
+(export 'tree-model-sort-convert-path-to-child-path)
+
+(defcfun gtk-tree-model-sort-convert-iter-to-child-iter :void
+  (tree-model-sort (g-object tree-model-sort))
+  (child-iter (g-boxed-foreign tree-iter))
+  (sorted-iter (g-boxed-foreign tree-iter)))
+
+(defun tree-model-sort-convert-iter-to-child-iter (tree-model-sort sorted-iter)
+  (let ((child-iter (make-tree-iter)))
+    (gtk-tree-model-sort-convert-iter-to-child-iter tree-model-sort child-iter sorted-iter)
+    child-iter))
+
+(export 'tree-model-sort-convert-iter-to-child-iter)
+
+(defcfun (tree-model-sort-reset-default-sort-func "gtk_tree_model_sort_reset_default_sort_func") :void
+  (tree-model-sort (g-object tree-model-sort)))
+
+(export 'tree-model-sort-reset-default-sort-func)
+
+(defcfun (tree-model-sort-clear-cache "gtk_tree_model_sort_clear_cache") :void
+  (tree-model-sort (g-object tree-model-sort)))
+
+(export 'tree-model-sort-clear-cached)
+
+(defcfun (tree-model-sort-iter-is-valid "gtk_tree_model_sort_iter_is_valid") :boolean
+  (tree-model-sort (g-object tree-model-sort))
+  (iter (g-boxed-foreign tree-iter)))
 
-; TODO: GtkTreeModelFilter
+(export 'tree-model-sort-iter-is-valid)
 
+; 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)))
+   (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)
 
@@ -52,8 +157,8 @@
 
 (defun store-add-item (store item)
   (vector-push-extend item (store-items store))
-  (using* ((path (make-instance 'tree-path))
-           (iter (make-instance 'tree-iter)))
+  (let* ((path (make-instance 'tree-path))
+         (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)))
@@ -65,9 +170,9 @@
     (let ((index (position item items :test test)))
       (unless index (error "No such item~%~A~%in list-store~%~A" item store))
       (setf items (delete item items :test test))
-      (using (path (make-instance 'tree-path))
-             (setf (tree-path-indices path) (list index))
-             (emit-signal store "row-deleted" path)))))
+      (let ((path (make-instance 'tree-path)))
+        (setf (tree-path-indices path) (list index))
+        (emit-signal store "row-deleted" path)))))
 
 (export 'store-remove-item)
 
@@ -88,28 +193,32 @@
   (aref (store-types tree-model) index))
 
 (defmethod tree-model-get-iter-impl ((model array-list-store) iter path)
-  (using* (iter path)
-    (let ((indices (tree-path-indices path)))
-      (when (and (= 1 (length indices))
-                 (< (first indices) (length (store-items model))))
-        (setf (tree-iter-stamp iter) 0 (tree-iter-user-data iter) (first indices))
-        t))))
+  (let ((indices (tree-path-indices path)))
+    (when (and (= 1 (length indices))
+               (< (first indices) (length (store-items model))))
+      (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) (release iter))
-(defmethod tree-model-unref-node-impl ((model array-list-store) iter) (release 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)
-  (using* (iter)
-    (let ((n (tree-iter-user-data iter)))
-      (when (< n (1- (length (store-items model))))
-        (setf (tree-iter-user-data iter) (1+ n))
-        t))))
+  (let ((n (tree-iter-user-data iter)))
+    (when (< n (1- (length (store-items model))))
+      (setf (tree-iter-user-data iter) (1+ n))
+      t)))
 
 (defmethod tree-model-iter-nth-child-impl ((model array-list-store) iter parent n)
-  (using* (iter parent)
-    (setf (tree-iter-stamp iter) 0
-          (tree-iter-user-data iter) n)
-    t))
+  (declare (ignorable parent))
+  (setf (tree-iter-stamp iter) 0
+        (tree-iter-user-data iter) n)
+  t)
+
+(defmethod tree-model-iter-children-impl ((model array-list-store) iter parent)
+  (declare (ignore iter parent))
+  nil)
 
 (defmethod tree-model-iter-n-children-impl ((model array-list-store) iter)
   (if (null iter)
@@ -122,7 +231,7 @@
     path))
 
 (defmethod tree-model-iter-has-child-impl ((model array-list-store) iter)
-  (release iter)
+  (declare (ignorable iter))
   nil)
 
 (defgeneric tree-model-item (model iter-or-path))
@@ -137,18 +246,16 @@
 
 (export 'tree-model-item)
 
-(defmethod tree-model-get-value-impl ((model array-list-store) iter n value)
-  (using (iter)
-    (let ((n-row (tree-iter-user-data iter)))
-      (set-g-value value
-                   (funcall (aref (store-getters model) n) 
-                            (aref (store-items model) n-row))
-                   (aref (store-types model) n)))))
+(defmethod tree-model-get-value-impl ((model array-list-store) iter n)
+  (let ((n-row (tree-iter-user-data iter)))
+    (values (funcall (aref (store-getters model) n) 
+                     (aref (store-items model) n-row))
+            (aref (store-types model) n))))
 
 (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))
@@ -167,10 +274,10 @@
   (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
-        (progn (release iter) nil))))
+        nil)))
 
 (export 'tree-model-iter-by-path)
 
@@ -180,10 +287,10 @@
   (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
-        (progn (release iter) nil))))
+        nil)))
 
 (export 'tree-model-iter-from-string)
 
@@ -192,10 +299,10 @@
   (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
-        (progn (release iter) nil))))
+        nil)))
 
 (export 'tree-model-iter-first)
 
@@ -232,10 +339,10 @@
   (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
-        (progn (release iter) nil))))
+        nil)))
 
 (export 'tree-model-iter-first-child)
 
@@ -258,23 +365,23 @@
   (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
-        (progn (release iter) n))))
+        n)))
 
 (export 'tree-model-iter-nth-child)
 
 (defcfun gtk-tree-model-iter-parent :boolean
   (tree-model g-object)
   (iter (g-boxed-foreign tree-iter))
-  (parent (g-boxed-foreign tree-iter)))
+  (child (g-boxed-foreign tree-iter)))
 
 (defun tree-model-iter-parent (tree-model iter)
-  (let ((parent (make-instance 'tree-iter)))
-    (if (gtk-tree-model-iter-parent tree-model iter parent)
+  (let ((parent (make-tree-iter)))
+    (if (gtk-tree-model-iter-parent tree-model parent iter)
         parent
-        (progn (release parent) nil))))
+        nil)))
 
 (export 'tree-model-iter-parent)
 
@@ -331,25 +438,27 @@
   (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)
    (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))
@@ -438,93 +547,86 @@
   (gethash id (tree-lisp-store-id-map tree)))
 
 (defmethod tree-model-get-iter-impl ((store tree-lisp-store) iter path)
-  (using* (iter path)
-    (let* ((node (get-node-by-path store path))
-           (node-idx (get-assigned-id store node)))
-      (setf (tree-iter-stamp iter) 0
-            (tree-iter-user-data iter) node-idx))))
+  (let* ((node (get-node-by-path store path))
+         (node-idx (get-assigned-id store node)))
+    (setf (tree-iter-stamp iter) 0
+          (tree-iter-user-data iter) node-idx)))
 
 (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)))
     (setf (tree-path-indices path) indices)
     path))
 
-(defmethod tree-model-get-value-impl ((store tree-lisp-store) iter n value)
-  (using* (iter)
-    (let* ((node (get-node-by-iter store iter))
-           (getter (aref (tree-lisp-store-getters store) n))
-           (type (aref (tree-lisp-store-types store) n)))
-      (set-g-value value (funcall getter (tree-node-item node)) type))))
+(defmethod tree-model-get-value-impl ((store tree-lisp-store) iter n)
+  (let* ((node (get-node-by-iter store iter))
+         (getter (aref (tree-lisp-store-getters store) n))
+         (type (aref (tree-lisp-store-types store) n)))
+    (values (funcall getter (tree-node-item node))
+            type)))
 
 (defmethod tree-model-iter-next-impl ((store tree-lisp-store) iter)
-  (using* (iter)
-    (let* ((node (get-node-by-iter store iter))
-           (parent (tree-node-parent node))
-           (index (position node (tree-node-children parent))))
-      (when (< (1+ index) (length (tree-node-children parent)))
-        (setf (tree-iter-stamp iter)
-              0
-              (tree-iter-user-data iter)
-              (get-assigned-id store (tree-node-child-at parent (1+ index))))
-        t))))
+  (let* ((node (get-node-by-iter store iter))
+         (parent (tree-node-parent node))
+         (index (position node (tree-node-children parent))))
+    (when (< (1+ index) (length (tree-node-children parent)))
+      (setf (tree-iter-stamp iter)
+            0
+            (tree-iter-user-data iter)
+            (get-assigned-id store (tree-node-child-at parent (1+ index))))
+      t)))
 
 (defmethod tree-model-iter-children-impl ((store tree-lisp-store) iter parent)
-  (using* (iter parent)
-    (let* ((node (if parent
-                     (get-node-by-iter store parent)
-                     (tree-lisp-store-root store))))
-      (when (plusp (length (tree-node-children node)))
-        (setf (tree-iter-stamp iter)
-              0
-              (tree-iter-user-data iter)
-              (get-assigned-id store (tree-node-child-at node 0)))
-        t))))
+  (let* ((node (if parent
+                   (get-node-by-iter store parent)
+                   (tree-lisp-store-root store))))
+    (when (plusp (length (tree-node-children node)))
+      (setf (tree-iter-stamp iter)
+            0
+            (tree-iter-user-data iter)
+            (get-assigned-id store (tree-node-child-at node 0)))
+      t)))
 
 (defmethod tree-model-iter-has-child-impl ((store tree-lisp-store) iter)
-  (using* (iter)
-    (let ((node (get-node-by-iter store iter)))
-      (plusp (length (tree-node-children node))))))
+  (let ((node (get-node-by-iter store iter)))
+    (plusp (length (tree-node-children node)))))
 
 (defmethod tree-model-iter-n-children-impl ((store tree-lisp-store) iter)
-  (using* (iter)
-    (let* ((node (if iter
-                     (get-node-by-iter store iter)
-                     (tree-lisp-store-root store))))
-      (length (tree-node-children node)))))
+  (let* ((node (if iter
+                   (get-node-by-iter store iter)
+                   (tree-lisp-store-root store))))
+    (length (tree-node-children node))))
 
 (defmethod tree-model-iter-nth-child-impl ((store tree-lisp-store) iter parent n)
-  (using* (iter parent)
-    (let* ((node (if parent
-                     (get-node-by-iter store parent)
-                     (tree-lisp-store-root store)))
-           (requested-node (tree-node-child-at node n)))
-      (setf (tree-iter-stamp iter) 0
-            (tree-iter-user-data iter) (get-assigned-id store requested-node))
-      t)))
+  (let* ((node (if parent
+                   (get-node-by-iter store parent)
+                   (tree-lisp-store-root store)))
+         (requested-node (tree-node-child-at node n)))
+    (setf (tree-iter-stamp iter) 0
+          (tree-iter-user-data iter) (get-assigned-id store requested-node))
+    t))
 
 (defmethod tree-model-iter-parent-impl ((store tree-lisp-store) iter child)
-  (using* (iter child)
-    (let ((node (get-node-by-iter store child)))
-      (when (tree-node-parent node)
-        (setf (tree-iter-stamp iter) 0
-              (tree-iter-user-data iter) (get-assigned-id store (tree-node-parent node)))))))
+  (let ((node (get-node-by-iter store child)))
+    (when (tree-node-parent node)
+      (setf (tree-iter-stamp iter) 0
+            (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
-    (using* ((path (make-instance 'tree-path))
-             (iter (make-instance 'tree-iter)))
+    (let* ((path (make-instance 'tree-path))
+           (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))
@@ -535,12 +637,12 @@
 (defun notice-tree-node-removal (tree node child index)
   (declare (ignore child))
   (when tree
-    (using (path (make-instance 'tree-path))
+    (let ((path (make-instance 'tree-path)))
       (setf (tree-path-indices path) (nconc (get-node-path node) (list index)))
       (emit-signal tree "row-deleted" path))
     (when (zerop (length (tree-node-children node)))
-      (using* ((path (make-instance 'tree-path))
-               (iter (make-instance 'tree-iter)))
+      (let* ((path (make-instance 'tree-path))
+             (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))