Re-registering custom signals and class closures when loading saved images

[clg] / gtk / gtktree.lisp

diff --git a/gtk/gtktree.lisp b/gtk/gtktree.lisp
index b3a6edcb87bc9263394312bc8959d9090777ba90..e882bdbed5837bcfca9ae2525b15b71cc825347c 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.
 
 ;; 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.30 2007/09/06 14:32:03 espen Exp $
+;; $Id: gtktree.lisp,v 1.34 2008/04/11 20:53:32 espen Exp $

 
 
 (in-package "GTK")
 
 
 (in-package "GTK")


@@ -369,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))
 
 (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
   (reference tree-row-reference))
 
 (defbinding (tree-row-reference-valid-p "gtk_tree_row_reference_valid") () boolean


@@ -384,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))
   (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
  
 (defun ensure-tree-iter (model row)
   (etypecase row


@@ -569,15 +575,15 @@ (defbinding %tree-selection-path-is-selected () boolean
 
 (defbinding %tree-selection-select-iter () nil
   (tree-selection tree-selection)
 
 (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)
 
 (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)
 
 (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
 
 (defun tree-selection-select (selection row)
   (etypecase row