Cleaned up newtypes.go.

darwintest/newtypes.go

@@ -13,30 +13,34 @@ import (
 // extern void windowShouldClose(id, SEL, id);
 // extern void buttonClicked(id, SEL, id);
 // extern void gotNotification(id, SEL, id);
-// /* cgo doesn't like nil or Nil */
+// /* because cgo doesn't like Nil */
-// extern Class NilClass; /* in runtimetest.go because of cgo limitations */
+// extern Class NilClass;		/* defined in runtimetest.go due to cgo limitations */
-// extern id Nilid;
 import "C"
 
-var NSObject = C.object_getClass(objc_getClass("NSObject"))
+var (
+	_NSObject_Class = C.object_getClass(_NSObject)
+)
 
 func newClass(name string) C.Class {
 	cname := C.CString(name)
 	defer C.free(unsafe.Pointer(cname))
 
-	c := C.objc_allocateClassPair(NSObject, cname, 0)
+	c := C.objc_allocateClassPair(_NSObject_Class, cname, 0)
 	if c == C.NilClass {
 		panic("unable to create Objective-C class " + name)
 	}
 	return c
 }
 
+// TODO move these around later
+var (
+	_stop = sel_getUid("stop:")
+)
+
 //export windowShouldClose
 func windowShouldClose(self C.id, sel C.SEL, sender C.id) {
 	fmt.Println("-[hello windowShouldClose:]")
-	C.objc_msgSend_id(NSApp,
+	C.objc_msgSend_id(NSApp, _stop, sender)
-		sel_getUid("stop:"),
-		sender)
 }
 
 //export buttonClicked
@@ -47,11 +51,7 @@ func buttonClicked(self C.id, sel C.SEL, sender C.id) {
 
 //export gotNotification
 func gotNotification(self C.id, sel C.SEL, object C.id) {
-	source := (*C.char)(unsafe.Pointer(
+	fmt.Printf("got notification from %s\n", fromNSString(object))
-		C.objc_msgSend_noargs(object,
-			sel_getUid("UTF8String"))))
-	fmt.Println("got notification from %s",
-		C.GoString(source))
 }
 
 func addOurMethod(class C.Class, sel C.SEL, imp C.IMP) {

darwintest/objc_darwin.go

@@ -26,6 +26,7 @@ func sel_getUid(sel string) C.SEL {
 
 // Common Objective-C types and selectors.
 var (
+	_NSObject = objc_getClass("NSObject")
 	_NSString = objc_getClass("NSString")
 
 	_alloc = sel_getUid("alloc")

darwintest/runtimetest.go

@@ -9,8 +9,7 @@ import (
 // #cgo LDFLAGS: -lobjc -framework Foundation -framework AppKit
 // #include <stdlib.h>
 // #include "objc_darwin.h"
-// Class NilClass = Nil; /* for newtypes.go */
+// Class NilClass = Nil;		/* for newtypes.go; here due to cgo limitations */
-// id Nilid = nil;
 import "C"
 
 var (