compiles again

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2023-05-09 08:38:33 -05:00
parent 9934f932ca
commit 579d75d856
7 changed files with 28 additions and 48 deletions

View File

@ -2,15 +2,11 @@ package gui
import "git.wit.org/wit/gui/toolkit"
func (n *Node) NewButton(name string, custom func()) *Node {
newNode := n.newNode(name, toolkit.Button, custom)
var a toolkit.Action
a.Name = name
a.Text = name
a.ActionType = toolkit.Add
newaction(&a, newNode, n)
func (parent *Node) NewButton(name string, custom func()) *Node {
newNode := parent.newNode(name, toolkit.Button, custom)
a := newAction(newNode, toolkit.Add)
sendAction(a, newNode, parent)
return newNode
}

View File

@ -9,11 +9,8 @@ func (n *Node) Checked() bool {
func (n *Node) NewCheckbox(name string) *Node {
newNode := n.newNode(name, toolkit.Checkbox, nil)
var a toolkit.Action
a.ActionType = toolkit.Add
a.Name = name
a.Text = name
newaction(&a, newNode, n)
a := newAction(newNode, toolkit.Add)
sendAction(a, newNode, n)
return newNode
}

View File

@ -22,12 +22,8 @@ func (n *Node) SetDropdownName(name string) {
func (n *Node) NewDropdown(name string) *Node {
newNode := n.newNode(name, toolkit.Dropdown, nil)
var a toolkit.Action
a.ActionType = toolkit.Add
// a.Widget = &newNode.widget
// a.Where = &n.widget
// action(&a)
newaction(&a, newNode, n)
a := newAction(newNode, toolkit.Add)
sendAction(a, newNode, n)
return newNode
}
@ -35,12 +31,8 @@ func (n *Node) NewDropdown(name string) *Node {
func (n *Node) NewCombobox(name string) *Node {
newNode := n.newNode(name, toolkit.Combobox, nil)
var a toolkit.Action
a.ActionType = toolkit.Add
// a.Widget = &newNode.widget
// a.Where = &n.widget
// action(&a)
newaction(&a, newNode, n)
a := newAction(newNode, toolkit.Add)
sendAction(a, newNode, n)
return newNode
}

View File

@ -27,7 +27,7 @@ func (n *Node) NewGrid(name string, w int, h int) *Node {
log(debugChange, "click() NewGrid not defined =", name)
})
a := newAction(n, toolkit.Add)
a := newAction(newNode, toolkit.Add)
a.X = w
a.Y = h

View File

@ -4,13 +4,9 @@ import (
"git.wit.org/wit/gui/toolkit"
)
func (n *Node) NewLabel(text string) *Node {
newNode := n.newNode(text, toolkit.Label, nil)
n.Name = text
n.Text = text
a := newAction(n, toolkit.Add)
sendAction(a, newNode, n)
func (parent *Node) NewLabel(text string) *Node {
newNode := parent.newNode(text, toolkit.Label, nil)
a := newAction(newNode, toolkit.Add)
sendAction(a, newNode, parent)
return newNode
}

View File

@ -4,18 +4,17 @@ import (
"git.wit.org/wit/gui/toolkit"
)
func (n *Node) NewSlider(name string, x int, y int) *Node {
newNode := n.newNode(name, toolkit.Slider, func() {
func (parent *Node) NewSlider(name string, x int, y int) *Node {
newNode := parent.newNode(name, toolkit.Slider, func() {
log(debugGui, "even newer clicker() name in NewSlider name =", name)
})
var a toolkit.Action
a.ActionType = toolkit.Add
newNode.X = x
newNode.Y = y
a := newAction(newNode, toolkit.Add)
a.X = x
a.Y = y
a.Name = name
a.Text = name
newaction(&a, newNode, n)
sendAction(a, newNode, parent)
return newNode
}

View File

@ -4,18 +4,18 @@ import (
"git.wit.org/wit/gui/toolkit"
)
func (n *Node) NewSpinner(name string, x int, y int) *Node {
newNode := n.newNode(name, toolkit.Spinner, func() {
func (parent *Node) NewSpinner(name string, x int, y int) *Node {
newNode := parent.newNode(name, toolkit.Spinner, func() {
log(debugChange, "default NewSpinner() change", name)
})
var a toolkit.Action
a.ActionType = toolkit.Add
newNode.X = x
newNode.Y = y
a := newAction(newNode, toolkit.Add)
a.X = x
a.Y = y
a.Name = name
a.Text = name
newaction(&a, newNode, n)
sendAction(a, newNode, parent)
return newNode
}