X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/8ae7ddc2bf6032609883e2f838d9fb5b71498022..31fd088c674b9fcadaba7448f794133f3852fc8e:/glib/proxy.lisp

diff --git a/glib/proxy.lisp b/glib/proxy.lisp
index 664f758..f989d63 100644
--- a/glib/proxy.lisp
+++ b/glib/proxy.lisp
@@ -15,7 +15,7 @@
 ;; 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: proxy.lisp,v 1.4 2001/05/11 16:01:41 espen Exp $
+;; $Id: proxy.lisp,v 1.6 2001/10/21 16:55:39 espen Exp $
 
 (in-package "GLIB")
 
@@ -189,11 +189,11 @@
   (if weak-ref
       `(proxy-location ,instance)
     `(funcall
-      (proxy-class-copy (find-class ',type-spec))
+      ',(proxy-class-copy (find-class type-spec))
       ',type-spec (proxy-location ,instance))))
 
 (deftype-method unreference-alien proxy (type-spec location)
-  `(funcall (proxy-class-free (find-class ',type-spec)) ',type-spec ,location))
+  `(funcall ',(proxy-class-free (find-class type-spec)) ',type-spec ,location))
 
 (defun proxy-instance-size (proxy)
   (proxy-class-size (class-of proxy)))
@@ -289,12 +289,14 @@
 	(with-slots (type) slotd
 	  (list
 	   (if (stringp getter)
-	       (mkbinding getter type class-name)
+	       (let ((getter (mkbinding-late getter type 'pointer)))
+		 #'(lambda (object)
+		     (funcall getter (proxy-location object))))
 	     getter)
 	   (if (stringp setter)
-	       (let ((setter (mkbinding setter 'nil class-name type)))
+	       (let ((setter (mkbinding-late setter 'nil 'pointer type)))
 		 #'(lambda (value object)
-		     (funcall setter object value)))
+		     (funcall setter (proxy-location object) value)))
 	     setter))))))
 
   (defmethod compute-slots ((class proxy-class))