diff --git a/Makefile b/Makefile index 7094679..50ea543 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ VERSION = $(shell cat resources/VERSION) # PATH=/usr/bin:$PATH go version build: - git pull + # -git pull -cp ~/go/src/git.wit.org/wit/gui/toolkit/*.so plugins/ GO111MODULE="off" go build -v ./wit-new-machine --gui-toolkit gocui >/tmp/witgui.log.stderr 2>&1 diff --git a/gui.go b/gui.go index 84e77eb..0957c76 100644 --- a/gui.go +++ b/gui.go @@ -51,7 +51,7 @@ func drawWindow() { g.NewLabel("resolv.conf") resolv = g.NewTextbox("resolv") - resolv.Dump(true) + resolv.Dump() resolv.SetText("hello world\nfoo bar\n") g.NewButton("Load 'gocui'", func () { diff --git a/main.go b/main.go index dc76032..26a0e48 100644 --- a/main.go +++ b/main.go @@ -54,13 +54,15 @@ func main() { os.Exit(0) } + myGui = gui.New().InitEmbed(resToolkit) if (args.GuiToolkit == nil) { myGui = gui.New().Default() } else { if args.GuiToolkit[0] == "gocui" { myGui = gui.New().LoadToolkit(args.GuiToolkit[0]) } else { - myGui = gui.New().InitEmbed(resToolkit).LoadToolkit(args.GuiToolkit[0]) + myGui = gui.New().LoadToolkit(args.GuiToolkit[0]).InitEmbed(resToolkit) + // myGui = gui.New().InitEmbed(resToolkit).LoadToolkit(args.GuiToolkit[0]) } }