[gtk-cffi-cvs] CVS gtk-cffi/gtk

[CVS User rklochkov]

Update of /project/gtk-cffi/cvsroot/gtk-cffi/gtk
In directory tiger.common-lisp.net:/tmp/cvs-serv17217/gtk

Modified Files:
	statusbar.lisp text-buffer.lisp widget.lisp 
Log Message:
Fixed GtkTextIter (now with cffi-objects struct)
Fixed context in GtkStatus (let it be symbol)



--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/statusbar.lisp	2012/03/08 09:58:12	1.5
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/statusbar.lisp	2012/05/13 16:20:07	1.6
@@ -11,7 +11,7 @@
 (defgtkfuns statusbar
   ((statusbar-push . push) :uint (context-id :uint) (text :string))
   ((statusbar-pop . pop) :void (context-id :uint))
-  (:get context-id :uint (context :string))
+  (:get context-id :uint (context pstring))
   (:get message-area pobject))
 
 (defcfun gtk-statusbar-remove :void
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/text-buffer.lisp	2012/03/08 09:58:12	1.7
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/text-buffer.lisp	2012/05/13 16:20:07	1.8
@@ -17,10 +17,7 @@
 
 (make-foreach text-tag-table (tag (object text-tag)) (data pdata))
 
-(defclass text-iter (struct)
-  ())
-
-(defcstruct text-iter
+(defcstruct* text-iter
   (u1 :pointer)
   (u2 :pointer)
   (u3 :int)
@@ -222,7 +219,7 @@
     (gtk-text-buffer-deserialize-set-can-create-tags text-buffer format value)))
 
 (defcfun gtk-text-buffer-get-start-iter :void 
-  (buffer pobject) (text-iter pobject))
+  (buffer pobject) (text-iter (struct text-iter :out t)))
 
 (defgeneric start-iter (text-buffer &optional text-iter)
   (:method ((text-buffer text-buffer) 
@@ -231,7 +228,7 @@
     text-iter))
 
 (defcfun gtk-text-buffer-get-end-iter :void 
-  (buffer pobject) (text-iter pobject))
+  (buffer pobject) (text-iter (struct text-iter :out t)))
 
 (defgeneric end-iter (text-buffer &optional text-iter)
   (:method ((text-buffer text-buffer) 
@@ -245,6 +242,7 @@
 (defmethod text ((text-buffer text-buffer) &key 
                  (start (start-iter text-buffer)) 
                  (end (end-iter text-buffer)) include-hidden)
+;  (format t "got text (~a ~a ~a)~%" text-buffer start end)
   (gtk-text-buffer-get-text text-buffer start end include-hidden))
 
 (defcfun gtk-text-buffer-set-text :void (buffer pobject)
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/widget.lisp	2012/05/07 09:32:47	1.13
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/widget.lisp	2012/05/13 16:20:07	1.14
@@ -17,8 +17,10 @@
                          &key type &allow-other-keys)
   (gtk-widget-new type (null-pointer)))
 
-(defclass requisition (struct)
-  ())
+(defcstruct* requisition
+  "GtkRequisition"
+  (width :int)
+  (height :int))
 
 (defcfun gtk-requisition-new :pointer)
 
@@ -30,23 +32,12 @@
 (defmethod free-struct ((class (eql 'requisition)) value)
   (gtk-requisition-free value))
 
-(defcstruct* requisition
-  "GtkRequisition"
-  (width :int)
-  (height :int))
-
-(init-slots requisition)
-
-(defclass allocation (struct)
-  ())
 
 (defcstruct* allocation
   "GtkAllocation"
   (x :int) (y :int)
   (width :int) (height :int))
 
-(init-slots allocation)
-
 
 (defcfun gtk-widget-show :boolean (widget pobject))
 (defcfun gtk-widget-show-all :boolean (widget pobject))