-(defmethod compute-signal-function ((widget widget) signal function object)
- (declare (ignore signal))
- (if (eq object :parent)
- #'(lambda (&rest args)
- (if (slot-boundp widget 'parent)
- (apply function (widget-parent widget) (rest args))
- ;; Delay until parent is set
- (signal-connect widget 'parent-set
- #'(lambda (old-parent)
- (declare (ignore old-parent))
- (let ((*signal-stop-emission*
- #'(lambda ()
- (warn "Ignoring emission stop in delayed signal handler"))))
- (apply function (widget-parent widget) (rest args))))
- :remove t)
-; (warn "Widget has no parent -- ignoring signal")
- ))
- (call-next-method)))
+(defparameter *widget-display-as-default-in-signal-handler-p* t)
+
+(defmethod compute-signal-function ((widget widget) signal function object args)
+ (let ((wrapper
+ (if (eq object :parent)
+ #'(lambda (widget &rest emission-args)
+ (let ((all-args (nconc emission-args args)))
+ (if (slot-boundp widget 'parent)
+ (apply function (widget-parent widget) all-args)
+ ;; Delay until parent is set
+ (signal-connect widget 'parent-set
+ #'(lambda (old-parent)
+ (declare (ignore old-parent))
+ (apply #'signal-emit widget signal emission-args))
+ :remove t))))
+ (call-next-method))))
+ (if *widget-display-as-default-in-signal-handler-p*
+ #'(lambda (widget &rest args)
+ (let ((display (when (slot-boundp widget 'window)
+ (gdk:drawable-display (widget-window widget)))))
+ (gdk:with-default-display (display)
+ (apply wrapper widget args))))
+ wrapper)))
+
+