Migrated the Mac OS X backend to the new Control setup.

1 files changed, 44 insertions, 16 deletions

diff --git a/redo/button_darwin.go b/redo/button_darwin.go
index e5a7f5b..1e6cf33 100644
--- a/redo/button_darwin.go
+++ b/redo/button_darwin.go
@@ -10,30 +10,36 @@ import (
 import "C"
 
 type button struct {
-	*controlbase
-	clicked		*event
+	_id		C.id
+	clicked	*event
 }
 
-func finishNewButton(id C.id, text string) *button {
+func newButton(text string) *button {
 	ctext := C.CString(text)
 	defer C.free(unsafe.Pointer(ctext))
 	b := &button{
-		controlbase:	newControl(id),
+		_id:			C.newButton(),
 		clicked:		newEvent(),
 	}
-	C.buttonSetText(b.id, ctext)
-	C.buttonSetDelegate(b.id, unsafe.Pointer(b))
+	C.buttonSetText(b._id, ctext)
+	C.buttonSetDelegate(b._id, unsafe.Pointer(b))
 	return b
 }
 
-func newButton(text string) *button {
-	return finishNewButton(C.newButton(), text)
-}
-
 func (b *button) OnClicked(e func()) {
 	b.clicked.set(e)
 }
 
+func (b *button) Text() string {
+	return C.GoString(C.buttonText(b._id))
+}
+
+func (b *button) SetText(text string) {
+	ctext := C.CString(text)
+	defer C.free(unsafe.Pointer(ctext))
+	C.buttonSetText(b._id, ctext)
+}
+
 //export buttonClicked
 func buttonClicked(xb unsafe.Pointer) {
 	b := (*button)(unsafe.Pointer(xb))
@@ -41,12 +47,34 @@ func buttonClicked(xb unsafe.Pointer) {
 	println("button clicked")
 }
 
-func (b *button) Text() string {
-	return C.GoString(C.buttonText(b.id))
+func (b *button) id() C.id {
+	return b._id
 }
 
-func (b *button) SetText(text string) {
-	ctext := C.CString(text)
-	defer C.free(unsafe.Pointer(ctext))
-	C.buttonSetText(b.id, ctext)
+func (b *button) setParent(p *controlParent) {
+	basesetParent(b, p)
+}
+
+func (b *button) containerShow() {
+	basecontainerShow(b)
+}
+
+func (b *button) containerHide() {
+	basecontainerHide(b)
+}
+
+func (b *button) allocate(x int, y int, width int, height int, d *sizing) []*allocation {
+	return baseallocate(b, x, y, width, height, d)
+}
+
+func (b *button) preferredSize(d *sizing) (width, height int) {
+	return basepreferredSize(b, d)
+}
+
+func (b *button) commitResize(a *allocation, d *sizing) {
+	basecommitResize(b, a, d)
+}
+
+func (b *button) getAuxResizeInfo(d *sizing) {
+	basegetAuxResizeInfo(b, d)
 }