;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-;; $Id: glade-xml.lisp,v 1.1 2006/09/05 13:55:01 espen Exp $
+;; $Id: glade-xml.lisp,v 1.2 2006/09/27 08:44:44 espen Exp $
(in-package "GLADE-XML")
do
(loop
for signal in (user-data widget 'signals)
- do (destructuring-bind (handler-id name callback &key after object) signal
+ do (destructuring-bind (name callback &key after object) signal
(signal-connect widget name callback :after after :object (widget-find object toplevels))))
(unset-user-data widget 'signals)
(when (typep widget 'container)
;; 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.25 2006/09/27 08:44:44 espen Exp $
(in-package "GTK")
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)))