X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/46158111c26726793dfd7a1702a2f3ce8dea9e30..a68868d1113c91678cbdbac1cb77aa15c47c7ad2:/gtk/gtkwidget.lisp

diff --git a/gtk/gtkwidget.lisp b/gtk/gtkwidget.lisp
index 06bd1a0..458c3d4 100644
--- a/gtk/gtkwidget.lisp
+++ b/gtk/gtkwidget.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: gtkwidget.lisp,v 1.24 2006/09/05 13:37:07 espen Exp $
+;; $Id: gtkwidget.lisp,v 1.26 2007/01/07 20:23:22 espen Exp $
 
 (in-package "GTK")
 
@@ -67,12 +67,13 @@
    ((call-next-method))))
 
 
-(defmethod compute-signal-function ((widget widget) signal function object)
+(defmethod compute-signal-function ((widget widget) signal function object args)
   (declare (ignore signal))
   (if (eq object :parent)
-      #'(lambda (&rest args)
-	  (if (slot-boundp widget 'parent)
-	      (apply function (widget-parent widget) (rest args))
+      #'(lambda (&rest emission-args)
+	  (let ((all-args (nconc (rest 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)
@@ -80,10 +81,10 @@
 		 (let ((*signal-stop-emission* 
 			#'(lambda ()
 			    (warn "Ignoring emission stop in delayed signal handler"))))
-		   (apply function (widget-parent widget) (rest args))))
+		   (apply function (widget-parent widget) all-args)))
 	     :remove t)
 ;	    (warn "Widget has no parent -- ignoring signal")
-	    ))
+	    )))
     (call-next-method)))
       
 (defun child-property-value (widget slot)
@@ -340,11 +341,11 @@ widget or a list of containers."
    for widget in (mklist root)
    do (cond
        ((and (slot-boundp widget 'name) (string= name (widget-name widget)))
-	(return widget))
+	(return-from widget-find widget))
        ((typep widget 'container)
 	(let ((descendant (widget-find name (container-children widget) nil)))
 	  (when descendant
-	    (return descendant))))))
+	    (return-from widget-find descendant))))))
   (when error-p
     (error "Widget not found: ~A" name)))