diff --git a/darwin/newcontrol.m b/darwin/newcontrol.m
index c16b2ab0..4fda0dcf 100644
--- a/darwin/newcontrol.m
+++ b/darwin/newcontrol.m
@@ -152,16 +152,15 @@ void uiDarwinMakeControl(uiControl *c, Class class, BOOL inScrollView, BOOL scro
 	// and keep a reference to s->immediate for when we remove the control from its parent
 	[s->immediate retain];
 
-	// TODO update all of these to say uiControl(c)
-	c->Internal = s;
-	c->Destroy = singleDestroy;
-	c->Handle = singleHandle;
-	c->SetParent = singleSetParent;
-	c->PreferredSize = singlePreferredSize;
-	c->Resize = singleResize;
-	c->Visible = singleVisible;
-	c->Show = singleShow;
-	c->Hide = singleHide;
-	c->Enable = singleEnable;
-	c->Disable = singleDisable;
+	uiControl(c)->Internal = s;
+	uiControl(c)->Destroy = singleDestroy;
+	uiControl(c)->Handle = singleHandle;
+	uiControl(c)->SetParent = singleSetParent;
+	uiControl(c)->PreferredSize = singlePreferredSize;
+	uiControl(c)->Resize = singleResize;
+	uiControl(c)->Visible = singleVisible;
+	uiControl(c)->Show = singleShow;
+	uiControl(c)->Hide = singleHide;
+	uiControl(c)->Enable = singleEnable;
+	uiControl(c)->Disable = singleDisable;
 }
diff --git a/unix/newcontrol.c b/unix/newcontrol.c
index 5c7a1de7..09c4911b 100644
--- a/unix/newcontrol.c
+++ b/unix/newcontrol.c
@@ -157,15 +157,15 @@ void uiUnixMakeControl(uiControl *c, GType type, gboolean inScrolledWindow, gboo
 	// finally, call gtk_widget_show_all() here to set the initial visibility of the widget
 	gtk_widget_show_all(s->immediate);
 
-	c->Internal = s;
-	c->Destroy = singleDestroy;
-	c->Handle = singleHandle;
-	c->SetParent = singleSetParent;
-	c->PreferredSize = singlePreferredSize;
-	c->Resize = singleResize;
-	c->Visible = singleVisible;
-	c->Show = singleShow;
-	c->Hide = singleHide;
-	c->Enable = singleEnable;
-	c->Disable = singleDisable;
+	uiControl(c)->Internal = s;
+	uiControl(c)->Destroy = singleDestroy;
+	uiControl(c)->Handle = singleHandle;
+	uiControl(c)->SetParent = singleSetParent;
+	uiControl(c)->PreferredSize = singlePreferredSize;
+	uiControl(c)->Resize = singleResize;
+	uiControl(c)->Visible = singleVisible;
+	uiControl(c)->Show = singleShow;
+	uiControl(c)->Hide = singleHide;
+	uiControl(c)->Enable = singleEnable;
+	uiControl(c)->Disable = singleDisable;
 }
diff --git a/windows/newcontrol.c b/windows/newcontrol.c
index 414decf0..9a0270ab 100644
--- a/windows/newcontrol.c
+++ b/windows/newcontrol.c
@@ -151,16 +151,16 @@ void uiWindowsMakeControl(uiControl *c, uiWindowsMakeControlParams *p)
 	if ((*fv_SetWindowSubclass)(s->hwnd, singleSubclassProc, 0, (DWORD_PTR) c) == FALSE)
 		logLastError("error subclassing Windows control in uiWindowsMakeControl()");
 
-	c->Internal = s;
-	c->Destroy = singleDestroy;
-	c->Handle = singleHandle;
-	c->SetParent = singleSetParent;
-	c->Resize = singleResize;
-	c->Visible = singleVisible;
-	c->Show = singleShow;
-	c->Hide = singleHide;
-	c->Enable = singleEnable;
-	c->Disable = singleDisable;
+	uiControl(c)->Internal = s;
+	uiControl(c)->Destroy = singleDestroy;
+	uiControl(c)->Handle = singleHandle;
+	uiControl(c)->SetParent = singleSetParent;
+	uiControl(c)->Resize = singleResize;
+	uiControl(c)->Visible = singleVisible;
+	uiControl(c)->Show = singleShow;
+	uiControl(c)->Hide = singleHide;
+	uiControl(c)->Enable = singleEnable;
+	uiControl(c)->Disable = singleDisable;
 }
 
 char *uiWindowsControlText(uiControl *c)