1 files changed, 15 insertions, 47 deletions
diff --git a/group.go b/group.go
index 5109f1f..89c15cc 100644
--- a/group.go
+++ b/group.go
@@ -4,60 +4,28 @@ import "log"
 
 import toolkit "git.wit.org/wit/gui/toolkit/andlabs"
 
-import "github.com/andlabs/ui"
-import _ "github.com/andlabs/ui/winmanifest"
-
+// TODO: which name is better. AddGroup or NewGroup ?
+// first reaction is NewGroup
 func (n *Node) NewGroup(name string) *Node {
-	var t *toolkit.Toolkit
-	var gNode, bNode *Node
+	var newT *toolkit.Toolkit
+	var gNode *Node
 	log.Println("toolkit.NewGroup() START", name)
 
+	if (n.Toolkit == nil) {
+		log.Println("toolkit.NewGroup() Toolkit == nil")
+		panic("Toolkit should never be nil")
+	}
+
 	// make a *Node with a *toolkit.Group
-	gNode = n.AddNode(name + " part1")
-	t = toolkit.NewGroup(n.uiBox, name)
-	gNode.Toolkit = t
+	gNode = n.New(name + " part1")
+	newT = n.Toolkit.NewGroup(name)
+	gNode.Toolkit = newT
+	log.Println("################## gNode #######   ", name)
 	gNode.Dump()
 
-	// make a *Node with a *toolkit.Box
-	bNode = n.AddNode(name + " part2")
-	bNode.Toolkit = t.NewBox()
-	bNode.uiBox = bNode.Toolkit.GetBox()
-	bNode.Dump()
-	return bNode
+	return gNode
 }
 
 func (n *Node) AddGroup(title string) *Node {
-	return n.NewGroup(title)
+	return n.NewGroup(title + "deprecated AddGroup")
 }
-
-func (n *Node) AddGroupOld(title string) *Node {
-	if (n == nil) {
-		return nil
-	}
-	hbox := n.uiBox
-	if (hbox == nil) {
-		return n
-	}
-	group := ui.NewGroup(title)
-	group.SetMargined(true)
-	hbox.Append(group, true)
-
-	vbox := ui.NewVerticalBox()
-	vbox.SetPadded(true)
-	group.SetChild(vbox)
-
-	newNode := n.AddNode(title)
-	newNode.uiBox = vbox
-	return newNode
-}
-
-/*
-func (n *Node) NewGroup(title string) *Node {
-	group := ui.NewGroup(title)
-	group.SetMargined(true)
-	hbox.Append(group, true)
-
-	vbox := ui.NewVerticalBox()
-	vbox.SetPadded(true)
-	group.SetChild(vbox)
-*/