From f85cb5c0f0c45d45bb0b49d7df673bf89a6d0692 Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Sat, 1 Jun 2019 14:16:00 -0700
Subject: [PATCH] compiles again
Signed-off-by: Jeff Carr <jcarr@wit.com>
---
misc.go | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/misc.go b/misc.go
index ed6a180..a685b81 100644
--- a/misc.go
+++ b/misc.go
@@ -14,18 +14,20 @@ import pb "git.wit.com/wit/witProtobuf"
// THIS IS NOT CLEAN (almost?)
-func ShowTab(gw *GuiWindow, tabname string, title string) {
+func ShowTab(gw *GuiWindow, tabname string, title string) *GuiWindow {
log.Println("ShowTab() gw =", gw)
if (gw.UiTab == nil) {
log.Println("ShowTab() gw.UiTab = nil THIS IS BAD")
os.Exit(-1)
}
- gw.UiTab.Delete(0)
+ window := InitGuiWindow(Data.Config, tabname, gw.MakeWindow, gw.UiWindow, gw.UiTab)
+ window.UiTab.Delete(0)
- abox := gw.MakeWindow(gw)
- gw.BoxMap[tabname] = abox
- gw.UiTab.InsertAt(title, 0, abox.UiBox)
- gw.UiTab.SetMargined(0, true)
+ abox := window.MakeWindow(window)
+ window.BoxMap[tabname] = abox
+ window.UiTab.InsertAt(title, 0, abox.UiBox)
+ window.UiTab.SetMargined(0, true)
+ return window
}
func GuiInit() {