X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/1d06a422f8e85b2e9c60a888399cd6a1662dfea1..bdf1567aa37a86469f0825e0ccc87d34039b7c4b:/glib/genums.lisp?ds=inline

diff --git a/glib/genums.lisp b/glib/genums.lisp
index 5291452..6624332 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.16 2006/02/05 15:38:57 espen Exp $
+;; $Id: genums.lisp,v 1.18 2006/02/19 22:25:31 espen Exp $
 
 (in-package "GLIB")
   
@@ -57,6 +57,9 @@ (defmethod to-alien-form (form (type (eql 'enum)) &rest args)
     (t (error 'type-error :datum ,form :expected-type '(enum ,@args)))))
 
 
+(defmethod callback-from-alien-form (form (type (eql 'enum)) &rest args)
+  (apply #'from-alien-form form type args))
+
 (defmethod from-alien-form (form (type (eql 'enum)) &rest args)
   (declare (ignore type))
   `(case ,form
@@ -87,7 +90,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 +138,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))))))))
 
 
@@ -171,6 +176,9 @@ (defmethod to-alien-form (flags (type (eql 'flags)) &rest args)
 	       (t (error 'type-error :datum ,flags 
 		   :expected-type '(,type ,@args)))))))
 
+(defmethod callback-from-alien-form (form (type (eql 'flags)) &rest args)
+  (apply #'from-alien-form form type args))
+
 (defmethod from-alien-form (value (type (eql 'flags)) &rest args)
   (declare (ignore type))
   `(loop
@@ -209,7 +217,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 +274,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))))))))