Update of /project/mcclim/cvsroot/mcclim/Backends/gtkairo In directory clnet:/tmp/cvs-serv29938
Modified Files: event.lisp gtk-ffi.lisp Log Message:
"Oops." Fixed some more bugs introduced with the FFI regeneration last week.
* event.lisp (INVOKE-LATER): g_idle_add takes a pointer, not a long. * gtk-ffi.lisp (DEFCFUN): Don't check the cairo status of cairo_font_face_status.
--- /project/mcclim/cvsroot/mcclim/Backends/gtkairo/event.lisp 2006/11/12 20:12:19 1.13 +++ /project/mcclim/cvsroot/mcclim/Backends/gtkairo/event.lisp 2006/11/25 21:14:53 1.14 @@ -403,7 +403,7 @@ (with-gtk () (let ((i (incf *later-counter*))) (setf (gethash i *later-table*) fun) - (g_idle_add (cffi:get-callback 'idle-function) i)))) + (g_idle_add (cffi:get-callback 'idle-function) (cffi:make-pointer i)))))
(cffi:defcallback idle-function :int ((data :long)) ;hack --- /project/mcclim/cvsroot/mcclim/Backends/gtkairo/gtk-ffi.lisp 2006/11/20 19:53:44 1.16 +++ /project/mcclim/cvsroot/mcclim/Backends/gtkairo/gtk-ffi.lisp 2006/11/25 21:14:53 1.17 @@ -44,7 +44,8 @@
(defmacro defcfun (name rtype &rest argtypes) (if (and (eq rtype 'cairo_status_t) - (not (equal name "cairo_status"))) + (not (or (equal name "cairo_status") + (equal name "cairo_font_face_status")))) `(def-cairo-fun ,name ,rtype ,@argtypes) `(cffi:defcfun (,name ,(intern (string-upcase name) :clim-gtkairo)) ,rtype