X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=glib%2Fgobject.foreign-gobject-subclassing.lisp;h=b197b5faa48e7c0c49bab0c2b591fae86af2555b;hb=2da8ec51c87e16120d62969eb2468563e8caecef;hp=614082b436a2216be28e8ad6a90bf77329ee4e0c;hpb=2b25e733e8df272e93d56ac026c94dea698121fe;p=cl-gtk2.git diff --git a/glib/gobject.foreign-gobject-subclassing.lisp b/glib/gobject.foreign-gobject-subclassing.lisp index 614082b..b197b5f 100644 --- a/glib/gobject.foreign-gobject-subclassing.lisp +++ b/glib/gobject.foreign-gobject-subclassing.lisp @@ -117,7 +117,7 @@ (make-vtable-description :type-name ,type-name :cstruct-name ',cstruct-name :methods (list ,@(mapcar #'make-load-form (vtable-methods items))))) ,@(iter (for method in (vtable-methods items)) (collect `(defgeneric ,(vtable-method-info-name method) (,@(mapcar #'first (vtable-method-info-args method))))) - (collect `(defcallback ,(vtable-method-info-callback-name method) ,(vtable-method-info-return-type method) + (collect `(glib-defcallback ,(vtable-method-info-callback-name method) ,(vtable-method-info-return-type method) (,@(vtable-method-info-args method)) (restart-case (,(vtable-method-info-name method) ,@(mapcar #'first (vtable-method-info-args method))) @@ -125,6 +125,7 @@ (defun interface-init (iface data) (destructuring-bind (class-name interface-name) (prog1 (get-stable-pointer-value data) (free-stable-pointer data)) + (declare (ignorable class-name)) (let* ((vtable (gethash interface-name *vtables*)) (vtable-cstruct (vtable-description-cstruct-name vtable))) (debugf "interface-init for class ~A and interface ~A~%" class-name interface-name)