protobuf changes

1 files changed, 10 insertions, 10 deletions

diff --git a/debug.go b/debug.go
index dbcccc3..b782955 100644
--- a/debug.go
+++ b/debug.go
@@ -12,9 +12,9 @@ import (
 )
 
 func (w *guiWidget) dumpTree(s string) {
-	// log.Log(ERROR, "dump w", w.node.WidgetId, w.WidgetType, w.String())
+	// log.Log(ERROR, "dump w", w.WidgetId(), w.WidgetType, w.String())
 	if w == nil {
-		log.Log(ERROR, "dump w.TK == nil", w.node.WidgetId, w.node.WidgetType, w.String())
+		log.Log(ERROR, "dump w.TK == nil", w.WidgetId(), w.WidgetType(), w.String())
 		return
 	}
 	w.dumpWidget("dumpTree() " + s)
@@ -25,12 +25,12 @@ func (w *guiWidget) dumpTree(s string) {
 }
 
 func (w *guiWidget) dumpWindows(s string) {
-	// log.Log(ERROR, "dump w", w.node.WidgetId, w.WidgetType, w.String())
+	// log.Log(ERROR, "dump w", w.WidgetId(), w.WidgetType, w.String())
 	if w == nil {
-		log.Log(ERROR, "dump w.TK == nil", w.node.WidgetId, w.node.WidgetType, w.String())
+		log.Log(ERROR, "dump w.TK == nil", w.WidgetId(), w.WidgetType(), w.String())
 		return
 	}
-	if w.node.WidgetType == widget.Window {
+	if w.WidgetType() == widget.Window {
 		s += fmt.Sprintf(" F(%d,%d)", w.force.w0, w.force.h0)
 		// can't set this here. doesn't work
 		// w.full.w0 = w.force.w0
@@ -50,12 +50,12 @@ func (tk *guiWidget) dumpWidget(s string) {
 	var pId int
 	// tk.verifyRect()
 	if tk.node.Parent == nil {
-		log.Logf(WARN, "showWidgetPlacement() parent == nil wId=%d cuiName=%s", tk.node.WidgetId, tk.cuiName)
+		log.Logf(WARN, "showWidgetPlacement() parent == nil wId=%d cuiName=%s", tk.WidgetId(), tk.cuiName)
 		pId = 0
 	} else {
 		pId = tk.node.Parent.WidgetId
 	}
-	s1 = fmt.Sprintf("(wId,pId)=(%4d,%4d) ", tk.node.WidgetId, pId)
+	s1 = fmt.Sprintf("(wId,pId)=(%4d,%4d) ", tk.WidgetId(), pId)
 	sizeW, sizeH := tk.Size()
 	hide := "S"
 	if tk.Hidden() {
@@ -81,10 +81,10 @@ func (tk *guiWidget) dumpWidget(s string) {
 		s1 += fmt.Sprintf("   %3s %3s  ", "", "")
 	}
 	var end string
-	if tk.node.WidgetType == widget.Box {
-		end = fmt.Sprintf("%-8s %-8s %s %s", tk.node.WidgetType, tk.cuiName, tk.node.State.Direction.String(), tk.String())
+	if tk.WidgetType() == widget.Box {
+		end = fmt.Sprintf("%-8s %-8s %s %s", tk.WidgetType(), tk.cuiName, tk.node.State.Direction.String(), tk.String())
 	} else {
-		end = fmt.Sprintf("%-8s %-8s %s", tk.node.WidgetType, tk.cuiName, tk.String())
+		end = fmt.Sprintf("%-8s %-8s %s", tk.WidgetType(), tk.cuiName, tk.String())
 	}
 	log.Log(GOCUI, s1, s, end)
 }