[gtk-cffi-cvs] CVS gtk-cffi/gtk
CVS User rklochkov
rklochkov at common-lisp.net
Mon Dec 31 13:33:38 UTC 2012
Update of /project/gtk-cffi/cvsroot/gtk-cffi/gtk
In directory tiger.common-lisp.net:/tmp/cvs-serv30885/gtk
Modified Files:
builder.lisp selections.lisp text-buffer.lisp tree-model.lisp
tree-view.lisp widget.lisp
Log Message:
Backed to CFFI 10.7 (was version from git)
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/builder.lisp 2012/08/19 16:19:26 1.4
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/builder.lisp 2012/12/31 13:33:38 1.5
@@ -14,19 +14,19 @@
(gtk-builder-new))
(defcfun gtk-builder-add-from-file :uint
- (builder pobject) (filename :string) (g-error (:pointer (:struct g-error))))
+ (builder pobject) (filename :string) (g-error :pointer))
(defcfun gtk-builder-add-from-string :uint
(builder pobject) (string :string) (length gsize)
- (g-error (:pointer (:struct g-error))))
+ (g-error :pointer))
(defcfun gtk-builder-add-objects-from-file :uint
(builder pobject) (filename :string) (object-ids string-list)
- (g-error (:pointer (:struct g-error))))
+ (g-error :pointer))
(defcfun gtk-builder-add-objects-from-string :uint
(builder pobject) (string :string) (length gsize) (object-ids string-list)
- (g-error (:pointer (:struct g-error))))
+ (g-error :pointer))
(defgeneric add-from (builder &key filename string objects)
(:method
@@ -76,11 +76,11 @@
(defcfun gtk-builder-value-from-string :boolean
(builder pobject) (pspec pobject) (string :string) (value pobject)
- (g-error (:pointer (:struct g-error))))
+ (g-error :pointer))
(defcfun gtk-builder-value-from-string-type :boolean
(builder pobject) (g-type g-type) (string :string) (value pobject)
- (g-error (:pointer (:struct g-error))))
+ (g-error :pointer))
(defgeneric value-from-string (builder &key g-type param-spec string)
(:method ((builder builder) &key g-type param-spec string)
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/selections.lisp 2012/12/24 16:32:05 1.2
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/selections.lisp 2012/12/31 13:33:38 1.3
@@ -7,3 +7,19 @@
(target :string)
(flags :uint)
(info :uint))
+
+(defcfun gtk-target-entry-new :pointer
+ (target :string) (flags :uint) (info :uint))
+
+(defmethod gconstructor ((target-entry target-entry)
+ &key new-struct target flags info
+ &allow-other-keys)
+ (if new-struct
+ (gtk-target-entry-new target flags info)
+ (call-next-method)))
+
+(defcfun gtk-target-entry-free :void (ptr :pointer))
+
+(defmethod free-struct ((class (eql 'target-entry)) ptr)
+ (gtk-target-entry-free ptr))
+
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/text-buffer.lisp 2012/08/24 19:27:54 1.13
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/text-buffer.lisp 2012/12/31 13:33:38 1.14
@@ -445,7 +445,7 @@
(defcfun gtk-text-buffer-deserialize :boolean
(register-buffer pobject) (content-buffer pobject) (format gatom)
(text-iter pobject) (data (garray :uint8)) (length :int)
- (err (:pointer (:struct g-error))))
+ (err :pointer))
(define-condition deserialize-warning (warning)
((g-error :initarg g-error))
@@ -504,7 +504,7 @@
(iter (object text-buffer)) ;; object saves pointer, struct -- doesn't
(array-data :pointer) (length :ulong)
(create-tags :boolean) (user-data pdata)
- (g-error (:pointer (:struct g-error))))
+ (g-error :pointer))
(destructuring-bind (func data data-destroy) user-data
(declare (ignore data-destroy))
(funcall func register-buffer content-buffer iter
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/tree-model.lisp 2012/12/15 14:33:10 1.17
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/tree-model.lisp 2012/12/31 13:33:38 1.18
@@ -96,7 +96,7 @@
(defcstruct tree-model-iface
"GtkTreeModelIface"
- (g-iface (:struct g-type-interface))
+ (g-iface g-type-interface) ; :struct
(row-changed :pointer)
(row-inserted :pointer)
(has-child-toggled :pointer)
@@ -123,7 +123,8 @@
(defmethod initialize-instance
:after ((tree-model tree-model)
&key &allow-other-keys)
- (setf (tree-iter tree-model) (make-instance 'tree-iter :new-struct t)))
+ (setf (tree-iter tree-model) (make-instance 'tree-iter :new-struct t
+ :free-after nil)))
(defmethod free :before ((tree-model tree-model))
(free (tree-iter tree-model)))
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/tree-view.lisp 2012/12/24 16:32:05 1.6
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/tree-view.lisp 2012/12/31 13:33:38 1.7
@@ -93,17 +93,6 @@
(save-setter tree-view columns)
-(defcfun gtk-tree-view-get-path-at-pos :boolean (view pobject)
- (x :int) (y :int) (path :pointer) (column :pointer)
- (cell-x :pointer) (cell-y :pointer))
-
-(defgeneric path-at-pos (tree-view x y)
- (:method ((tree-view tree-view) x y)
- (with-foreign-outs-list
- ((path 'tree-path) (column 'pobject)
- (cell-x :int) (cell-y :int)) :if-success
- (gtk-tree-view-get-path-at-pos tree-view x y path column cell-x cell-y))))
-
(defcfun gtk-tree-view-get-cursor :void (view pobject)
(path :pointer) (column :pointer))
@@ -162,7 +151,7 @@
(tree-view pobject) (x :int) (y :int)
(path :pointer) (column :pointer) (cell-x :pointer) (cell-y :pointer))
-(defcfun gtk-tree-view-path-at-pos :boolean
+(defcfun gtk-tree-view-get-path-at-pos :boolean
(tree-view pobject) (x :int) (y :int)
(path :pointer) (column :pointer) (cell-x :pointer) (cell-y :pointer))
@@ -236,7 +225,10 @@
(def-coords tree widget)
(def-coords widget bin-window)
(def-coords widget tree))
-
+
+(defcfun gtk-tree-view-enable-model-drag-dest :void
+ (tree-view pobject) (targets (carray (struct target-entry)))
+ (n-targets :int) (action drag-action))
(init-slots tree-view (on-select)
(when on-select
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/widget.lisp 2012/12/24 16:32:05 1.18
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/widget.lisp 2012/12/31 13:33:38 1.19
@@ -169,9 +169,9 @@
(accel-mods modifier-type))
(list-accel-closures g-list)
(can-activate-accel :boolean (signal-id :uint))
- ((widget-event . event) :boolean (event (:pointer (:union event))))
- (send-expose :int (event (:pointer (:union event))))
- (send-focus-change :boolean (event (:pointer (:union event))))
+ ((widget-event . event) :boolean (event :pointer))
+ (send-expose :int (event :pointer))
+ (send-focus-change :boolean (event :pointer))
(reparent :void (new-parent pobject))
(is-focus :boolean)
(grab-focus :void)
@@ -410,7 +410,7 @@
())
(defcstruct widget-class
- (parent-class (:struct g-object-class))
+ (parent-class g-object-class-struct) ; :struct
(activate-signal :pointer)
(dispatch-child-properties-changed :pointer)
(destroy :pointer)
More information about the gtk-cffi-cvs
mailing list