X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/688630ccd8a9218592995112f29311a4c62d63e2..c23cc4868df7b573bb24f1c29e7d6ad61a10c092:/glib/genums.lisp

diff --git a/glib/genums.lisp b/glib/genums.lisp
index fe563b5..14bff9a 100644
--- a/glib/genums.lisp
+++ b/glib/genums.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: genums.lisp,v 1.14 2005/04/24 13:24:41 espen Exp $
+;; $Id: genums.lisp,v 1.17 2006/02/06 18:12:19 espen Exp $
 
 (in-package "GLIB")
   
@@ -87,7 +87,8 @@ (defmethod reader-function ((type (eql 'enum)) &rest args)
   (declare (ignore type))
   (let ((reader (reader-function 'signed))
 	(function (apply #'from-alien-function 'enum args)))
-    #'(lambda (location &optional (offset 0))
+    #'(lambda (location &optional (offset 0) weak-p)
+	(declare (ignore weak-p))
 	(funcall function (funcall reader location offset)))))
 
 (defun enum-int (enum type)
@@ -134,7 +135,8 @@        (defmethod writer-function ((type (eql ',name)) &rest args)
        (defmethod reader-function ((type (eql ',name)) &rest args)
 	 (declare (ignore type args))
 	 (let ((reader (reader-function 'signed)))
-	   #'(lambda (location &optional (offset 0))
+	   #'(lambda (location &optional (offset 0) weak-p)
+	       (declare (ignore weak-p))
 	       (,int-enum (funcall reader location offset))))))))
 
 
@@ -209,7 +211,8 @@ (defmethod reader-function ((type (eql 'flags)) &rest args)
   (declare (ignore type))
   (let ((reader (reader-function 'unsigned))
 	(function (apply #'from-alien-function 'flags args)))
-    #'(lambda (location &optional (offset 0))
+    #'(lambda (location &optional (offset 0) weak-p)
+	(declare (ignore weak-p))
 	(funcall function (funcall reader location offset)))))
 
 
@@ -265,7 +268,8 @@        (defmethod writer-function ((type (eql ',name)) &rest args)
        (defmethod reader-function ((type (eql ',name)) &rest args)
 	 (declare (ignore type args))
 	 (let ((reader (reader-function 'signed)))
-	   #'(lambda (location &optional (offset 0))
+	   #'(lambda (location &optional (offset 0) weak-p)
+	       (declare (ignore weak-p))
 	       (,int-flags (funcall reader location offset))))))))
 
 
@@ -276,8 +280,8 @@ (defun %query-enum-or-flags-values (query-function class type)
   (multiple-value-bind (sap length)
       (funcall query-function (type-class-ref type))
     (let ((values nil)
-	  (size (proxy-instance-size (find-class class)))
-	  (proxy (make-instance class :location sap)))
+	  (size (foreign-size (find-class class)))
+	  (proxy (ensure-proxy-instance class sap)))
       (dotimes (i length)
 	(with-slots (location nickname value) proxy
 	  (setf location sap)