From 699f786cd5360ce851a0542c218f0d9cb919d608 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Mon, 10 Mar 2014 11:06:07 -0400
Subject: [PATCH] Fixed compiler errors in the previous few commits.

---
 sysdata_darwin.go  | 7 ++-----
 sysdata_unix.go    | 9 +++------
 sysdata_windows.go | 2 +-
 test/main.go       | 5 +----
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/sysdata_darwin.go b/sysdata_darwin.go
index be17825..32b94c3 100644
--- a/sysdata_darwin.go
+++ b/sysdata_darwin.go
@@ -306,10 +306,7 @@ func (s *sysData) make(initText string, window *sysData) error {
 		ret <- ct.make(parentWindow, s.alternate)
 	}
 	s.id = <-ret
-	err := s.setText(initText)
-	if err != nil {
-		return fmt.Errorf("error setting initial text of new window/control: %v", err)
-	}
+	s.setText(initText)
 	addSysData(s.id, s)
 	return nil
 }
@@ -344,7 +341,7 @@ func (s *sysData) setText(text string) {
 	var zeroSel C.SEL
 
 	if classTypes[s.ctype].settextsel == zeroSel {		// does not have concept of text
-		return nil
+		return
 	}
 	ret := make(chan struct{})
 	defer close(ret)
diff --git a/sysdata_unix.go b/sysdata_unix.go
index 38e589c..a910df7 100644
--- a/sysdata_unix.go
+++ b/sysdata_unix.go
@@ -4,7 +4,7 @@
 package ui
 
 import (
-	"fmt"
+	// ...
 )
 
 type sysData struct {
@@ -150,10 +150,7 @@ func (s *sysData) make(initText string, window *sysData) error {
 		}
 		<-ret
 	}
-	err := s.setText(initText)
-	if err != nil {
-		return fmt.Errorf("error setting initial text of new window/control: %v", err)
-	}
+	s.setText(initText)
 	return nil
 }
 
@@ -185,7 +182,7 @@ func (s *sysData) hide() {
 
 func (s *sysData) setText(text string) {
 	if classTypes[s.ctype].setText == nil {		// does not have concept of text
-		return nil
+		return
 	}
 	ret := make(chan struct{})
 	defer close(ret)
diff --git a/sysdata_windows.go b/sysdata_windows.go
index f67b7e1..62c5788 100644
--- a/sysdata_windows.go
+++ b/sysdata_windows.go
@@ -254,7 +254,7 @@ func (s *sysData) setText(text string) {
 	}
 	r := <-ret
 	if r.ret == 0 {		// failure
-		panic(fmt.Errorf("error setting window/control text: %v", err))
+		panic(fmt.Errorf("error setting window/control text: %v", r.err))
 	}
 }
 
diff --git a/test/main.go b/test/main.go
index 20f5bdf..911dffa 100644
--- a/test/main.go
+++ b/test/main.go
@@ -140,15 +140,12 @@ mainloop:
 		case <-w.Closing:
 			break mainloop
 		case <-b.Clicked:
-			err = w.SetTitle(fmt.Sprintf("%v | %s | %s | %s | %s",
+			w.SetTitle(fmt.Sprintf("%v | %s | %s | %s | %s",
 				c.Checked(),
 				cb1.Selection(),
 				cb2.Selection(),
 				e.Text(),
 				password.Text()))
-			if err != nil {
-				panic(err)
-			}
 			doAdjustments()
 		case <-b2.Clicked:
 			if cb1.Len() > 1 {