Merge branch 'master' of git://factorcode.org/git/factor

extra/ui/tools/browser/browser.factor

@@ -20,13 +20,11 @@ TUPLE: browser-gadget < track pane history ;
     "handbook" >link <history> >>history drop ;
 
 : <browser-gadget> ( -- gadget )
-    { 0 1 } browser-gadget new-track
+  { 0 1 } browser-gadget new-track
     dup init-history
-    [
-        toolbar,
-        g <help-pane> g-> set-browser-gadget-pane
-        <scroller> 1 track,
-    ] make-gadget ;
+    dup <toolbar> f track-add*
+    dup <help-pane> >>pane
+    dup pane>> <scroller> 1 track-add* ;
 
 M: browser-gadget call-tool* show-help ;
 

extra/ui/tools/traceback/traceback.factor

@@ -1,10 +1,11 @@
 ! Copyright (C) 2006, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors continuations kernel models namespaces
-prettyprint ui ui.commands ui.gadgets ui.gadgets.labelled assocs
-ui.gadgets.tracks ui.gadgets.buttons ui.gadgets.panes
-ui.gadgets.status-bar ui.gadgets.scrollers ui.gestures sequences
-hashtables inspector ;
+       prettyprint ui ui.commands ui.gadgets ui.gadgets.labelled assocs
+       ui.gadgets.tracks ui.gadgets.buttons ui.gadgets.panes
+       ui.gadgets.status-bar ui.gadgets.scrollers ui.gestures sequences
+       hashtables inspector ;
+
 IN: ui.tools.traceback
 
 : <callstack-display> ( model -- gadget )
@@ -24,20 +25,18 @@ TUPLE: traceback-gadget < track ;
 M: traceback-gadget pref-dim* drop { 550 600 } ;
 
 : <traceback-gadget> ( model -- gadget )
-    { 0 1 } traceback-gadget new-track
-        swap >>model
-    [
-        g model>>
-        [
-            [
-                [ <datastack-display> 1/2 track, ]
-                [ <retainstack-display> 1/2 track, ]
-                bi
-            ] { 1 0 } make-track 1/3 track,
-        ]
-        [ <callstack-display> 2/3 track, ] bi
-        toolbar,
-    ] make-gadget ;
+  { 0 1 } traceback-gadget new-track
+    swap >>model
+
+    dup model>>
+      { 1 0 } <track>
+        over <datastack-display>   1/2 track-add*
+        swap <retainstack-display> 1/2 track-add*
+      1/3 track-add*
+
+    dup model>> <callstack-display> 2/3 track-add*
+
+    dup <toolbar> f track-add* ;
 
 : <namestack-display> ( model -- gadget )
     [ [ continuation-name namestack. ] when* ]

extra/ui/tools/walker/walker.factor

@@ -61,12 +61,11 @@ M: walker-gadget focusable-child*
         swap >>continuation
         swap >>status
         dup continuation>> <traceback-gadget> >>traceback
-    [
-        toolbar,
-        g status>> self <thread-status> f track,
-        g traceback>> 1 track,
-    ] make-gadget ;
 
+        dup <toolbar>                     f track-add*
+        dup status>> self <thread-status> f track-add*
+        dup traceback>>                   1 track-add* ;
+    
 : walker-help ( -- ) "ui-walker" help-window ;
 
 \ walker-help H{ { +nullary+ t } } define-command