Remove new-gadget since it was just an alias for new

db4
Slava Pestov 2009-02-16 04:04:32 -06:00
parent 20aca672ca
commit d5d9c65859
28 changed files with 34 additions and 35 deletions

View File

@ -26,7 +26,7 @@ GENERIC: render-cairo* ( gadget -- )
TUPLE: cairo-gadget < gadget ; TUPLE: cairo-gadget < gadget ;
: <cairo-gadget> ( dim -- gadget ) : <cairo-gadget> ( dim -- gadget )
cairo-gadget new-gadget cairo-gadget new
swap >>dim ; swap >>dim ;
M: cairo-gadget draw-gadget* M: cairo-gadget draw-gadget*

View File

@ -17,7 +17,7 @@ M: book model-changed ( model book -- )
relayout ; relayout ;
: new-book ( model class -- book ) : new-book ( model class -- book )
new-gadget new
swap >>model ; inline swap >>model ; inline
: <book> ( pages model -- book ) : <book> ( pages model -- book )

View File

@ -8,7 +8,7 @@ IN: ui.gadgets.canvas
TUPLE: canvas < gadget dlist ; TUPLE: canvas < gadget dlist ;
: new-canvas ( class -- canvas ) : new-canvas ( class -- canvas )
new-gadget black <solid> >>interior ; inline new black <solid> >>interior ; inline
: delete-canvas-dlist ( canvas -- ) : delete-canvas-dlist ( canvas -- )
[ find-gl-context ] [ find-gl-context ]

View File

@ -8,7 +8,7 @@ TUPLE: baseline-gadget < gadget baseline ;
M: baseline-gadget baseline baseline>> ; M: baseline-gadget baseline baseline>> ;
: <baseline-gadget> ( baseline dim -- gadget ) : <baseline-gadget> ( baseline dim -- gadget )
baseline-gadget new-gadget baseline-gadget new
swap >>dim swap >>dim
swap >>baseline ; swap >>baseline ;
@ -26,7 +26,7 @@ M: bad-gadget draw-gadget* "Lulz" throw ;
M: bad-gadget pref-dim* drop { 100 100 } ; M: bad-gadget pref-dim* drop { 100 100 } ;
: <bad-gadget> ( -- gadget ) bad-gadget new-gadget ; : <bad-gadget> ( -- gadget ) bad-gadget new ;
: bad-gadget-test ( -- ) : bad-gadget-test ( -- )
<bad-button> "Test 1" open-window <bad-button> "Test 1" open-window

View File

@ -14,7 +14,7 @@ TUPLE: glue < gadget ;
M: glue pref-dim* drop { 0 0 } ; M: glue pref-dim* drop { 0 0 } ;
: <glue> ( -- glue ) glue new-gadget ; : <glue> ( -- glue ) glue new ;
: <frame-grid> ( cols rows -- grid ) : <frame-grid> ( cols rows -- grid )
swap '[ _ [ <glue> ] replicate ] replicate ; swap '[ _ [ <glue> ] replicate ] replicate ;

View File

@ -75,7 +75,7 @@ IN: ui.gadgets.tests
TUPLE: mock-gadget < gadget graft-called ungraft-called ; TUPLE: mock-gadget < gadget graft-called ungraft-called ;
: <mock-gadget> ( -- gadget ) : <mock-gadget> ( -- gadget )
mock-gadget new-gadget 0 >>graft-called 0 >>ungraft-called ; mock-gadget new 0 >>graft-called 0 >>ungraft-called ;
M: mock-gadget graft* M: mock-gadget graft*
[ 1+ ] change-graft-called drop ; [ 1+ ] change-graft-called drop ;

View File

@ -36,10 +36,8 @@ M: gadget model-changed 2drop ;
: nth-gadget ( n gadget -- child ) children>> nth ; : nth-gadget ( n gadget -- child ) children>> nth ;
: new-gadget ( class -- gadget ) new ; inline
: <gadget> ( -- gadget ) : <gadget> ( -- gadget )
gadget new-gadget ; gadget new ;
: control-value ( control -- value ) : control-value ( control -- value )
model>> value>> ; model>> value>> ;

