From cd116033a380a119a3a025cb54873b5732cb3803 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Sat, 28 Jun 2014 15:40:06 -0400
Subject: [PATCH] Adjusted window.go to make safe functions actually safe.

---
 window.go | 64 +++++++++++++++++++++++++++++++++----------------------
 1 file changed, 38 insertions(+), 26 deletions(-)

diff --git a/window.go b/window.go
index 3cf52b0..8d0e2f4 100644
--- a/window.go
+++ b/window.go
@@ -89,37 +89,49 @@ func (w *Window) SetSpaced(spaced bool) {
 
 // Open creates the Window with Create and then shows the Window with Show. As with Create, you cannot call Open more than once per window.
 func (w *Window) Open(control Control) {
-	w.Create(control)
-	w.Show()
+	done := make(chan struct{})
+	defer close(done)
+	touitask(func() {
+		w.Create(control)
+		w.Show()
+		done <- struct{}{}
+	})
+	<-done
 }
 
 // Create creates the Window, setting its control to the given control. It does not show the window. This can only be called once per window, and finalizes all initialization of the control.
 func (w *Window) Create(control Control) {
-	if w.created {
-		panic("window already open")
-	}
-	w.sysData.spaced = w.spaced
-	w.sysData.winhandler = w.handler
-	w.sysData.close = func(b *bool) {
-		w.sysData.winhandler.Event(Closing, b)
-	}
-	err := w.sysData.make(nil)
-	if err != nil {
-		panic(fmt.Errorf("error opening window: %v", err))
-	}
-	if control != nil {
-		w.sysData.allocate = control.allocate
-		err = control.make(w.sysData)
-		if err != nil {
-			panic(fmt.Errorf("error adding window's control: %v", err))
+	done := make(chan struct{})
+	defer close(done)
+	touitask(func() {
+		if w.created {
+			panic("window already open")
 		}
-	}
-	err = w.sysData.setWindowSize(w.initWidth, w.initHeight)
-	if err != nil {
-		panic(fmt.Errorf("error setting window size (in Window.Open()): %v", err))
-	}
-	w.sysData.setText(w.initTitle)
-	w.created = true
+		w.sysData.spaced = w.spaced
+		w.sysData.winhandler = w.handler
+		w.sysData.close = func(b *bool) {
+			w.sysData.winhandler.Event(Closing, b)
+		}
+		err := w.sysData.make(nil)
+		if err != nil {
+			panic(fmt.Errorf("error opening window: %v", err))
+		}
+		if control != nil {
+			w.sysData.allocate = control.allocate
+			err = control.make(w.sysData)
+			if err != nil {
+				panic(fmt.Errorf("error adding window's control: %v", err))
+			}
+		}
+		err = w.sysData.setWindowSize(w.initWidth, w.initHeight)
+		if err != nil {
+			panic(fmt.Errorf("error setting window size (in Window.Open()): %v", err))
+		}
+		w.sysData.setText(w.initTitle)
+		w.created = true
+		done <- struct{}{}
+	})
+	<-done
 }
 
 // Show shows the window.