Renamed CLIPBOARD-SET-CONTENT to CLIPBOARD-SET-CONTENTS for consistency

[clg] / gtk / gtktree.lisp

diff --git a/gtk/gtktree.lisp b/gtk/gtktree.lisp
index 8469b04be76ffc7a5940e75db53189d7a07a732f..de51661e0e09b9c93ac104e04f183f165654c7d9 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.28 2007-08-20 10:33:05 espen Exp $
+;; $Id: gtktree.lisp,v 1.32 2007-10-22 09:21:50 espen Exp $
 
 
 (in-package "GTK")
@@ -255,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))
@@ -383,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
@@ -417,7 +424,7 @@ (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))