Reverted everything back to the old API.

1 files changed, 2 insertions, 10 deletions

diff --git a/test/kbtest.go b/test/kbtest.go
index 4e97708..df00613 100644
--- a/test/kbtest.go
+++ b/test/kbtest.go
@@ -73,19 +73,13 @@ func (a *keyboardArea) Key(e KeyEvent) (repaint bool) {
 	return true
 }
 
-type kbhandler struct{}
-func (kbhandler) Event(e Event, d interface{}) {
-	if e == Closing {
-		*(d.(*bool)) = true
-	}
-}
-
 var doKeyboard = flag.Bool("kb", false, "run keyboard test (overrides -areabounds)")
 func kbTest() {
 	wid, ht, ah := mkkbArea()
 	a := NewArea(wid, ht, ah)
-	w := NewWindow("Hi", wid, ht, kbhandler{})
+	w := NewWindow("Hi", wid, ht)
 	w.Open(a)
+	<-w.Closing
 }
 
 var (
@@ -219,8 +213,6 @@ var modpoints = map[Modifiers]image.Point{
 	Super:	image.Pt(61, 199),
 }
 
-// TODO move the following to its own file
-
 // source: http://openclipart.org/image/800px/svg_to_png/154537/1312973798.png (medium image) via http://openclipart.org/detail/154537/us-english-keyboard-layout-v0.1-by-nitiraseem
 var kbpic = []byte{
   0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,