Add GtkTreeSortable vtable

[cl-gtk2.git] / gtk / gtk.tree-model.lisp

diff --git a/gtk/gtk.tree-model.lisp b/gtk/gtk.tree-model.lisp
index 47962a0..abb4235 100644 (file)
--- 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,20 +9,31 @@
   (: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))))
+  (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)))
+  (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)))
+  (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))))
 
 ; TODO: GtkTreeSortable
 
@@ -31,10 +42,12 @@
 ; 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)
 
@@ -53,7 +66,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 +107,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 +119,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 +135,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 +160,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 +179,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 +192,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 +204,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 +244,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 +270,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 +283,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 +343,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))
@@ -502,16 +521,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 +546,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))