Update of /project/cells-gtk/cvsroot/root/gtk-ffi In directory common-lisp:/tmp/cvs-serv8894/root/gtk-ffi
Modified Files: gtk-core.lisp Log Message: Now native CFFI
--- /project/cells-gtk/cvsroot/root/gtk-ffi/gtk-core.lisp 2006/02/11 03:40:26 1.6 +++ /project/cells-gtk/cvsroot/root/gtk-ffi/gtk-core.lisp 2006/02/16 18:02:17 1.7 @@ -18,35 +18,34 @@
(in-package :gtk-ffi)
+ (def-gtk-lib-functions :glib - (g-free ((data c-pointer))) - (g-slist-free ((lst c-pointer))) - (g-timeout-add ((milliseconds uint) - (func #.(callback-function ((data c-pointer)) - boolean)) - (data c-pointer)) - uint) - (g-locale-from-utf8 ((utf8-string c-pointer) - (len sint32) - (bytes-read c-pointer) - (bytes-written c-pointer) - (gerror c-pointer)) - c-string :malloc-free) - (g-locale-to-utf8 ((local-string c-string) - (len sint32) - (bytes-read c-pointer) - (bytes-written c-pointer) - (gerror c-pointer)) - c-pointer)) + (g-free :void ((data :pointer))) + (g-slist-free :void ((lst :pointer))) + (g-timeout-add :unsigned-int + ((milliseconds :unsigned-int) + (func :pointer) + (data :pointer))) + (g-locale-from-utf8 :gtk-string + ((utf8-string :pointer) + (len :int) + (bytes-read :pointer) + (bytes-written :pointer) + (gerror :pointer))) + (g-locale-to-utf8 :pointer + ((local-string :gtk-string) + (len :int) + (bytes-read :pointer) + (bytes-written :pointer) + (gerror :pointer))))
-(def-gtk-lib-functions :gthread - (g-thread-init ((vtable c-pointer)))) +(def-gtk-lib-functions :gthread (g-thread-init :void ((vtable :pointer))))
(def-gtk-lib-functions :gdk - (gdk-threads-init ()) - (gdk-threads-enter ()) - (gdk-threads-leave ()) - (gdk-flush ())) + (gdk-threads-init :void ()) + (gdk-threads-enter :void ()) + (gdk-threads-leave :void ()) + (gdk-flush :void ()))
(def-union g-value-data (v-int :int) @@ -92,49 +91,38 @@
(def-gtk-lib-functions :gobject ;; callbacks - (g-cclosure-new ((callback-f #.(callback-function ((widget c-pointer) - (event c-pointer) - (data c-pointer)) - boolean)) - (user-data c-pointer) - (destroy-data c-pointer)) - c-pointer) - (g-cclosure-new-swap ((callback-f #.(callback-function ((widget c-pointer) - (event c-pointer) - (data c-pointer)) - boolean)) - (user-data c-pointer) - (destroy-data c-pointer)) - c-pointer) - (g-signal-connect-closure ((instance c-pointer) - (detailed-signal c-string) - (closure c-pointer) - (after boolean) - ) - ulong nil nil) - (g-object-set-valist ((object c-pointer) - (first-prop c-string) - (varargs c-pointer))) - (g-object-set-property ((object c-pointer) - (property-name c-string) - (value c-pointer))) - (g-value-init ((value c-pointer) - (type ulong)) - c-pointer) - (g-value-unset ((value c-pointer))) - (g-value-set-string ((value c-pointer) - (str c-string))) - (g-value-set-int ((value c-pointer) - (int int))) - (g-value-set-long ((value c-pointer) - (long long))) - (g-value-set-boolean ((value c-pointer) - (bool boolean)) - nil nil nil) - (g-value-set-float ((value c-pointer) - (float single-float))) - (g-value-set-double ((value c-pointer) - (double double-float)))) - - - + (g-cclosure-new :pointer + ((callback-f :pointer) + (user-data :pointer) + (destroy-data :pointer))) + (g-cclosure-new-swap :pointer + ((callback-f :pointer) + (user-data :pointer) + (destroy-data :pointer))) + (g-signal-connect-closure :unsigned-long + ((instance :pointer) + (detailed-signal :gtk-string) + (closure :pointer) + (after :gtk-boolean))) + (g-object-set-valist :void + ((object :pointer) + (first-prop :gtk-string) + (varargs :pointer))) + (g-object-set-property :void + ((object :pointer) + (property-name :gtk-string) + (value :pointer))) + (g-value-init :pointer ((value :pointer) + (type :unsigned-long))) + (g-value-unset :void ((value :pointer))) + (g-value-set-string :void + ((value :pointer) (str :gtk-string))) + (g-value-set-int :void ((value :pointer) (int :int))) + (g-value-set-long :void ((value :pointer) (long :long))) + (g-value-set-boolean :void + ((value :pointer) + (bool :gtk-boolean))) + (g-value-set-float :void + ((value :pointer) (float :float))) + (g-value-set-double :void + ((value :pointer) (double :double))))