compiles again

Signed-off-by: Jeff Carr <[email protected]>

7 files changed, 28 insertions, 48 deletions

diff --git a/button.go b/button.go
index d4dfe99..6fd8521 100644
--- a/button.go
+++ b/button.go
@@ -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
 }
 
diff --git a/checkbox.go b/checkbox.go
index 8864109..cf4c1a3 100644
--- a/checkbox.go
+++ b/checkbox.go
@@ -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
 }
diff --git a/dropdown.go b/dropdown.go
index b7a2695..102cb9c 100644
--- a/dropdown.go
+++ b/dropdown.go
@@ -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
 }
diff --git a/grid.go b/grid.go
index c2daaa5..4131afd 100644
--- a/grid.go
+++ b/grid.go
@@ -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
diff --git a/label.go b/label.go
index b3833e9..43f8073 100644
--- a/label.go
+++ b/label.go
@@ -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
 }
diff --git a/slider.go b/slider.go
index c222d7b..cd59726 100644
--- a/slider.go
+++ b/slider.go
@@ -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
 }
diff --git a/spinner.go b/spinner.go
index 9789759..479dc62 100644
--- a/spinner.go
+++ b/spinner.go
@@ -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
 }