X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/9adccb27da69b60d058aa37867d55ea20ecf97ca..c96c452a4938c33e24bb9736810b0c7bd9e7940d:/glib/gparam.lisp?ds=sidebyside

diff --git a/glib/gparam.lisp b/glib/gparam.lisp
index 1d90291..d2a4b01 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.9 2004-11-06 21:39:58 espen Exp $
+;; $Id: gparam.lisp,v 1.15 2005-02-03 23:09:04 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 @@ (defun gvalue-init (gvalue type &optional (value nil value-p))
   (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))
@@ -55,7 +57,7 @@ (defun gvalue-free (gvalue &optional (unset-p t))
     (deallocate-memory gvalue)))
 
 (defun gvalue-type (gvalue)
-  (type-from-number (system:sap-ref-32 gvalue 0)))
+  (type-from-number (sap-ref-32 gvalue 0)))
 
 (defun gvalue-get (gvalue)
   (funcall (reader-function (gvalue-type gvalue))
@@ -66,6 +68,19 @@ (defun gvalue-set (gvalue value)
    value gvalue +gvalue-value-offset+)
   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
+	   ,(unless value-p `(gvalue-get ,gvalue)))
+      (gvalue-free ,gvalue))))
 
 
 (deftype param-flag-type ()
@@ -81,8 +96,7 @@ (eval-when (:compile-toplevel :load-toplevel :execute)
   (defclass param-spec-class (ginstance-class)
     ())
 
-  (defmethod validate-superclass 
-      ((class param-spec-class) (super pcl::standard-class))
+  (defmethod validate-superclass  ((class param-spec-class) (super standard-class))
     t ;(subtypep (class-name super) 'param)
 ))
 
@@ -125,12 +139,12 @@ (defclass param (ginstance)
     :allocation :virtual
     :getter "g_param_spec_get_nick"
     :reader param-nickname
-    :type string)
+    :type (copy-of string))
    (documentation
     :allocation :virtual
     :getter "g_param_spec_get_blurb"
     :reader param-documentation
-    :type string))
+    :type (copy-of string)))
   (:metaclass param-spec-class))