C callbacks cleaned up and ported to new API

[clg] / glib / genums.lisp

diff --git a/glib/genums.lisp b/glib/genums.lisp
index 8095b90..224f48c 100644 (file)
--- 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.15 2006-02-04 12:15:32 espen Exp $
+;; $Id: genums.lisp,v 1.17 2006-02-06 18:12:19 espen Exp $
 
 (in-package "GLIB")
   
@@ -87,7 +87,8 @@
   (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 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 @@
   (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 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))))))))
 
 
@@ -277,7 +281,7 @@
       (funcall query-function (type-class-ref type))
     (let ((values nil)
          (size (foreign-size (find-class class)))
-         (proxy (make-instance class :location sap)))
+         (proxy (ensure-proxy-instance class sap)))
       (dotimes (i length)
        (with-slots (location nickname value) proxy
          (setf location sap)