From 31dee85b5e5419795d2befb1c1614309db1e91b8 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Sun, 24 Apr 2016 21:51:08 -0400
Subject: [PATCH] More work with changing things for OS X. Still not fully sure
 about things...

---
 common/control.c | 10 +++++-----
 ui.h             |  5 +++--
 ui_darwin.h      | 33 +++++++++++++++++++++++++++------
 3 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/common/control.c b/common/control.c
index 7528cac1..2c515693 100644
--- a/common/control.c
+++ b/common/control.c
@@ -22,11 +22,6 @@ void uiControlSetParent(uiControl *c, uiControl *parent)
 	(*(c->SetParent))(c, parent);
 }
 
-void uiControlUpdateChildren(uiControl *c)
-{
-	(*(c->UpdateChildren))(c);
-}
-
 int uiControlToplevel(uiControl *c)
 {
 	return (*(c->Toplevel))(c);
@@ -62,6 +57,11 @@ void uiControlDisable(uiControl *c)
 	(*(c->Disable))(c);
 }
 
+void uiControlSyncEnableState(uiControl *c, int state)
+{
+	(*(c->SyncEnableState))(c, state);
+}
+
 #define uiControlSignature 0x7569436F
 
 uiControl *uiAllocControl(size_t size, uint32_t OSsig, uint32_t typesig, const char *typenamestr)
diff --git a/ui.h b/ui.h
index 7c36bd07..b68ac538 100644
--- a/ui.h
+++ b/ui.h
@@ -51,7 +51,6 @@ struct uiControl {
 	uintptr_t (*Handle)(uiControl *);
 	uiControl *(*Parent)(uiControl *);
 	void (*SetParent)(uiControl *, uiControl *);
-	void (*UpdateChildren)(uiControl *);
 	int (*Toplevel)(uiControl *);
 	int (*Visible)(uiControl *);
 	void (*Show)(uiControl *);
@@ -59,13 +58,14 @@ struct uiControl {
 	int (*Enabled)(uiControl *);
 	void (*Enable)(uiControl *);
 	void (*Disable)(uiControl *);
+	void (*SyncEnableState)(uiControl *, int);
 };
+// TOOD add argument names to all arguments
 #define uiControl(this) ((uiControl *) (this))
 _UI_EXTERN void uiControlDestroy(uiControl *);
 _UI_EXTERN uintptr_t uiControlHandle(uiControl *);
 _UI_EXTERN uiControl *uiControlParent(uiControl *);
 _UI_EXTERN void uiControlSetParent(uiControl *, uiControl *);
-_UI_EXTERN void uiControlUpdateChildren(uiControl *);
 _UI_EXTERN int uiControlToplevel(uiControl *);
 _UI_EXTERN int uiControlVisible(uiControl *);
 _UI_EXTERN void uiControlShow(uiControl *);
@@ -73,6 +73,7 @@ _UI_EXTERN void uiControlHide(uiControl *);
 _UI_EXTERN int uiControlEnabled(uiControl *);
 _UI_EXTERN void uiControlEnable(uiControl *);
 _UI_EXTERN void uiControlDisable(uiControl *);
+_UI_EXTERN void uiControlSyncEnableState(uiControl *, int);
 
 _UI_EXTERN uiControl *uiAllocControl(size_t n, uint32_t OSsig, uint32_t typesig, const char *typenamestr);
 _UI_EXTERN void uiFreeControl(uiControl *);
diff --git a/ui_darwin.h b/ui_darwin.h
index 0a144e1e..358a4339 100644
--- a/ui_darwin.h
+++ b/ui_darwin.h
@@ -17,10 +17,12 @@ struct uiDarwinControl {
 	uiControl *parent;
 	BOOL enabled;
 	BOOL visible;
+	void (*AddSubview)(uiDarwinControl *, NSView *);
 	void (*Relayout)(uiDarwinControl *);
 };
 #define uiDarwinControl(this) ((uiDarwinControl *) (this))
 // TODO document
+_UI_EXTERN void uiDarwinControlAddSubview(uiDarwinControl *, NSView *);
 _UI_EXTERN void uiDarwinControlTriggerRelayout(uiDarwinControl *);
 
 #define uiDarwinControlDefaultDestroy(type, handlefield) \
@@ -46,11 +48,25 @@ _UI_EXTERN void uiDarwinControlTriggerRelayout(uiDarwinControl *);
 		uiDarwinControl(c)->parent = parent; \
 		if (uiDarwinControl(c)->parent == NULL) \
 			[type(c)->handlefield removeFromSuperview]; \
-		else { \
-			/* TODO */ \
-			if ([type(c)->handlefield respondsToSelector:@selector(setEnabled:)]) \
-				[type(c)->handlefield setEnabled:uiControlEnabledToUser(c)]; \
-		} \
+		else \
+			uiDarwinControlAddSubview(uiDarwinControl(uiDarwinControl(c)->parent), type(c)->handlefield); \
+	}
+#define uiDarwinControlDefaultToplevel(type) \
+	static int type ## Toplevel(uiControl *c) \
+	{ \
+		return 0; \
+	}
+#define uiDarwinControlDefaultVisible(type) \
+	static int type ## Visible(uiDarwinControl *c) \
+	{ \
+		/* TODO */ \
+		return uiDarwinControl(c)->visible; \
+	}
+// TODO others here
+#define uiDarwinControlDefaultAddSubview(type) \
+	static void type ## AddSubview(uiDarwinControl *c, NSView *subview) \
+	{ \
+		/* TODO do nothing or log? one of the two */ \
 	}
 #define uiDarwinControlDefaultRelayout(type) \
 	static void type ## Relayout(uiDarwinControl *c) \
@@ -62,11 +78,16 @@ _UI_EXTERN void uiDarwinControlTriggerRelayout(uiDarwinControl *);
 	uiDarwinControlDefaultDestroy(type, handlefield) \
 	uiDarwinControlDefaultHandle(type, handlefield) \
 	uiDarwinControlDefaultParent(type) \
+	uiDarwinControlDefaultSetParent(type, handlefield) \
+	uiDarwinControlDefaultToplevel(type) \
 	xxxxx \
+	uiDarwinControlDefaultAddSubview(type) \
 	uiDarwinControlDefaultRelayout(type)
 
 // TODO document
-#define uiDarwinNewControl(type) type(uiDarwinNewControl(sizeof (type), type ## Signature, #type))
+#define uiDarwinNewControl(var, type) \
+	var = type(uiDarwinNewControl(sizeof (type), type ## Signature, #type)) \
+	TODO
 _UI_EXTERN uiDarwinControl *uiDarwinAllocControl(size_t n, uint32_t typesig, const char *typenamestr);
 
 #define uiDarwinFinishNewControl(variable, type) \