View File

@ -17,7 +17,7 @@ M: gadget hide-glass-hook drop ;
TUPLE: glass < gadget visible-rect owner ; TUPLE: glass < gadget visible-rect owner ;
: <glass> ( owner child visible-rect -- glass ) : <glass> ( owner child visible-rect -- glass )
glass new-gadget glass new
swap >>visible-rect swap >>visible-rect
swap add-gadget swap add-gadget
swap >>owner ; swap >>owner ;

View File

@ -11,7 +11,7 @@ grid
{ fill? initial: t } ; { fill? initial: t } ;
: new-grid ( children class -- grid ) : new-grid ( children class -- grid )
new-gadget new
swap [ >>grid ] [ concat add-gadgets ] bi ; inline swap [ >>grid ] [ concat add-gadgets ] bi ; inline
: <grid> ( children -- grid ) : <grid> ( children -- grid )

View File

@ -8,7 +8,7 @@ IN: ui.gadgets.incremental
TUPLE: incremental < pack cursor ; TUPLE: incremental < pack cursor ;
: <incremental> ( -- incremental ) : <incremental> ( -- incremental )
incremental new-gadget incremental new
vertical >>orientation vertical >>orientation
{ 0 0 } >>cursor ; { 0 0 } >>cursor ;

View File

@ -38,7 +38,7 @@ M: label (>>string) ( string label -- )
sans-serif-font >>font ; inline sans-serif-font >>font ; inline
: new-label ( string class -- label ) : new-label ( string class -- label )
new-gadget new
swap >>string swap >>string
label-theme ; inline label-theme ; inline

View File

@ -50,7 +50,7 @@ PRIVATE>
[ [ packed-locs ] [ children>> ] bi [ (>>loc) ] 2each ] 2bi ; [ [ packed-locs ] [ children>> ] bi [ (>>loc) ] 2each ] 2bi ;
: <pack> ( orientation -- pack ) : <pack> ( orientation -- pack )
pack new-gadget pack new
swap >>orientation ; swap >>orientation ;
: <pile> ( -- pack ) vertical <pack> ; : <pile> ( -- pack ) vertical <pack> ;

View File

@ -50,7 +50,7 @@ M: pane gadget-selection ( pane -- string/f )
bi ; bi ;
: new-pane ( input class -- pane ) : new-pane ( input class -- pane )
new-gadget new
swap >>input swap >>input
1 >>fill 1 >>fill
vertical >>orientation vertical >>orientation

View File

@ -5,7 +5,7 @@ sequences kernel ;
TUPLE: fake-break < gadget ; TUPLE: fake-break < gadget ;
: <fake-break> ( -- gadget ) fake-break new-gadget { 5 5 } >>dim ; : <fake-break> ( -- gadget ) fake-break new { 5 5 } >>dim ;
INSTANCE: fake-break word-break INSTANCE: fake-break word-break

View File

@ -20,7 +20,7 @@ INSTANCE: word-break-gadget word-break
TUPLE: paragraph < gadget margin ; TUPLE: paragraph < gadget margin ;
: <paragraph> ( margin -- gadget ) : <paragraph> ( margin -- gadget )
paragraph new-gadget paragraph new
horizontal >>orientation horizontal >>orientation
swap >>margin ; swap >>margin ;

View File

@ -129,7 +129,7 @@ elevator H{
} set-gestures } set-gestures
: <elevator> ( vector -- elevator ) : <elevator> ( vector -- elevator )
elevator new-gadget elevator new
swap >>orientation ; swap >>orientation ;
: thumb-loc ( slider -- loc ) : thumb-loc ( slider -- loc )

View File

@ -49,12 +49,12 @@ IN: ui.gadgets.worlds.tests
TUPLE: focusing < gadget ; TUPLE: focusing < gadget ;
: <focusing> : <focusing>
focusing new-gadget ; focusing new ;
TUPLE: focus-test < gadget ; TUPLE: focus-test < gadget ;
: <focus-test> : <focus-test>
focus-test new-gadget focus-test new
dup <focusing> add-gadget drop ; dup <focusing> add-gadget drop ;
M: focus-test focusable-child* gadget-child ; M: focus-test focusable-child* gadget-child ;

