1 files changed, 5 insertions, 50 deletions
diff --git a/toolkit/andlabs/widget.go b/toolkit/andlabs/widget.go
index e4a2bb7..45c584a 100644
--- a/toolkit/andlabs/widget.go
+++ b/toolkit/andlabs/widget.go
@@ -1,69 +1,24 @@
 package main
 
 import (
-	"git.wit.org/wit/gui/toolkit"
+	// "git.wit.org/wit/gui/toolkit"
 )
 
 // This is a map between the widgets in wit/gui and the internal structures of gocui
 
-var mapWidgets map[*andlabsT]*toolkit.Widget
-var mapToolkits map[*toolkit.Widget]*andlabsT
+// var mapWidgets map[*andlabsT]*toolkit.Widget
+// var mapToolkits map[*toolkit.Widget]*andlabsT
 
 // This lists out the known mappings
 // deprecate and use instead the GUI interface
 func listMap(b bool) {
 	log(b, "listMap() disabled HERE. output too big")
 	return
-	for t, w := range mapWidgets {
-		log(b, "andlabs =", t.Name, "widget =", w.Name)
-	}
 	log(b, "listMap() HERE mapToolkits()")
-	for w, t := range mapToolkits {
-		log(b, "andlabs =", t, "widget =", w.Name)
+	for i, t := range andlabs {
+		log(b, "andlabs =", t, "widgetId =", i)
 		t.Dump(b)
 	}
 	log(b, "listMap() HERE mapWidgets()")
 	log(b, "listMap() HERE FIXME. output too big")
 }
-
-func mapWidgetsToolkits(a *toolkit.Action, t *andlabsT) {
-	w := a.Widget
-	if ((mapToolkits[w] == nil) && (mapWidgets[t] == nil)) {
-		log(debugToolkit, "map a new widget", w, t)
-		mapToolkits[w] = t
-		mapWidgets[t] = w
-		return
-	}
-
-	if (mapToolkits[w] != nil) {
-		tw := mapToolkits[w]
-		if (tw == nil) {
-			// logic corruption somewhere? Have you been deleting things recently?
-			log(true, "mapToolkits[w] is set, but mapWidgets[t] is nil")
-			panic("WTF mapWidgets[t] == nil")
-		}
-		log(debugToolkit, "mapToolkits[w] is", tw)
-		if (tw == nil) {
-			log(debugError, "BAD map? mapWidgets[w] tw == nil")
-		} else {
-			log(debugError, "BAD map? mapWidgets[w] is", tw)
-			tw.Dump(debugError)
-		}
-	}
-
-	if (mapWidgets[t] != nil) {
-		wt := mapWidgets[t]
-		if (mapToolkits[w] == nil) {
-			// logic corruption somewhere? Have you been deleting things recently?
-			log(true, "mapWidgets[t] is set, but mapToolkits[w] is nil")
-			panic("WTF mapToolkits[w] == nil")
-		}
-		if (wt == nil) {
-			log(debugError, "BAD map? mapWidgets[t] wt == nil")
-		} else {
-			log(debugError, "BAD map? mapWidgets[t] is", wt)
-			widgetDump(debugError, wt)
-		}
-	}
-	log(debugToolkit, "map of widget worked", w.Type, ",", w.Name)
-}