GROUP: implement 'group' in toolkit/

    move gui.group into toolkit
    remove duplicate code
    update demo

1 files changed, 7 insertions, 2 deletions

diff --git a/new-structs.go b/new-structs.go
index 74bbd50..fee1473 100644
--- a/new-structs.go
+++ b/new-structs.go
@@ -62,6 +62,7 @@ type Node struct {
 
 	uiControl *ui.Control
 	uiButton  *ui.Button
+	uiGroup   *ui.Group
 	uiSlider  *ui.Slider
 	uiSpinbox *ui.Spinbox
 	uiWindow  *ui.Window
@@ -96,11 +97,11 @@ func (n *Node) Dump() {
 	if (n.window != nil) {
 		IndentPrintln("window     = ", n.window)
 	}
-	if (n.window != nil) {
+	if (n.box != nil) {
 		IndentPrintln("box        = ", n.box)
 	}
 
-	if (n.window != nil) {
+	if (n.uiWindow != nil) {
 		IndentPrintln("uiWindow   = ", n.uiWindow)
 	}
 	if (n.uiTab != nil) {
@@ -109,6 +110,10 @@ func (n *Node) Dump() {
 	if (n.uiBox != nil) {
 		IndentPrintln("uiBox      = ", n.uiBox)
 	}
+	if (n.Toolkit != nil) {
+		IndentPrintln("Toolkit    = ", n.Toolkit)
+		n.Toolkit.Dump()
+	}
 	if (n.uiControl != nil) {
 		IndentPrintln("uiControl  = ", n.uiControl)
 	}