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

diff --git a/basis/cairo/gadgets/gadgets.factor b/basis/cairo/gadgets/gadgets.factor
index 87942b4c91540b24887039815ebb04f262e671ce..a120f8653919262cfb9e45cb52227a3e1b495b57 100644 (file)
--- a/basis/cairo/gadgets/gadgets.factor
+++ b/basis/cairo/gadgets/gadgets.factor
@@ -26,7 +26,7 @@ GENERIC: render-cairo* ( gadget -- )
 TUPLE: cairo-gadget < gadget ;
 
 : <cairo-gadget> ( dim -- gadget )
-    cairo-gadget new-gadget
+    cairo-gadget new
         swap >>dim ;
 
 M: cairo-gadget draw-gadget*

diff --git a/basis/ui/gadgets/books/books.factor b/basis/ui/gadgets/books/books.factor
index 5c24623f89b673949b8bcac7d70ec19fb8795cd3..28cae56de9c88a7203c9338bb074bbc32dfd6fa9 100644 (file)
--- a/basis/ui/gadgets/books/books.factor
+++ b/basis/ui/gadgets/books/books.factor
@@ -17,7 +17,7 @@ M: book model-changed ( model book -- )
     relayout ;
 
 : new-book ( model class -- book )
-    new-gadget
+    new
         swap >>model ; inline
 
 : <book> ( pages model -- book )

diff --git a/basis/ui/gadgets/canvas/canvas.factor b/basis/ui/gadgets/canvas/canvas.factor
index 668a19e844cd2b269837d0e7f53be7355321cb4c..1c36f4f9fd57b425708c09f57a8ecc206a073919 100644 (file)
--- a/basis/ui/gadgets/canvas/canvas.factor
+++ b/basis/ui/gadgets/canvas/canvas.factor
@@ -8,7 +8,7 @@ IN: ui.gadgets.canvas
 TUPLE: canvas < gadget dlist ;
 
 : new-canvas ( class -- canvas )
-    new-gadget black <solid> >>interior ; inline
+    new black <solid> >>interior ; inline
 
 : delete-canvas-dlist ( canvas -- )
     [ find-gl-context ]

diff --git a/basis/ui/gadgets/debug/debug.factor b/basis/ui/gadgets/debug/debug.factor
index 616ab81fad0c0e25a2c5e2197256767860302470..3c66d06a16f08480b95ec136667c61a67be4e0b4 100644 (file)
--- a/basis/ui/gadgets/debug/debug.factor
+++ b/basis/ui/gadgets/debug/debug.factor
@@ -8,7 +8,7 @@ TUPLE: baseline-gadget < gadget baseline ;
 M: baseline-gadget baseline baseline>> ;
 
 : <baseline-gadget> ( baseline dim -- gadget )
-    baseline-gadget new-gadget
+    baseline-gadget new
         swap >>dim
         swap >>baseline ;
 
@@ -26,7 +26,7 @@ M: bad-gadget draw-gadget* "Lulz" throw ;
 
 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-button> "Test 1" open-window

diff --git a/basis/ui/gadgets/frames/frames.factor b/basis/ui/gadgets/frames/frames.factor
index 10a2f34c9071e6ea35bac0dd5a77d980850b12a0..34f46865187081aebe5bcfcbb54538174574da7f 100644 (file)
--- a/basis/ui/gadgets/frames/frames.factor
+++ b/basis/ui/gadgets/frames/frames.factor
@@ -14,7 +14,7 @@ TUPLE: glue < gadget ;
 
 M: glue pref-dim* drop { 0 0 } ;
 
-: <glue> ( -- glue ) glue new-gadget ;
+: <glue> ( -- glue ) glue new ;
 
 : <frame-grid> ( cols rows -- grid )
     swap '[ _ [ <glue> ] replicate ] replicate ;

diff --git a/basis/ui/gadgets/gadgets-tests.factor b/basis/ui/gadgets/gadgets-tests.factor
index 72e740dfa076b2e8b08618893e7f1f41fac16c09..2bfa2fb52a26b433b66a04f00135178b6b426f62 100644 (file)
--- a/basis/ui/gadgets/gadgets-tests.factor
+++ b/basis/ui/gadgets/gadgets-tests.factor
@@ -75,7 +75,7 @@ IN: ui.gadgets.tests
 TUPLE: mock-gadget < gadget graft-called ungraft-called ;
 
 : <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*
     [ 1+ ] change-graft-called drop ;

