From 4e11b6efe11c59936e233adb84d17aa9da11a55a Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Mon, 25 Apr 2016 20:34:12 -0400
Subject: [PATCH] Fixed build errors. It works! (Except for radiobuttons now
 needing a destroy; that'll come later.) Next up... Windows. Yay...

---
 unix/area.c         | 4 ----
 unix/button.c       | 2 --
 unix/checkbox.c     | 2 --
 unix/child.c        | 2 +-
 unix/control.c      | 2 +-
 unix/label.c        | 2 --
 unix/radiobuttons.c | 1 -
 unix/tab.c          | 2 +-
 8 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/unix/area.c b/unix/area.c
index 4f28aa3d..8d8caf7b 100644
--- a/unix/area.c
+++ b/unix/area.c
@@ -521,8 +521,6 @@ uiArea *uiNewArea(uiAreaHandler *ah)
 
 	a->widget = a->areaWidget;
 
-	uiUnixFinishNewControl(a, uiArea);
-
 	return a;
 }
 
@@ -553,7 +551,5 @@ uiArea *uiNewScrollingArea(uiAreaHandler *ah, intmax_t width, intmax_t height)
 	// and make the area visible; only the scrolled window's visibility is controlled by libui
 	gtk_widget_show(a->areaWidget);
 
-	uiUnixFinishNewControl(a, uiArea);
-
 	return a;
 }
diff --git a/unix/button.c b/unix/button.c
index b68aafc7..00a87f49 100644
--- a/unix/button.c
+++ b/unix/button.c
@@ -31,8 +31,6 @@ char *uiButtonText(uiButton *b)
 void uiButtonSetText(uiButton *b, const char *text)
 {
 	gtk_button_set_label(b->button, text);
-	// changing the text might necessitate a change in the button's size
-	uiControlQueueResize(uiControl(b));
 }
 
 void uiButtonOnClicked(uiButton *b, void (*f)(uiButton *, void *), void *data)
diff --git a/unix/checkbox.c b/unix/checkbox.c
index 57898856..47f85145 100644
--- a/unix/checkbox.c
+++ b/unix/checkbox.c
@@ -34,8 +34,6 @@ char *uiCheckboxText(uiCheckbox *c)
 void uiCheckboxSetText(uiCheckbox *c, const char *text)
 {
 	gtk_button_set_label(GTK_BUTTON(c->button), text);
-	// changing the text might necessitate a change in the checkbox's size
-	uiControlQueueResize(uiControl(c));
 }
 
 void uiCheckboxOnToggled(uiCheckbox *c, void (*f)(uiCheckbox *, void *), void *data)
diff --git a/unix/child.c b/unix/child.c
index 4b00d9cc..b43b4faf 100644
--- a/unix/child.c
+++ b/unix/child.c
@@ -73,7 +73,7 @@ void childRemove(struct child *c)
 {
 	uiControlSetParent(c->c, NULL);
 	// TODO safe with boxes?
-	uiUnixControlSetContainer(uiUnixControl(c->c), parentContainer, TRUE);
+	uiUnixControlSetContainer(uiUnixControl(c->c), c->parent, TRUE);
 
 	gtk_widget_set_hexpand(c->widget, c->oldhexpand);
 	gtk_widget_set_halign(c->widget, c->oldhalign);
diff --git a/unix/control.c b/unix/control.c
index 652b42c2..f6fdcea2 100644
--- a/unix/control.c
+++ b/unix/control.c
@@ -8,7 +8,7 @@ void uiUnixControlSetContainer(uiUnixControl *c, GtkContainer *container, gboole
 
 #define uiUnixControlSignature 0x556E6978
 
-uiUnixControl *uiUnixNewControl(size_t n, uint32_t typesig, const char *typenamestr)
+uiUnixControl *uiUnixAllocControl(size_t n, uint32_t typesig, const char *typenamestr)
 {
 	return uiUnixControl(uiAllocControl(n, uiUnixControlSignature, typesig, typenamestr));
 }
diff --git a/unix/label.c b/unix/label.c
index 93d1ee43..b39fc7cc 100644
--- a/unix/label.c
+++ b/unix/label.c
@@ -18,8 +18,6 @@ char *uiLabelText(uiLabel *l)
 void uiLabelSetText(uiLabel *l, const char *text)
 {
 	gtk_label_set_text(l->label, text);
-	// changing the text might necessitate a change in the label's size
-	uiControlQueueResize(uiControl(l));
 }
 
 uiLabel *uiNewLabel(const char *text)
diff --git a/unix/radiobuttons.c b/unix/radiobuttons.c
index 7967d9a7..9a6cb42c 100644
--- a/unix/radiobuttons.c
+++ b/unix/radiobuttons.c
@@ -30,7 +30,6 @@ void uiRadioButtonsAppend(uiRadioButtons *r, const char *text)
 	gtk_container_add(r->container, rb);
 	g_ptr_array_add(r->buttons, rb);
 	gtk_widget_show(rb);
-	uiControlQueueResize(uiControl(r));
 }
 
 uiRadioButtons *uiNewRadioButtons(void)
diff --git a/unix/tab.c b/unix/tab.c
index c8e4be83..1ab7f6ad 100644
--- a/unix/tab.c
+++ b/unix/tab.c
@@ -26,7 +26,7 @@ static void uiTabDestroy(uiControl *c)
 	g_array_free(t->pages, TRUE);
 	// and free ourselves
 	g_object_unref(t->widget);
-	uiControlFree(uiControl(t));
+	uiFreeControl(uiControl(t));
 }
 
 void uiTabAppend(uiTab *t, const char *name, uiControl *child)