X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/40d51d987bc8a89c801f45098c21673493cc33d6..f1acb82295e1cccbf1fdf30aef094fccdbfcbddf:/glib/gcallback.lisp

diff --git a/glib/gcallback.lisp b/glib/gcallback.lisp
index 22d91a1..686dc8b 100644
--- a/glib/gcallback.lisp
+++ b/glib/gcallback.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: gcallback.lisp,v 1.39 2007/01/07 20:03:51 espen Exp $
+;; $Id: gcallback.lisp,v 1.42 2007/05/10 20:25:09 espen Exp $
 
 (in-package "GLIB")
 
@@ -40,22 +40,22 @@
 (define-callback signal-handler-marshal nil
     ((gclosure gclosure) (return-value gvalue) (n-params unsigned-int) 
      (param-values pointer) (invocation-hint pointer) 
-     (callback-id unsigned-long))
+     (callback-id pointer-data))
   (declare (ignore gclosure invocation-hint))
   (callback-trampoline #'invoke-signal-handler callback-id n-params param-values return-value))
 
-;; Callback marshaller  for class handlers
+;; Callback marshaller for class handlers
 (define-callback class-handler-marshal nil
     ((gclosure gclosure) (return-value gvalue) (n-params unsigned-int) 
      (param-values pointer) (invocation-hint pointer) 
-     (callback-id unsigned-long))
+     (callback-id pointer-data))
   (declare (ignore gclosure invocation-hint))
   (callback-trampoline #'invoke-callback callback-id n-params param-values return-value))
 
 ;; Callback marshaller for emission hooks
 (define-callback emission-hook-marshal nil
     ((invocation-hint pointer) (n-params unsigned-int) (param-values pointer)
-     (callback-id unsigned-long))
+     (callback-id pointer-data))
   (declare (ignore invocation-hint))
   (callback-trampoline #'invoke-callback callback-id n-params param-values))
 
@@ -352,7 +352,7 @@
   (detail quark)
   (closure (or null pointer))
   (func (or null pointer))
-  (data unsigned-long))
+  (data pointer-data))
 
 (defbinding signal-handler-disconnect () nil
   (instance ginstance)
@@ -377,7 +377,7 @@
     (closure-set-meta-marshal gclosure callback-id callback)
     gclosure))
 
-(defun make-callback-closure (function marshaller)
+(defun make-callback-closure (function &optional (marshaller signal-handler-marshal))
   (let ((callback-id (register-callback-function function)))
     (values
      (callback-closure-new callback-id marshaller user-data-destroy-callback)
@@ -550,8 +550,8 @@ function."
 			  (t (second arg))))))
     `(define-callback ,name ,return-type 
        ,(ecase callback-id
-	  (:first `((callback-id unsigned-int) ,@(mapcar #'list names types)))
-	  (:last `(,@(mapcar #'list names types) (callback-id unsigned-int))))
+	  (:first `((callback-id pointer-data) ,@(mapcar #'list names types)))
+	  (:last `(,@(mapcar #'list names types) (callback-id pointer-data))))
        (declare (ignore ,@ignore))
        (invoke-callback callback-id ',return-type ,@(nreverse params)))))