View File

@ -6,7 +6,7 @@ IN: ui.gadgets.wrappers
TUPLE: wrapper < gadget ; TUPLE: wrapper < gadget ;
: new-wrapper ( child class -- wrapper ) : new-wrapper ( child class -- wrapper )
new-gadget swap add-gadget ; inline new swap add-gadget ; inline
: <wrapper> ( child -- wrapper ) wrapper new-wrapper ; : <wrapper> ( child -- wrapper ) wrapper new-wrapper ;

View File

@ -104,7 +104,7 @@ deploy-gadget "toolbar" f {
} define-command-map } define-command-map
: <deploy-gadget> ( vocab -- gadget ) : <deploy-gadget> ( vocab -- gadget )
deploy-gadget new-gadget deploy-gadget new
over >>vocab over >>vocab
vertical >>orientation vertical >>orientation
swap <deploy-settings> >>settings swap <deploy-settings> >>settings

View File

@ -1,7 +1,8 @@
USING: help.markup help.syntax strings quotations debugger USING: help.markup help.syntax strings quotations debugger
namespaces ui.backend ui.gadgets ui.gadgets.worlds namespaces ui.backend ui.gadgets ui.gadgets.worlds
ui.gadgets.tracks ui.gadgets.packs ui.gadgets.grids ui.gadgets.tracks ui.gadgets.packs ui.gadgets.grids
ui.gadgets.private math.rectangles colors ui.text fonts ; ui.gadgets.private math.rectangles colors ui.text fonts
kernel ;
IN: ui IN: ui
HELP: windows HELP: windows
@ -226,8 +227,8 @@ ARTICLE: "new-gadgets" "Implementing new gadgets"
$nl $nl
"Bare gadgets can be constructed directly, which is useful if all you need is a custom appearance with no further behavior (see " { $link "ui-pen-protocol" } "):" "Bare gadgets can be constructed directly, which is useful if all you need is a custom appearance with no further behavior (see " { $link "ui-pen-protocol" } "):"
{ $subsection <gadget> } { $subsection <gadget> }
"New gadgets are defined as subclasses of an existing gadget type, perhaps even " { $link gadget } " itself. A parametrized constructor should be used to construct subclasses:" "New gadgets are defined as subclasses of an existing gadget type, perhaps even " { $link gadget } " itself. Direct subclasses of " { $link gadget } " can be constructed using " { $link new } ", however some subclasses may define their own parametrized constructors (see " { $link "parametrized-constructors" } ")."
{ $subsection new-gadget } $nl
"Further topics:" "Further topics:"
{ $subsection "ui-gestures" } { $subsection "ui-gestures" }
{ $subsection "ui-paint" } { $subsection "ui-paint" }

View File

@ -67,7 +67,7 @@ M: axis-gadget pref-dim* drop SIZE ;
pov-polygons [ add-pov-gadget ] assoc-map >>pov ; pov-polygons [ add-pov-gadget ] assoc-map >>pov ;
: <axis-gadget> ( -- gadget ) : <axis-gadget> ( -- gadget )
axis-gadget new-gadget axis-gadget new
add-pov-gadgets add-pov-gadgets
black <indicator-gadget> [ >>z-indicator ] [ add-gadget ] bi black <indicator-gadget> [ >>z-indicator ] [ add-gadget ] bi
red <indicator-gadget> [ >>indicator ] [ add-gadget ] bi red <indicator-gadget> [ >>indicator ] [ add-gadget ] bi
@ -97,7 +97,7 @@ TUPLE: joystick-demo-gadget < pack axis raxis controller buttons alarm ;
[ (add-button-gadgets) ] 2keep ; [ (add-button-gadgets) ] 2keep ;
: <joystick-demo-gadget> ( controller -- gadget ) : <joystick-demo-gadget> ( controller -- gadget )
joystick-demo-gadget new-gadget joystick-demo-gadget new
{ 0 1 } >>orientation { 0 1 } >>orientation
swap add-controller-label swap add-controller-label
<shelf> add-axis-gadget add-raxis-gadget add-gadget <shelf> add-axis-gadget add-raxis-gadget add-gadget