diff --git a/basis/ui/gadgets/gadgets.factor b/basis/ui/gadgets/gadgets.factor
index f424ffb1cce4c26917b1e2274fded230d49bf53b..967b14da789d9a8081404eadf8d6340d3daa85f0 100644 (file)
--- a/basis/ui/gadgets/gadgets.factor
+++ b/basis/ui/gadgets/gadgets.factor
@@ -36,10 +36,8 @@ M: gadget model-changed 2drop ;
 
 : nth-gadget ( n gadget -- child ) children>> nth ;
 
-: new-gadget ( class -- gadget ) new ; inline
-
 : <gadget> ( -- gadget )
-    gadget new-gadget ;
+    gadget new ;
 
 : control-value ( control -- value )
     model>> value>> ;

diff --git a/basis/ui/gadgets/glass/glass.factor b/basis/ui/gadgets/glass/glass.factor
index 6b5dac6e362ab2a38edf0d8c70ca1faddf9d82fa..0a91236bd48f5044784fee530e223a0036ed12cb 100644 (file)
--- a/basis/ui/gadgets/glass/glass.factor
+++ b/basis/ui/gadgets/glass/glass.factor
@@ -17,7 +17,7 @@ M: gadget hide-glass-hook drop ;
 TUPLE: glass < gadget visible-rect owner ;
 
 : <glass> ( owner child visible-rect -- glass )
-    glass new-gadget
+    glass new
         swap >>visible-rect
         swap add-gadget
         swap >>owner ;

diff --git a/basis/ui/gadgets/grids/grids.factor b/basis/ui/gadgets/grids/grids.factor
index 4e7882f826c2ef46877be0872d1d88a1ca1c8769..dc4217438e6a0b8ec9fbce6c863d16fd69fd3375 100644 (file)
--- a/basis/ui/gadgets/grids/grids.factor
+++ b/basis/ui/gadgets/grids/grids.factor
@@ -11,7 +11,7 @@ grid
 { fill? initial: t } ;
 
 : new-grid ( children class -- grid )
-    new-gadget
+    new
         swap [ >>grid ] [ concat add-gadgets ] bi ; inline
 
 : <grid> ( children -- grid )

diff --git a/basis/ui/gadgets/incremental/incremental.factor b/basis/ui/gadgets/incremental/incremental.factor
index 6cb2bdd98c75222a8353600d6443ec96da828cad..767b1a57b1e26fafe6aaaaa94140b7328a4364c1 100644 (file)
--- a/basis/ui/gadgets/incremental/incremental.factor
+++ b/basis/ui/gadgets/incremental/incremental.factor
@@ -8,7 +8,7 @@ IN: ui.gadgets.incremental
 TUPLE: incremental < pack cursor ;
 
 : <incremental> ( -- incremental )
-    incremental new-gadget
+    incremental new
         vertical >>orientation
         { 0 0 } >>cursor ;
 

diff --git a/basis/ui/gadgets/labels/labels.factor b/basis/ui/gadgets/labels/labels.factor
index 7ac729c451eebc6c74df01c093391c201cbcffe4..37406548984a01666abdfe33028096d74f0bc615 100644 (file)
--- a/basis/ui/gadgets/labels/labels.factor
+++ b/basis/ui/gadgets/labels/labels.factor
@@ -38,7 +38,7 @@ M: label (>>string) ( string label -- )
     sans-serif-font >>font ; inline
 
 : new-label ( string class -- label )
-    new-gadget
+    new
     swap >>string
     label-theme ; inline
 

diff --git a/basis/ui/gadgets/packs/packs.factor b/basis/ui/gadgets/packs/packs.factor
index c588ed1b98005653ecddf71a3893f849efd93f63..b23f0474f906de720f7c22c7379fabc8c989a1b1 100644 (file)
--- a/basis/ui/gadgets/packs/packs.factor
+++ b/basis/ui/gadgets/packs/packs.factor
@@ -50,7 +50,7 @@ PRIVATE>
     [ [ packed-locs ] [ children>> ] bi [ (>>loc) ] 2each ] 2bi ;
 
 : <pack> ( orientation -- pack )
