From f65e97b266ccee6cf254a48f30131b1756fb4fc0 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Fri, 18 Jul 2008 02:14:53 -0500 Subject: [PATCH] ui.gadgets.wrappers: simplify new-wrapper --- extra/ui/gadgets/wrappers/wrappers.factor | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/extra/ui/gadgets/wrappers/wrappers.factor b/extra/ui/gadgets/wrappers/wrappers.factor index 55846b2255..447704f818 100644 --- a/extra/ui/gadgets/wrappers/wrappers.factor +++ b/extra/ui/gadgets/wrappers/wrappers.factor @@ -1,22 +1,18 @@ ! Copyright (C) 2005, 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: accessors ui.gadgets kernel ; + IN: ui.gadgets.wrappers TUPLE: wrapper < gadget ; -: new-wrapper ( child class -- wrapper ) - new-gadget - [ swap add-gadget drop ] keep ; inline +: new-wrapper ( child class -- wrapper ) new-gadget swap add-gadget ; -: ( child -- border ) - wrapper new-wrapper ; +: ( child -- border ) wrapper new-wrapper ; -M: wrapper pref-dim* - gadget-child pref-dim ; +M: wrapper pref-dim* ( wrapper -- dim ) gadget-child pref-dim ; -M: wrapper layout* +M: wrapper layout* ( wrapper -- ) [ dim>> ] [ gadget-child ] bi set-layout-dim ; -M: wrapper focusable-child* - gadget-child ; +M: wrapper focusable-child* ( wrapper -- child/t ) gadget-child ;