View File

@ -151,7 +151,7 @@ TUPLE: key-caps-gadget < gadget keys alarm ;
[ >>keys ] tri ; [ >>keys ] tri ;
: <key-caps-gadget> ( -- gadget ) : <key-caps-gadget> ( -- gadget )
key-caps-gadget new-gadget key-caps-gadget new
add-keys-gadgets ; add-keys-gadgets ;
M: key-caps-gadget pref-dim* drop KEYBOARD-SIZE ; M: key-caps-gadget pref-dim* drop KEYBOARD-SIZE ;

View File

@ -8,7 +8,7 @@ TUPLE: nehe2-gadget < gadget ;
: height 256 ; : height 256 ;
: <nehe2-gadget> ( -- gadget ) : <nehe2-gadget> ( -- gadget )
nehe2-gadget new-gadget ; nehe2-gadget new ;
M: nehe2-gadget pref-dim* ( gadget -- dim ) M: nehe2-gadget pref-dim* ( gadget -- dim )
drop width height 2array ; drop width height 2array ;

View File

@ -8,7 +8,7 @@ TUPLE: nehe3-gadget < gadget ;
: height 256 ; : height 256 ;
: <nehe3-gadget> ( -- gadget ) : <nehe3-gadget> ( -- gadget )
nehe3-gadget new-gadget ; nehe3-gadget new ;
M: nehe3-gadget pref-dim* ( gadget -- dim ) M: nehe3-gadget pref-dim* ( gadget -- dim )
drop width height 2array ; drop width height 2array ;

View File

@ -10,7 +10,7 @@ TUPLE: nehe4-gadget < gadget rtri rquad thread quit? ;
: redraw-interval ( -- dt ) 10 milliseconds ; : redraw-interval ( -- dt ) 10 milliseconds ;
: <nehe4-gadget> ( -- gadget ) : <nehe4-gadget> ( -- gadget )
nehe4-gadget new-gadget nehe4-gadget new
0.0 >>rtri 0.0 >>rtri
0.0 >>rquad ; 0.0 >>rquad ;

View File

@ -9,7 +9,7 @@ TUPLE: nehe5-gadget < gadget rtri rquad thread quit? ;
: redraw-interval ( -- dt ) 10 milliseconds ; : redraw-interval ( -- dt ) 10 milliseconds ;
: <nehe5-gadget> ( -- gadget ) : <nehe5-gadget> ( -- gadget )
nehe5-gadget new-gadget nehe5-gadget new
0.0 >>rtri 0.0 >>rtri
0.0 >>rquad ; 0.0 >>rquad ;

View File

@ -12,7 +12,7 @@ SYMBOL: last-drag-loc
TUPLE: demo-gadget < gadget yaw pitch distance ; TUPLE: demo-gadget < gadget yaw pitch distance ;
: new-demo-gadget ( yaw pitch distance class -- gadget ) : new-demo-gadget ( yaw pitch distance class -- gadget )
new-gadget new
swap >>distance swap >>distance
swap >>pitch swap >>pitch
swap >>yaw ; swap >>yaw ;

View File

@ -6,7 +6,7 @@ IN: tetris
TUPLE: tetris-gadget < gadget { tetris tetris } { alarm } ; TUPLE: tetris-gadget < gadget { tetris tetris } { alarm } ;
: <tetris-gadget> ( tetris -- gadget ) : <tetris-gadget> ( tetris -- gadget )
tetris-gadget new-gadget swap >>tetris ; tetris-gadget new swap >>tetris ;
M: tetris-gadget pref-dim* drop { 200 400 } ; M: tetris-gadget pref-dim* drop { 200 400 } ;