-    pack new-gadget
+    pack new
         swap >>orientation ;
 
 : <pile> ( -- pack ) vertical <pack> ;

diff --git a/basis/ui/gadgets/panes/panes.factor b/basis/ui/gadgets/panes/panes.factor
index e9f88f774afb4a4ab880c658782aa35924a9babb..530bbaef4917cc80132d37be4bdb1aa373e9c440 100644 (file)
--- a/basis/ui/gadgets/panes/panes.factor
+++ b/basis/ui/gadgets/panes/panes.factor
@@ -50,7 +50,7 @@ M: pane gadget-selection ( pane -- string/f )
     bi ;
 
 : new-pane ( input class -- pane )
-    new-gadget
+    new
         swap >>input
         1 >>fill
         vertical >>orientation

diff --git a/basis/ui/gadgets/paragraphs/paragraphs-tests.factor b/basis/ui/gadgets/paragraphs/paragraphs-tests.factor
index d0f9f325b2f93e9c9abb487fed23381eafff14a6..0a759ab11dbc0f5874fa8882d14e7c9239cdca7a 100644 (file)
--- a/basis/ui/gadgets/paragraphs/paragraphs-tests.factor
+++ b/basis/ui/gadgets/paragraphs/paragraphs-tests.factor
@@ -5,7 +5,7 @@ sequences kernel ;
 
 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
 

diff --git a/basis/ui/gadgets/paragraphs/paragraphs.factor b/basis/ui/gadgets/paragraphs/paragraphs.factor
index 9929ade177a0cd8b9f17319218d4188c51ad23f0..f55e67f131bdcf36f4e1d4ae7bd8e2bbf2c8d559 100644 (file)
--- a/basis/ui/gadgets/paragraphs/paragraphs.factor
+++ b/basis/ui/gadgets/paragraphs/paragraphs.factor
@@ -20,7 +20,7 @@ INSTANCE: word-break-gadget word-break
 TUPLE: paragraph < gadget margin ;
 
 : <paragraph> ( margin -- gadget )
-    paragraph new-gadget
+    paragraph new
     horizontal >>orientation
     swap >>margin ;
 

diff --git a/basis/ui/gadgets/sliders/sliders.factor b/basis/ui/gadgets/sliders/sliders.factor
index 24607d3aefc62c080666af7da7e0dc6763ebbe86..6cfb83a49a87d31f70cc97e133a33fe44345a19a 100644 (file)
--- a/basis/ui/gadgets/sliders/sliders.factor
+++ b/basis/ui/gadgets/sliders/sliders.factor
@@ -129,7 +129,7 @@ elevator H{
 } set-gestures
 
 : <elevator> ( vector -- elevator )
-    elevator new-gadget
+    elevator new
         swap >>orientation ;
 
 : thumb-loc ( slider -- loc )

diff --git a/basis/ui/gadgets/worlds/worlds-tests.factor b/basis/ui/gadgets/worlds/worlds-tests.factor
index 34ddc1776751143b262f8f88ae501b5e515acadd..aeef3a6e5d1f50c324f5beef9de238275d95aa39 100644 (file)
--- a/basis/ui/gadgets/worlds/worlds-tests.factor
+++ b/basis/ui/gadgets/worlds/worlds-tests.factor
@@ -49,12 +49,12 @@ IN: ui.gadgets.worlds.tests
 TUPLE: focusing < gadget ;
 
 : <focusing>
-    focusing new-gadget ;
+    focusing new ;
 
 TUPLE: focus-test < gadget ;
 
 : <focus-test>
-    focus-test new-gadget
+    focus-test new
     dup <focusing> add-gadget drop ;
 
 M: focus-test focusable-child* gadget-child ;

