Infra: Rudimentary setup system.

[clg] / gtk / gtktree.lisp

diff --git a/gtk/gtktree.lisp b/gtk/gtktree.lisp
index 244271e74d3702475f8b415cae7c0958e89777f6..4d11b83dca033a2b49cd6df6638cf676beefae66 100644 (file)
--- 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.34 2008-04-11 20:53:32 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)))))
@@ -181,8 +181,7 @@ (defun list-store-insert-before
   (when data (setf (tree-model-row-data store iter) data))
   iter)
 
-(defbinding %list-store-insert-after 
-    (list-store &optional sibling (tree-iter (make-instance 'tree-iter))) nil
+(defbinding %list-store-insert-after () nil
   (list-store list-store)
   (tree-iter tree-iter)
   (sibling (or null tree-iter)))
@@ -256,11 +255,12 @@ (defun %make-tree-path (path)
     location))
 
 (defun %tree-path-to-vector (location)
-  (let ((indices (%tree-path-get-indices location))
-       (depth (%tree-path-get-depth location)))
-    (if (null-pointer-p indices)
-       #()
-      (map-c-vector 'vector #'identity indices 'int depth))))
+  (unless (null-pointer-p location)
+    (let ((indices (%tree-path-get-indices location))
+         (depth (%tree-path-get-depth location)))
+      (if (null-pointer-p indices)
+         #()
+       (map-c-vector 'vector #'identity indices 'int depth)))))
 
 (defmacro %with-tree-path ((var path) &body body)
   (let* ((pointer-offset (adjust-offset (size-of 'int) 'pointer))
@@ -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))
@@ -361,7 +369,7 @@ (defbinding %tree-row-reference-new () pointer
 (defmethod allocate-foreign ((reference tree-row-reference) &key model path)
   (%tree-row-reference-new model path))
 
-(defbinding tree-row-reference-get-path () tree-path
+(defbinding tree-row-reference-get-path () (or null tree-path)
   (reference tree-row-reference))
 
 (defbinding (tree-row-reference-valid-p "gtk_tree_row_reference_valid") () boolean
@@ -376,6 +384,12 @@ (defbinding tree-model-get-iter (model path &optional (iter (make-instance 'tree
   (model tree-model)
   (iter tree-iter :in/return)
   (path tree-path))
+
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.12.0")
+(defmethod allocate-foreign ((tree-iter tree-iter) &rest initargs)
+  (declare (ignore initargs))
+  (let ((size (foreign-size (class-of tree-iter))))
+    (slice-alloc size)))
  
 (defun ensure-tree-iter (model row)
   (etypecase row
@@ -401,20 +415,16 @@ (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
     with iter = (ensure-tree-iter model row)
-    for index from 0 to (tree-model-n-columns model)
+    for index from 0 below (tree-model-n-columns model)
     collect (tree-model-value model iter index))
    'vector))
 
@@ -489,7 +499,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 +511,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
@@ -570,15 +575,15 @@ (defbinding %tree-selection-path-is-selected () boolean
 
 (defbinding %tree-selection-select-iter () nil
   (tree-selection tree-selection)
-  (tree-path tree-path))
+  (tree-iter tree-iter))
 
 (defbinding %tree-selection-unselect-iter () nil
   (tree-selection tree-selection)
-  (tree-path tree-path))
+  (tree-iter tree-iter))
 
 (defbinding %tree-selection-iter-is-selected () boolean
   (tree-selection tree-selection)
-  (tree-path tree-path))
+  (tree-iter tree-iter))
 
 (defun tree-selection-select (selection row)
   (etypecase row
@@ -636,7 +641,7 @@ (defun tree-sortable-get-sort-column (sortable)
     (values
      (if special-p
         (int-to-sort-order column)
-       (column-name sortable column))
+       (tree-model-column-name sortable column))
      order)))
 
 (defbinding (tree-sortable-set-sort-column 
@@ -842,7 +847,10 @@ (defbinding tree-view-move-column-after () nil
   (column tree-view-column)
   (base-column (or null tree-view-column)))
 
-;;(defbinding tree-view-set-column drag-function ...)
+(define-callback-setter tree-view-set-column-drag-function tree-view boolean
+  (column tree-view-column) 
+  (prev tree-view-column) 
+  (next tree-view-column))
 
 (defbinding tree-view-scroll-to-point () nil
   (tree-view tree-view)
@@ -857,13 +865,8 @@ (defbinding tree-view-scroll-to-cell () nil
   (row-align single-float)
   (col-align single-float))
 
-(defbinding tree-view-set-cursor () nil
-  (tree-view tree-view)
-  (path tree-path)
-  (focus-column tree-view-column)
-  (start-editing boolean))
-
-(defbinding tree-view-set-cursor-on-cell () nil
+(defbinding (tree-view-set-cursor "gtk_tree_view_set_cursor_on_cell") 
+    (tree-view path &key focus-column focus-cell start-editing) nil
   (tree-view tree-view)
   (path tree-path)
   (focus-column (or null tree-view-column))
@@ -1084,18 +1087,18 @@   (defbinding icon-view-get-visible-range () boolean
     (start-path tree-path :out)
     (end-path tree-path :out))
 
-;;   (defbinding icon-view-enable-model-drag-source () nil
-;;     (icon-view icon-view)
-;;     (start-button-mask gdk:modifier-type)
-;;     (targets (vector target-entry))
-;;     ((length targets) unsigned-int)
-;;     (actions gdk:drag-action))
-
-;;   (defbinding icon-view-enable-model-drag-dest () nil
-;;     (icon-view icon-view)
-;;     (targets (vector target-entry))
-;;     ((length targets) unsigned-int)
-;;     (actions gdk:drag-action))
+  (defbinding icon-view-enable-model-drag-source () nil
+    (icon-view icon-view)
+    (start-button-mask gdk:modifier-type)
+    (targets (vector (inlined target-entry)))
+    ((length targets) unsigned-int)
+    (actions gdk:drag-action))
+
+  (defbinding icon-view-enable-model-drag-dest () nil
+    (icon-view icon-view)
+    (targets (vector (inlined target-entry)))
+    ((length targets) unsigned-int)
+    (actions gdk:drag-action))
 
   (defbinding icon-view-unset-model-drag-source () nil
     (icon-view icon-view))