diff --git a/extra/ui/gadgets/gadgets-docs.factor b/extra/ui/gadgets/gadgets-docs.factor index 07b02e15e4..3437f1fdb4 100755 --- a/extra/ui/gadgets/gadgets-docs.factor +++ b/extra/ui/gadgets/gadgets-docs.factor @@ -185,12 +185,8 @@ HELP: make-gadget { $description "Calls the quotation in a new scope with the gadget stored in the " { $link gadget } " variable." } ; HELP: with-gadget -{ $values { "gadget" gadget } { "quot" quotation } } -{ $description "Calls the quotation in a new scope with the " { $link gadget } " and " { $link make-gadget } " variables set to " { $snippet "gadget" } ". The quotation can call " { $link g } " to access the gadget." } ; - -HELP: g -{ $values { "gadget" gadget } } -{ $description "Outputs the gadget being built. Can only be used inside a quotation passed to " { $link with-gadget } "." } ; +{ $values { "gadget" gadget } { "quot" quotation } } +{ $description "Calls the quotation in a new scope with the " { $link gadget } " and " { $link make-gadget } " variables set to " { $snippet "gadget" } } ; { control-value set-control-value gadget-model } related-words diff --git a/extra/ui/gadgets/gadgets.factor b/extra/ui/gadgets/gadgets.factor index 8209307959..ef0a9e828d 100755 --- a/extra/ui/gadgets/gadgets.factor +++ b/extra/ui/gadgets/gadgets.factor @@ -357,8 +357,6 @@ M: f request-focus-on 2drop ; : focus-path ( world -- seq ) [ focus>> ] follow ; -: g ( -- gadget ) gadget get ; - : with-gadget ( gadget quot -- ) gadget swap with-variable ; inline diff --git a/extra/ui/ui-docs.factor b/extra/ui/ui-docs.factor index 771a552259..333afd3485 100755 --- a/extra/ui/ui-docs.factor +++ b/extra/ui/ui-docs.factor @@ -238,10 +238,7 @@ $nl "Words such as " { $link track, } " access the gadget through the " { $link gadget } " variable." $nl "A combinator which stores a gadget in the " { $link gadget } " variable:" -{ $subsection with-gadget } -"The following words access the " { $link gadget } " variable; they can be used from " { $link with-gadget } " to store child gadgets in tuple slots:" -{ $subsection g } - ; +{ $subsection with-gadget } ; ARTICLE: "ui-null-layout" "Manual layouts" "When automatic layout is not appropriate, gadgets can be added to a parent with no layout policy, and then positioned and sized manually:"