From b6c54aac4393af3e24a00cf38d3a8092f8936119 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Sun, 24 Apr 2016 16:14:19 -0400
Subject: [PATCH] Fixed build errors. Let's test!

---
 common/control.c     | 6 +++---
 common/controlsigs.h | 2 +-
 common/uipriv.h      | 3 +++
 darwin/area.m        | 2 +-
 darwin/control.m     | 2 +-
 darwin/menu.m        | 4 ++--
 ui.h                 | 1 -
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/common/control.c b/common/control.c
index bb25a585..5ba1b04a 100644
--- a/common/control.c
+++ b/common/control.c
@@ -35,7 +35,7 @@ uiControl *uiControlParent(uiControl *c)
 
 int isToplevel(uiControl *c)
 {
-	return uiIsA(c, uiWindowType(), 0) != NULL;
+	return c->TypeSignature == uiWindowSignature;
 }
 
 // returns self if self is a window
@@ -148,8 +148,8 @@ void controlUpdateState(uiControl *c)
 
 #define uiControlSignature 0x7569436F
 
-// TODO does this need to be public?
-uiControl *uiNewControl(size_t size, uint32_t OSsig, uint32_t typesig, const char *typename)
+// TODO should this be public?
+uiControl *newControl(size_t size, uint32_t OSsig, uint32_t typesig, const char *typename)
 {
 	uiControl *c;
 
diff --git a/common/controlsigs.h b/common/controlsigs.h
index b703cfc4..598e7342 100644
--- a/common/controlsigs.h
+++ b/common/controlsigs.h
@@ -11,7 +11,7 @@
 #define uiGroupSignature 0x47727062
 #define uiLabelSignature 0x4C61626C
 #define uiMultilineEntrySignature 0x4D6C6E45
-#define uiProgressbarSignature 0x50626172
+#define uiProgressBarSignature 0x50426172
 #define uiRadioButtonsSignature 0x5264696F
 #define uiSeparatorSignature 0x53657061
 #define uiSliderSignature 0x536C6964
diff --git a/common/uipriv.h b/common/uipriv.h
index b3b8b920..b7e00cbe 100644
--- a/common/uipriv.h
+++ b/common/uipriv.h
@@ -24,6 +24,9 @@ extern void controlUpdateState(uiControl *);
 extern void osCommitEnable(uiControl *);
 extern void osCommitDisable(uiControl *);
 
+// control.c
+extern uiControl *newControl(size_t size, uint32_t OSsig, uint32_t typesig, const char *typename);
+
 // ptrarray.c
 struct ptrArray {
 	void **ptrs;
diff --git a/darwin/area.m b/darwin/area.m
index c08e7cac..540157fc 100644
--- a/darwin/area.m
+++ b/darwin/area.m
@@ -375,7 +375,7 @@ uiArea *uiNewScrollingArea(uiAreaHandler *ah, intmax_t width, intmax_t height)
 {
 	uiArea *a;
 
-	a = (uiArea *) uiNewControl(uiAreaType());
+	a = (uiArea *) uiNewControl(uiArea);
 
 	a->ah = ah;
 	a->scrolling = YES;
diff --git a/darwin/control.m b/darwin/control.m
index 576be0c9..3d3bd082 100644
--- a/darwin/control.m
+++ b/darwin/control.m
@@ -67,5 +67,5 @@ void uiDarwinSetControlFont(NSControl *c, NSControlSize size)
 
 uiDarwinControl *uiDarwinNewControl(size_t n, uint32_t typesig, const char *typename)
 {
-	return uiDarwinControl(uiNewControl(n, uiDarwinControlSignature, typesig, typename));
+	return uiDarwinControl(newControl(n, uiDarwinControlSignature, typesig, typename));
 }
diff --git a/darwin/menu.m b/darwin/menu.m
index 17a46657..49bf2cdc 100644
--- a/darwin/menu.m
+++ b/darwin/menu.m
@@ -53,9 +53,9 @@ enum {
 
 	item = (uiMenuItem *) mapGet(self->items, sender);
 	if (item->type == typeCheckbox)
-		uiMenuItemSetChecked(uiMenuItem(item), !uiMenuItemChecked(uiMenuItem(item)));
+		uiMenuItemSetChecked(item, !uiMenuItemChecked(item));
 	// use the key window as the source of the menu event; it's the active window
-	(*(item->onClicked))(uiMenuItem(item), windowFromNSWindow([realNSApp() keyWindow]), item->onClickedData);
+	(*(item->onClicked))(item, windowFromNSWindow([realNSApp() keyWindow]), item->onClickedData);
 }
 
 - (IBAction)onQuitClicked:(id)sender
diff --git a/ui.h b/ui.h
index 99ee4d65..0b6906f9 100644
--- a/ui.h
+++ b/ui.h
@@ -63,7 +63,6 @@ _UI_EXTERN void uiControlShow(uiControl *);
 _UI_EXTERN void uiControlHide(uiControl *);
 _UI_EXTERN void uiControlEnable(uiControl *);
 _UI_EXTERN void uiControlDisable(uiControl *);
-_UI_EXTERN uiControl *uiNewControl(size_t size, uint32_t OSsig, uint32_t typesig, const char *typename);
 
 typedef struct uiWindow uiWindow;
 #define uiWindow(this) ((uiWindow *) (this))