setup building without plugins on windowsv0.5.1

notes from github remote
keep removing os.Exit()
rename from andlabs2 back to andlabs
rename files for windows andlabs/ui
gocui always sets STDOUT a file in /tmp/

Signed-off-by: Jeff Carr <[email protected]>

1 files changed, 30 insertions, 42 deletions

diff --git a/toolkit/andlabs/button.go b/toolkit/andlabs/button.go
index e0b7d97..bd80683 100644
--- a/toolkit/andlabs/button.go
+++ b/toolkit/andlabs/button.go
@@ -1,68 +1,56 @@
-package toolkit
+package main
 
 import "log"
 // import "os"
 
+
 import "github.com/andlabs/ui"
 import _ "github.com/andlabs/ui/winmanifest"
 
-// make new Group here
-func (t Toolkit) NewButton(name string) *Toolkit {
-	var newt Toolkit
+import "git.wit.org/wit/gui/toolkit"
+func NewButton(parentW *toolkit.Widget, w *toolkit.Widget) {
+	var t, newt *andlabsT
 	var b *ui.Button
+	log.Println("gui.andlabs.NewButton()", w.Name)
 
-	if t.broken() {
-		return nil
+	t = mapToolkits[parentW]
+	if (t == nil) {
+		log.Println("go.andlabs.NewButton() toolkit struct == nil. name=", parentW.Name, w.Name)
+		return
 	}
 
-	if (DebugToolkit) {
-		log.Println("gui.Toolbox.NewButton() create", name)
+	if t.broken() {
+		return
 	}
-	b = ui.NewButton(name)
+	newt = new(andlabsT)
+
+	b = ui.NewButton(w.Name)
 	newt.uiButton = b
 
 	b.OnClicked(func(*ui.Button) {
-		log.Println("TODO: IN TOOLKIT GOROUTINE. SHOULD LEAVE HERE VIA channels. button name =", name)
-		t.Dump()
-		newt.Dump()
 		if (DebugToolkit) {
-			log.Println("wit/gui/toolkit NewButton() Should do something here")
+			log.Println("TODO: IN TOOLKIT GOROUTINE. SHOULD LEAVE HERE VIA channels. button name =", w.Name)
+			log.Println("FOUND WIDGET!", w)
 		}
-		if (newt.Custom == nil) {
-			if (DebugToolkit) {
-				log.Println("wit/gui/toolkit NewButton() toolkit.Custom == nil")
-			}
-		} else {
-			if (DebugToolkit) {
-				log.Println("wit/gui/toolkit NewButton() toolkit.Custom() START")
-			}
-			newt.Custom()
+		if (w.Custom != nil) {
+			w.Custom()
 			return
-			if (DebugToolkit) {
-				log.Println("wit/gui/toolkit NewButton() toolkit.Custom() END")
-			}
 		}
-		if (t.Custom == nil) {
-			if (DebugToolkit) {
-				log.Println("wit/gui/toolkit NewButton() parent toolkit.Custom == nil")
-			}
-		} else {
-			if (DebugToolkit) {
-				log.Println("wit/gui/toolkit NewButton() running parent toolkit.Custom() START (IS THIS A BAD IDEA?)")
-			}
-			t.Custom()
+		if (w.Event != nil) {
+			w.Event(w)
 			return
-			if (DebugToolkit) {
-				log.Println("wit/gui/toolkit NewButton() running parent toolkit.Custom() END   (IS THIS A BAD IDEA?)")
-			}
 		}
-		log.Println("TODO: LEFT TOOLKIT GOROUTINE WITH NOTHING TO DO button name =", name)
+		t.Dump()
+		newt.Dump()
+		if (DebugToolkit) {
+			log.Println("TODO: LEFT TOOLKIT GOROUTINE WITH NOTHING TO DO button name =", w.Name)
+		}
 	})
 
 	if (DebugToolkit) {
-		log.Println("gui.Toolbox.NewButton() about to append to Box parent t:", name)
+		log.Println("gui.Toolbox.NewButton() about to append to Box parent t:", w.Name)
 		t.Dump()
-		log.Println("gui.Toolbox.NewButton() about to append to Box new t:", name)
+		log.Println("gui.Toolbox.NewButton() about to append to Box new t:", w.Name)
 		newt.Dump()
 	}
 	if (t.uiBox != nil) {
@@ -72,8 +60,8 @@ func (t Toolkit) NewButton(name string) *Toolkit {
 	} else {
 		log.Println("ERROR: wit/gui andlabs couldn't place this button in a box or a window")
 		log.Println("ERROR: wit/gui andlabs couldn't place this button in a box or a window")
-		return &t
+		return
 	}
 
-	return &newt
+	mapWidgetsToolkits(w, newt)
 }