X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/9ca5565a9443f9bd9f464838b7828589fe47be7f..47a11c16ebc81d424a0fe1f23008cbd03cfe5ad5:/glib/gparam.lisp diff --git a/glib/gparam.lisp b/glib/gparam.lisp index ec24b96..5b2f4fa 100644 --- a/glib/gparam.lisp +++ b/glib/gparam.lisp @@ -15,12 +15,14 @@ ;; License along with this library; if not, write to the Free Software ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -;; $Id: gparam.lisp,v 1.11 2004-11-19 13:02:51 espen Exp $ +;; $Id: gparam.lisp,v 1.14 2005-01-12 13:31:57 espen Exp $ (in-package "GLIB") (deftype gvalue () 'pointer) +(register-type 'gvalue "GValue") + (eval-when (:compile-toplevel :load-toplevel :execute) (defbinding (size-of-gvalue "size_of_gvalue") () unsigned-int)) @@ -41,11 +43,11 @@ (when value-p (funcall (writer-function type) value gvalue +gvalue-value-offset+))) -(defun gvalue-new (type &optional (value nil value-p)) +(defun gvalue-new (&optional type (value nil value-p)) (let ((gvalue (allocate-memory +gvalue-size+))) - (if value-p - (gvalue-init gvalue type value) - (gvalue-init gvalue type)) + (cond + (value-p (gvalue-init gvalue type value)) + (type (gvalue-init gvalue type))) gvalue)) (defun gvalue-free (gvalue &optional (unset-p t)) @@ -66,10 +68,14 @@ value gvalue +gvalue-value-offset+) value) -(defmacro with-gvalue ((gvalue type &optional (value nil value-p)) &body body) - `(let ((,gvalue ,(if value-p - `(gvalue-new ',type ,value) - `(gvalue-new ',type ,value)))) +(defbinding (gvalue-p "g_type_check_value") () boolean + (location pointer)) + +(defmacro with-gvalue ((gvalue &optional type (value nil value-p)) &body body) + `(let ((,gvalue ,(cond + ((and type value-p) `(gvalue-new ,type ,value)) + (type `(gvalue-new ,type)) + (`(gvalue-new))))) (unwind-protect (progn ,@body