From 1288624725ad1806dc1c141487d9d45c7c579258 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Wed, 29 Apr 2015 10:17:49 -0400
Subject: [PATCH] Fixed build errors. It works!

---
 new/darwin/GNUmakeinc.mk | 1 +
 new/darwin/newcontrol.m  | 9 ++++-----
 new/darwin/tab.m         | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/new/darwin/GNUmakeinc.mk b/new/darwin/GNUmakeinc.mk
index 813b73b0..06610975 100644
--- a/new/darwin/GNUmakeinc.mk
+++ b/new/darwin/GNUmakeinc.mk
@@ -8,6 +8,7 @@ osMFILES = \
 	darwin/main.m \
 	darwin/menu.m \
 	darwin/newcontrol.m \
+	darwin/tab.m \
 	darwin/text.m \
 	darwin/util.m \
 	darwin/window.m
diff --git a/new/darwin/newcontrol.m b/new/darwin/newcontrol.m
index b045ec8e..ecf379bd 100644
--- a/new/darwin/newcontrol.m
+++ b/new/darwin/newcontrol.m
@@ -21,7 +21,6 @@ static void singleDestroy(uiControl *c)
 		complain("attempt to destroy a uiControl at %p while it still has a parent", c);
 	[s->immediate retain];		// to keep alive when removing
 	(*(s->onDestroy))(s->onDestroyData);
-	[destroyedControlsView addSubview:s->immediate];
 	[s->immediate release];
 }
 
@@ -33,24 +32,24 @@ static uintptr_t singleHandle(uiControl *c)
 }
 
 // TODO update refcounting here and in the GTK+ port
-static void singleSetParent(uiControl *c, uiParent *parent)
+static void singleSetParent(uiControl *c, uiContainer *parent)
 {
 	singleView *s = (singleView *) (c->Internal);
 	NSView *parentView;
-	uiParent *oldparent;
+	uiContainer *oldparent;
 
 	oldparent = s->parent;
 	s->parent = parent;
 	if (oldparent != NULL)
 		[s->immediate removeFromSuperview];
 	if (s->parent != NULL) {
-		parentView = (NSView *) uiControlHandle(uiControls->parent));
+		parentView = (NSView *) uiControlHandle(uiControl(s->parent));
 		[parentView addSubview:s->immediate];
 	}
 	if (oldparent != NULL)
 		uiContainerUpdate(oldparent);
 	if (s->parent != NULL)
-		uiParentUpdate(s->parent);
+		uiContainerUpdate(s->parent);
 }
 
 // also good for NSBox and NSProgressIndicator
diff --git a/new/darwin/tab.m b/new/darwin/tab.m
index 61e22960..614a8928 100644
--- a/new/darwin/tab.m
+++ b/new/darwin/tab.m
@@ -45,12 +45,12 @@ static void tabAppendPage(uiTab *tt, const char *name, uiControl *child)
 	NSTabViewItem *i;
 
 	page = newBin();
-	binSetMainConotrol(page, child);
+	binSetMainControl(page, child);
 	[t->pages addObject:[NSValue valueWithPointer:page]];
 
 	i = [[NSTabViewItem alloc] initWithIdentifier:nil];
 	[i setLabel:toNSString(name)];
-	[i setView:((NSView *) uiContainerHandle(content))];
+	[i setView:((NSView *) uiControlHandle(uiControl(page)))];
 	[t->tabview addTabViewItem:i];
 }