more and more

1 files changed, 6 insertions, 49 deletions

diff --git a/treeWidget.go b/treeWidget.go
index 0477470..5b231bb 100644
--- a/treeWidget.go
+++ b/treeWidget.go
@@ -18,8 +18,8 @@ func initWidget(n *tree.Node) *guiWidget {
 	w = new(guiWidget)
 
 	w.node = n
-	w.cuiName = strconv.Itoa(w.node.WidgetId) + " TK"
-	// w.node.WidgetType = n.WidgetType
+	w.cuiName = strconv.Itoa(w.WidgetId()) + " TK"
+	// w.WidgetType() = n.WidgetType
 	w.labelN = n.State.Label
 	if w.labelN == "" {
 		// remove this debugging hack once things are stable and fixed
@@ -39,11 +39,11 @@ func initWidget(n *tree.Node) *guiWidget {
 
 	p := n.Parent
 	if p == nil {
-		log.Log(ERROR, "parent == nil", w.String(), n.WidgetId, w.node.WidgetType)
+		log.Log(ERROR, "parent == nil", w.String(), n.WidgetId, w.WidgetType())
 		return w
 	}
 	if p.TK == nil {
-		log.Log(ERROR, "parent.TK == nil", w.String(), n.WidgetId, w.node.WidgetType)
+		log.Log(ERROR, "parent.TK == nil", w.String(), n.WidgetId, w.WidgetType())
 		return w
 	}
 
@@ -69,7 +69,7 @@ func setupCtrlDownWidget() {
 
 func (w *guiWidget) deleteView() {
 	// make sure the view isn't really there
-	// log.Log(GOCUI, "deleteView()", w.cuiName, w.node.WidgetType, w.node.WidgetId)
+	// log.Log(GOCUI, "deleteView()", w.cuiName, w.WidgetType(), w.WidgetId())
 	me.baseGui.DeleteView(w.cuiName)
 	w.v = nil
 }
@@ -80,7 +80,7 @@ func (tk *guiWidget) String() string {
 	if curval != "" {
 		return curval
 	}
-	curval = strings.TrimSpace(tk.node.GetLabel())
+	curval = strings.TrimSpace(tk.GetLabel())
 	if curval != "" {
 		return curval
 	}
@@ -152,46 +152,3 @@ func (tk *guiWidget) findWidgetByView(v *gocui.View) *guiWidget {
 	}
 	return nil
 }
-
-func (tk *guiWidget) WidgetType() widget.WidgetType {
-	if tk.node == nil {
-		return widget.Label
-	}
-	return tk.node.WidgetType
-}
-
-func (tk *guiWidget) WidgetId() int {
-	return tk.node.WidgetId
-}
-
-func (tk *guiWidget) GetLabel() string {
-	return tk.node.GetLabel()
-}
-
-func (tk *guiWidget) IsEnabled() bool {
-	return tk.node.IsEnabled()
-}
-
-func (tk *guiWidget) Checked() bool {
-	return tk.node.State.Checked
-}
-
-func (tk *guiWidget) Hidden() bool {
-	if tk.node == nil {
-		return false
-	}
-	if tk.parent == nil {
-		return tk.node.Hidden()
-	}
-	if tk.parent.WidgetId() == 0 {
-		return tk.node.Hidden()
-	}
-	if tk.parent.Hidden() {
-		return true
-	}
-	return tk.node.Hidden()
-}
-
-func (tk *guiWidget) Direction() widget.Orientation {
-	return tk.node.State.Direction
-}