Update of /project/cells-gtk/cvsroot/root/cells-gtk In directory common-lisp.net:/tmp/cvs-serv30390/root/cells-gtk
Modified Files: widgets.lisp Log Message: CFFI : removed #+clisp stuff Date: Tue Jan 3 20:03:02 2006 Author: pdenno
Index: root/cells-gtk/widgets.lisp diff -u root/cells-gtk/widgets.lisp:1.14 root/cells-gtk/widgets.lisp:1.15 --- root/cells-gtk/widgets.lisp:1.14 Sat Oct 8 16:33:19 2005 +++ root/cells-gtk/widgets.lisp Tue Jan 3 20:03:02 2006 @@ -209,11 +209,6 @@ ,@signals-outputs)))))
(defmacro callback ((widg event data) &body body) - #+clisp - `(c? (without-c-dependency #'(lambda (,widg ,event ,data) - (declare (ignorable ,widg ,event ,data)) - ,@body t))) - #-clisp `(lambda (self ,widg ,event ,data) (declare (ignorable self ,widg ,event ,data)) ;(print (list :anon-callback self ,widg ,event ,data)) @@ -225,10 +220,7 @@
(defmacro callback-if (condition (widg event data) &body body) `(c? (and ,condition - #+clisp (without-c-dependency #'(lambda (,widg ,event ,data) - (declare (ignorable ,widg ,event ,data)) - ,@body t)) - #-clisp (lambda (self ,widg ,event ,data) + (lambda (self ,widg ,event ,data) (declare (ignorable self ,widg ,event ,data)) ;(print (list :anon-callback-if self ,widg ,event ,data)) ,@body @@ -298,7 +290,7 @@ (not-to-be old-value)) (when new-value (gtk-widget-set-popup (id self) (id (to-be new-value))))) - + (def-c-output visible ((self widget)) (if new-value (gtk-widget-show (id self)) @@ -393,6 +385,7 @@ (gtk-container-add (id self) (id (first new-value)))) #+clisp (call-next-method))
+(declaim (inline widget-id)) (defun widget-id (widget) (id widget))