diff --git a/basis/ui/gadgets/wrappers/wrappers.factor b/basis/ui/gadgets/wrappers/wrappers.factor
index 33c67313e218b4154a0a1b2e8de1f14f54ee081c..53010a3fed31bfe09f28af8ad1b27c8672f9cc3f 100644 (file)
--- a/basis/ui/gadgets/wrappers/wrappers.factor
+++ b/basis/ui/gadgets/wrappers/wrappers.factor
@@ -6,7 +6,7 @@ IN: ui.gadgets.wrappers
 TUPLE: wrapper < gadget ;
 
 : new-wrapper ( child class -- wrapper )
-    new-gadget swap add-gadget ; inline
+    new swap add-gadget ; inline
 
 : <wrapper> ( child -- wrapper ) wrapper new-wrapper ;
 

diff --git a/basis/ui/tools/deploy/deploy.factor b/basis/ui/tools/deploy/deploy.factor
index bedd5aded2e8fc434a6d8cd7254811dadac99abd..bb41c1c88d5bff59ec87c066342acc6df4216d1b 100644 (file)
--- a/basis/ui/tools/deploy/deploy.factor
+++ b/basis/ui/tools/deploy/deploy.factor
@@ -104,7 +104,7 @@ deploy-gadget "toolbar" f {
 } define-command-map
 
 : <deploy-gadget> ( vocab -- gadget )
-    deploy-gadget new-gadget
+    deploy-gadget new
       over >>vocab
       vertical >>orientation
       swap <deploy-settings> >>settings

diff --git a/basis/ui/ui-docs.factor b/basis/ui/ui-docs.factor
index 6871fbffeb56a85a4bb659020497948920701a15..6ef8696f465b3b193364a159ded9d07957ca8983 100644 (file)
--- a/basis/ui/ui-docs.factor
+++ b/basis/ui/ui-docs.factor
@@ -1,7 +1,8 @@
 USING: help.markup help.syntax strings quotations debugger
 namespaces ui.backend ui.gadgets ui.gadgets.worlds
 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
 
 HELP: windows
@@ -226,8 +227,8 @@ ARTICLE: "new-gadgets" "Implementing new gadgets"
 $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" } "):"
 { $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:"
-{ $subsection new-gadget }
+"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" } ")."
+$nl
 "Further topics:"
 { $subsection "ui-gestures" }
 { $subsection "ui-paint" }

diff --git a/extra/joystick-demo/joystick-demo.factor b/extra/joystick-demo/joystick-demo.factor
index 96bac7c72eb353ae63704537164be13570f42f81..bfb5ad56fd085b34b6960d8a84bbc2e5a8c0fe79 100755 (executable)
--- a/extra/joystick-demo/joystick-demo.factor
+++ b/extra/joystick-demo/joystick-demo.factor
@@ -67,7 +67,7 @@ M: axis-gadget pref-dim* drop SIZE ;
     pov-polygons [ add-pov-gadget ] assoc-map >>pov ;
 
 : <axis-gadget> ( -- gadget )
