[cells-gtk-cvs] CVS root/gtk-ffi

[pdenno]

Update of /project/cells-gtk/cvsroot/root/gtk-ffi
In directory common-lisp:/tmp/cvs-serv9088/root/gtk-ffi

Modified Files:
	gtk-tool.lisp 
Log Message:
Now native CFFI

--- /project/cells-gtk/cvsroot/root/gtk-ffi/gtk-tool.lisp	2004/12/06 20:03:00	1.1
+++ /project/cells-gtk/cvsroot/root/gtk-ffi/gtk-tool.lisp	2006/02/16 18:06:46	1.2
@@ -18,67 +18,92 @@
 
 (in-package :gtk-ffi)
 
-
 (def-gtk-lib-functions :gtk
   ;;toolbar
-  (gtk-toolbar-new ()
-    c-pointer)
-  (gtk-toolbar-insert ((toolbar c-pointer)
-		       (item c-pointer)
-		       (pos int)))
-  (gtk-toolbar-set-show-arrow ((toolbar c-pointer)
-			       (show-arrow boolean)))
-  (gtk-toolbar-set-orientation ((toolbar c-pointer)
-				(orientation int)))
-  (gtk-toolbar-set-tooltips ((toolbar c-pointer)
-			     (enable boolean)))
-  (gtk-toolbar-set-style ((toolbar c-pointer)
-			  (style int)))
+  (gtk-toolbar-new :pointer ())
+  (gtk-toolbar-insert
+   :void
+   ((toolbar :pointer)
+    (item :pointer)
+    (pos :int)))
+  (gtk-toolbar-set-show-arrow
+   :void
+   ((toolbar :pointer)
+    (show-arrow :gtk-boolean)))
+  (gtk-toolbar-set-orientation
+   :void
+   ((toolbar :pointer) (orientation :int)))
+  (gtk-toolbar-set-tooltips
+   :void
+   ((toolbar :pointer) (enable :gtk-boolean)))
+  (gtk-toolbar-set-style
+   :void
+   ((toolbar :pointer) (style :int)))
 
   ;;tooltips
-  (gtk-tooltips-new ()
-    c-pointer)
-  (gtk-tooltips-set-tip ((tooltips c-pointer)
-			 (widget c-pointer)
-			 (tip-text c-string)
-			 (tip-private c-string)))
-  (gtk-tooltips-enable ((tooltips c-pointer)))
-  (gtk-tooltips-disable ((tooltips c-pointer)))
-  (gtk-tooltips-set-delay ((tooltips c-pointer)
-			   (delay uint)))
-  ;;tool-item
-  (gtk-tool-item-new ()
-    c-pointer)
-  (gtk-tool-item-set-homogeneous ((tool-item c-pointer)
-				  (homogeneous boolean)))
-  (gtk-tool-item-set-expand ((tool-item c-pointer)
-			     (expand boolean)))
-  (gtk-tool-item-set-tooltip ((tool-item c-pointer)
-			      (tooltips c-pointer)
-			      (tip-text c-string)
-			      (tip-private c-string)))
-  (gtk-tool-item-set-is-important ((tool-item c-pointer)
-				   (is-important boolean)))
+  (gtk-tooltips-new :pointer ())
+  (gtk-tooltips-set-tip
+   :void
+   ((tooltips :pointer)
+    (widget :pointer)
+    (tip-text :gtk-string)
+    (tip-private :gtk-string)))
+  (gtk-tooltips-enable
+   :void
+   ((tooltips :pointer)))
+  (gtk-tooltips-disable
+   :void
+   ((tooltips :pointer)))
+  (gtk-tooltips-set-delay
+   :void
+   ((tooltips :pointer) (delay :unsigned-int)))
 
-  (gtk-separator-tool-item-new ()
-     c-pointer)
-  (gtk-separator-tool-item-set-draw ((item c-pointer)
-				     (draw boolean)))
+  ;;tool-item
+  (gtk-tool-item-new :pointer ())
+  (gtk-tool-item-set-homogeneous
+   :void
+   ((tool-item :pointer)
+    (homogeneous :gtk-boolean)))
+  (gtk-tool-item-set-expand
+   :void
+   ((tool-item :pointer) (expand :gtk-boolean)))
+  (gtk-tool-item-set-tooltip
+   :void
+   ((tool-item :pointer)
+    (tooltips :pointer)
+    (tip-text :gtk-string)
+    (tip-private :gtk-string)))
+  (gtk-tool-item-set-is-important
+   :void
+   ((tool-item :pointer)
+    (is-important :gtk-boolean)))
+  (gtk-separator-tool-item-new :pointer ())
+  (gtk-separator-tool-item-set-draw
+   :void
+   ((item :pointer) (draw :gtk-boolean)))
 
   ;;tool-button
-  (gtk-tool-button-new ((icon-widget c-pointer)
-			(label c-pointer))
-    c-pointer)
-  (gtk-tool-button-new-from-stock ((stock-id c-string))
-    c-pointer)
-  (gtk-tool-button-set-label ((tool-button c-pointer)
-			      (label c-pointer)))
-  (gtk-tool-button-set-use-underline ((tool-button c-pointer)
-				      (use-underline boolean)))
-  (gtk-tool-button-set-stock-id ((tool-button c-pointer)
-				 (stock-id c-string)))
-  (gtk-tool-button-set-icon-widget ((tool-button c-pointer)
-				    (icon-widget c-pointer)))
-  (gtk-tool-button-set-label-widget ((tool-button c-pointer)
-				     (label-widget c-pointer))))
-  
+  (gtk-tool-button-new
+   :pointer
+   ((icon-widget :pointer) (label :pointer)))
+  (gtk-tool-button-new-from-stock
+   :pointer
+   ((stock-id :gtk-string)))
+  (gtk-tool-button-set-label
+   :void
+   ((tool-button :pointer) (label :pointer)))
+  (gtk-tool-button-set-use-underline
+   :void
+   ((tool-button :pointer)
+    (use-underline :gtk-boolean)))
+  (gtk-tool-button-set-stock-id
+   :void
+   ((tool-button :pointer) (stock-id :gtk-string)))
+  (gtk-tool-button-set-icon-widget
+   :void
+   ((tool-button :pointer)
+    (icon-widget :pointer)))
+  (gtk-tool-button-set-label-widget
+   :void
+   ((tool-button :pointer)
+    (label-widget :pointer))))
\ No newline at end of file