-    axis-gadget new-gadget
+    axis-gadget new
     add-pov-gadgets
     black <indicator-gadget> [ >>z-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 ;
 
 : <joystick-demo-gadget> ( controller -- gadget )
-    joystick-demo-gadget new-gadget
+    joystick-demo-gadget new
     { 0 1 } >>orientation
     swap add-controller-label
     <shelf> add-axis-gadget add-raxis-gadget add-gadget

diff --git a/extra/key-caps/key-caps.factor b/extra/key-caps/key-caps.factor
index 1c9011cc84b15e5306d1c6a867a0da6a951ef9ba..6fe15e2ca0934967778622bac98b8f05ebdb2f19 100755 (executable)
--- a/extra/key-caps/key-caps.factor
+++ b/extra/key-caps/key-caps.factor
@@ -151,7 +151,7 @@ TUPLE: key-caps-gadget < gadget keys alarm ;
     [ >>keys ] tri ;
 
 : <key-caps-gadget> ( -- gadget )
-    key-caps-gadget new-gadget
+    key-caps-gadget new
     add-keys-gadgets ;
 
 M: key-caps-gadget pref-dim* drop KEYBOARD-SIZE ;

diff --git a/extra/nehe/2/2.factor b/extra/nehe/2/2.factor
index 29d4ccffc1f17b832bfb19a197f679321dca4832..3ee153bbd6b13baf21f568fa650369fdcdbacd55 100644 (file)
--- a/extra/nehe/2/2.factor
+++ b/extra/nehe/2/2.factor
@@ -8,7 +8,7 @@ TUPLE: nehe2-gadget < gadget ;
 : height 256 ;
 
 : <nehe2-gadget> (  -- gadget )
-  nehe2-gadget new-gadget ;
+  nehe2-gadget new ;
 
 M: nehe2-gadget pref-dim* ( gadget -- dim )
   drop width height 2array ;

diff --git a/extra/nehe/3/3.factor b/extra/nehe/3/3.factor
index 75f2e573cc5a406718e339a3e03c59a2144f0ce0..af9b37f73e7319661d1f2618cd661b6687110159 100644 (file)
--- a/extra/nehe/3/3.factor
+++ b/extra/nehe/3/3.factor
@@ -8,7 +8,7 @@ TUPLE: nehe3-gadget < gadget ;
 : height 256 ;
 
 : <nehe3-gadget> (  -- gadget )
-  nehe3-gadget new-gadget ;
+  nehe3-gadget new ;
 
 M: nehe3-gadget pref-dim* ( gadget -- dim )
   drop width height 2array ;

diff --git a/extra/nehe/4/4.factor b/extra/nehe/4/4.factor
index fda22d2f1e3c610068578f421821cef0ebd961f7..0938bb366af3f717afe708207ee8156c15cb811b 100644 (file)
--- a/extra/nehe/4/4.factor
+++ b/extra/nehe/4/4.factor
@@ -10,7 +10,7 @@ TUPLE: nehe4-gadget < gadget rtri rquad thread quit? ;
 : redraw-interval ( -- dt ) 10 milliseconds ;
 
 : <nehe4-gadget> (  -- gadget )
-  nehe4-gadget new-gadget
+  nehe4-gadget new
     0.0 >>rtri
     0.0 >>rquad ;
 

diff --git a/extra/nehe/5/5.factor b/extra/nehe/5/5.factor
index 30d0991fd890523392191bf5d84dd486ade8415f..5cf312b9f8aa56ca0723726c9197693a8a0c2dd3 100755 (executable)
--- a/extra/nehe/5/5.factor
+++ b/extra/nehe/5/5.factor
@@ -9,7 +9,7 @@ TUPLE: nehe5-gadget < gadget rtri rquad thread quit? ;
 : redraw-interval ( -- dt ) 10 milliseconds ;\r
 \r
 : <nehe5-gadget> (  -- gadget )\r
-  nehe5-gadget new-gadget\r
+  nehe5-gadget new\r
     0.0 >>rtri\r
     0.0 >>rquad ;\r
 \r

diff --git a/extra/opengl/demo-support/demo-support.factor b/extra/opengl/demo-support/demo-support.factor
index c8fe2b4882a1d9a59ad562664f8987dada4e2086..0f8529b3d70b489f96aee6020e29da1e5c909de7 100755 (executable)
--- a/extra/opengl/demo-support/demo-support.factor
+++ b/extra/opengl/demo-support/demo-support.factor
@@ -12,7 +12,7 @@ SYMBOL: last-drag-loc
 TUPLE: demo-gadget < gadget yaw pitch distance ;
 
 : new-demo-gadget ( yaw pitch distance class -- gadget )
-    new-gadget
+    new
         swap >>distance
         swap >>pitch
         swap >>yaw ;

diff --git a/extra/tetris/tetris.factor b/extra/tetris/tetris.factor
index bb90f082b7620a69cf54f871cbf27366c5a7ed3c..66f69bb0533d9c88b5426b6dc50cc335c8150506 100644 (file)
--- a/extra/tetris/tetris.factor
+++ b/extra/tetris/tetris.factor
@@ -6,7 +6,7 @@ IN: tetris
 TUPLE: tetris-gadget < gadget { tetris tetris } { alarm } ;
 
 : <tetris-gadget> ( tetris -- gadget )
-    tetris-gadget new-gadget swap >>tetris ;
+    tetris-gadget new swap >>tetris ;
 
 M: tetris-gadget pref-dim* drop { 200 400 } ;