Removed all the type function declarations from all the controls. More TODOs.

_wiptable/unix_table.c

@@ -13,8 +13,7 @@ struct uiTable {
 };
 
 uiUnixDefineControl(
-	uiTable,								// type name
-	uiTableType							// type function
+	uiTable								// type name
 )
 
 void uiTableSetModel(uiTable *t, uiTableModel *m)

darwin/area.m

@@ -27,7 +27,6 @@ struct uiArea {
 
 uiDarwinDefineControl(
 	uiArea,								// type name
-	uiAreaType,							// type function
 	view									// handle
 )
 

darwin/box.m

@@ -27,7 +27,6 @@ static void onDestroy(uiBox *);
 
 uiDarwinDefineControlWithOnDestroy(
 	uiBox,								// type name
-	uiBoxType,							// type function
 	view,								// handle
 	onDestroy(this);						// on destroy
 )

darwin/button.m

@@ -59,7 +59,6 @@ static buttonDelegateClass *buttonDelegate = nil;
 
 uiDarwinDefineControlWithOnDestroy(
 	uiButton,								// type name
-	uiButtonType,							// type function
 	button,								// handle
 	[buttonDelegate unregisterButton:this];		// on destroy
 )

darwin/checkbox.m

@@ -61,7 +61,6 @@ static checkboxDelegateClass *checkboxDelegate = nil;
 
 uiDarwinDefineControlWithOnDestroy(
 	uiCheckbox,								// type name
-	uiCheckboxType,							// type function
 	button,									// handle
 	[checkboxDelegate unregisterCheckbox:this];		// on destroy
 )

darwin/combobox.m

@@ -102,7 +102,6 @@ static void onDestroy(uiCombobox *);
 
 uiDarwinDefineControlWithOnDestroy(
 	uiCombobox,							// type name
-	uiComboboxType,						// type function
 	handle,								// handle
 	onDestroy(this);						// on destroy
 )

darwin/datetimepicker.m

@@ -8,7 +8,6 @@ struct uiDateTimePicker {
 
 uiDarwinDefineControl(
 	uiDateTimePicker,						// type name
-	uiDateTimePickerType,					// type function
 	dp									// handle
 )
 

darwin/entry.m

@@ -77,7 +77,6 @@ static entryDelegateClass *entryDelegate = nil;
 
 uiDarwinDefineControlWithOnDestroy(
 	uiEntry,								// type name
-	uiEntryType,							// type function
 	textfield,								// handle
 	[entryDelegate unregisterEntry:this];			// on destroy
 )

darwin/fontbutton.m

@@ -2,6 +2,7 @@
 #import "uipriv_darwin.h"
 
 // TODO drag and drop fonts? what other interactions does NSColorWell allow that we can do for fonts?
+// TODO make position of templates consistent
 
 @interface fontButton : NSButton {
 	uiFontButton *libui_b;
@@ -27,7 +28,6 @@ struct uiFontButton {
 
 uiDarwinDefineControl(
 	uiFontButton,							// type name
-	uiFontButtonType,						// type function
 	button								// handle
 )
 

darwin/group.m

@@ -12,7 +12,6 @@ static void onDestroy(uiGroup *);
 
 uiDarwinDefineControlWithOnDestroy(
 	uiGroup,								// type name
-	uiGroupType,							// type function
 	box,									// handle
 	onDestroy(this);						// on destroy
 )

darwin/label.m

@@ -8,7 +8,6 @@ struct uiLabel {
 
 uiDarwinDefineControl(
 	uiLabel,								// type name
-	uiLabelType,							// type function
 	textfield								// handle
 )
 

darwin/multilineentry.m

@@ -13,7 +13,6 @@ struct uiMultilineEntry {
 
 uiDarwinDefineControl(
 	uiMultilineEntry,						// type name
-	uiMultilineEntryType,					// type function
 	sv									// handle
 )
 

darwin/progressbar.m

@@ -8,7 +8,6 @@ struct uiProgressBar {
 
 uiDarwinDefineControl(
 	uiProgressBar,							// type name
-	uiProgressBarType,						// type function
 	pi									// handle
 )
 

darwin/radiobuttons.m

@@ -10,7 +10,6 @@ struct uiRadioButtons {
 
 uiDarwinDefineControl(
 	uiRadioButtons,						// type name
-	uiRadioButtonsType,						// type function
 	matrix								// handle
 )
 

darwin/separator.m

@@ -13,7 +13,6 @@ struct uiSeparator {
 
 uiDarwinDefineControl(
 	uiSeparator,							// type name
-	uiSeparatorType,						// type function
 	box									// handle
 )
 

darwin/slider.m

@@ -79,7 +79,6 @@ static sliderDelegateClass *sliderDelegate = nil;
 
 uiDarwinDefineControlWithOnDestroy(
 	uiSlider,								// type name
-	uiSliderType,							// type function
 	slider,								// handle
 	[sliderDelegate unregisterSlider:this];		// on destroy
 )

darwin/spinbox.m

@@ -131,7 +131,6 @@ struct uiSpinbox {
 
 uiDarwinDefineControl(
 	uiSpinbox,							// type name
-	uiSpinboxType,						// type function
 	spinbox								// handle
 )
 

darwin/tab.m

@@ -16,7 +16,6 @@ static void onDestroy(uiTab *);
 
 uiDarwinDefineControlWithOnDestroy(
 	uiTab,								// type name
-	uiTabType,							// type function
 	tabview,								// handle
 	onDestroy(this);						// on destroy
 )

darwin/window.m

@@ -75,7 +75,6 @@ static void onDestroy(uiWindow *);
 
 uiDarwinDefineControlWithOnDestroy(
 	uiWindow,							// type name
-	uiWindowType,							// type function
 	window,								// handle
 	onDestroy(this);						// on destroy
 )

unix/area.c

@@ -483,8 +483,7 @@ static void areaWidget_class_init(areaWidgetClass *class)
 // control implementation
 
 uiUnixDefineControl(
-	uiArea,								// type name
-	uiAreaType							// type function
+	uiArea								// type name
 )
 
 void uiAreaSetSize(uiArea *a, intmax_t width, intmax_t height)

unix/box.c

@@ -18,7 +18,6 @@ static void onDestroy(uiBox *b);
 
 uiUnixDefineControlWithOnDestroy(
 	uiBox,								// type name
-	uiBoxType,							// type function
 	onDestroy(this);						// on destroy
 )
 

unix/button.c

@@ -10,8 +10,7 @@ struct uiButton {
 };
 
 uiUnixDefineControl(
-	uiButton,								// type name
-	uiButtonType							// type function
+	uiButton								// type name
 )
 
 static void onClicked(GtkButton *button, gpointer data)

unix/checkbox.c

@@ -13,8 +13,7 @@ struct uiCheckbox {
 };
 
 uiUnixDefineControl(
-	uiCheckbox,							// type name
-	uiCheckboxType						// type function
+	uiCheckbox							// type name
 )
 
 static void onToggled(GtkToggleButton *b, gpointer data)

unix/combobox.c

@@ -12,8 +12,7 @@ struct uiCombobox {
 };
 
 uiUnixDefineControl(
-	uiCombobox,							// type name
-	uiComboboxType						// type function
+	uiCombobox							// type name
 )
 
 // TODO this is triggered when editing an editable combobox's text

unix/datetimepicker.c

@@ -7,8 +7,7 @@ struct uiDateTimePicker {
 };
 
 uiUnixDefineControl(
-	uiDateTimePicker,						// type name
-	uiDateTimePickerType					// type function
+	uiDateTimePicker						// type name
 )
 
 // TODO

unix/entry.c

@@ -12,8 +12,7 @@ struct uiEntry {
 };
 
 uiUnixDefineControl(
-	uiEntry,								// type name
-	uiEntryType							// type function
+	uiEntry								// type name
 )
 
 static void onChanged(GtkEditable *editable, gpointer data)

unix/fontbutton.c

@@ -12,8 +12,7 @@ struct uiFontButton {
 };
 
 uiUnixDefineControl(
-	uiFontButton,							// type name
-	uiFontButtonType						// type function
+	uiFontButton							// type name
 )
 
 // TODO NOTE no need to inhibit the signal; font-set is documented as only being sent when the user changes the font

unix/group.c

@@ -18,7 +18,6 @@ static void onDestroy(uiGroup *);
 
 uiUnixDefineControlWithOnDestroy(
 	uiGroup,								// type name
-	uiGroupType,							// type function
 	onDestroy(this);						// on destroy
 )
 

unix/label.c

@@ -9,8 +9,7 @@ struct uiLabel {
 };
 
 uiUnixDefineControl(
-	uiLabel,								// type name
-	uiLabelType							// type function
+	uiLabel								// type name
 )
 
 char *uiLabelText(uiLabel *l)

unix/multilineentry.c

@@ -17,8 +17,7 @@ struct uiMultilineEntry {
 };
 
 uiUnixDefineControl(
-	uiMultilineEntry,						// type name
-	uiMultilineEntryType						// type function
+	uiMultilineEntry						// type name
 )
 
 static void onChanged(GtkTextBuffer *textbuf, gpointer data)

unix/progressbar.c

@@ -8,8 +8,7 @@ struct uiProgressBar {
 };
 
 uiUnixDefineControl(
-	uiProgressBar,							// type name
-	uiProgressBarType						// type function
+	uiProgressBar							// type name
 )
 
 void uiProgressBarSetValue(uiProgressBar *p, int value)

unix/radiobuttons.c

@@ -15,7 +15,6 @@ static void onDestroy(uiRadioButtons *);
 
 uiUnixDefineControlWithOnDestroy(
 	uiRadioButtons,						// type name
-	uiRadioButtonsType,						// type function
 	onDestroy(this);						// on destroy
 )
 

unix/separator.c

@@ -8,8 +8,7 @@ struct uiSeparator {
 };
 
 uiUnixDefineControl(
-	uiSeparator,							// type name
-	uiSeparatorType						// type function
+	uiSeparator							// type name
 )
 
 uiSeparator *uiNewHorizontalSeparator(void)

unix/slider.c

@@ -12,8 +12,7 @@ struct uiSlider {
 };
 
 uiUnixDefineControl(
-	uiSlider,								// type name
-	uiSliderType							// type function
+	uiSlider								// type name
 )
 
 static void onChanged(GtkRange *range, gpointer data)

unix/spinbox.c

@@ -12,8 +12,7 @@ struct uiSpinbox {
 };
 
 uiUnixDefineControl(
-	uiSpinbox,							// type name
-	uiSpinboxType							// type function
+	uiSpinbox							// type name
 )
 
 static void onChanged(GtkSpinButton *sb, gpointer data)

unix/tab.c

@@ -15,7 +15,6 @@ static void onDestroy(uiTab *);
 
 uiUnixDefineControlWithOnDestroy(
 	uiTab,								// type name
-	uiTabType,							// type function
 	onDestroy(this);						// on destroy
 )
 

unix/window.c

@@ -25,7 +25,6 @@ static void onDestroy(uiWindow *);
 
 uiUnixDefineControlWithOnDestroy(
 	uiWindow,							// type name
-	uiWindowType,							// type function
 	onDestroy(this);						// on destroy
 )
 

windows/area.cpp

@@ -3,8 +3,7 @@
 #include "area.hpp"
 
 uiWindowsDefineControl(
-	uiArea,								// type name
-	uiAreaType							// type function
+	uiArea								// type name
 )
 
 static LRESULT CALLBACK areaWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)

windows/box.cpp

@@ -23,7 +23,6 @@ static void onDestroy(uiBox *);
 
 uiWindowsDefineControlWithOnDestroy(
 	uiBox,								// type name
-	uiBoxType,							// type function
 	onDestroy(me);						// on destroy
 )
 

windows/button.cpp

@@ -10,7 +10,6 @@ struct uiButton {
 
 uiWindowsDefineControlWithOnDestroy(
 	uiButton,								// type name
-	uiButtonType,							// type function
 	uiWindowsUnregisterWM_COMMANDHandler(me->hwnd);	// on destroy
 )
 

windows/checkbox.cpp

@@ -10,7 +10,6 @@ struct uiCheckbox {
 
 uiWindowsDefineControlWithOnDestroy(
 	uiCheckbox,							// type name
-	uiCheckboxType,						// type function
 	uiWindowsUnregisterWM_COMMANDHandler(me->hwnd);	// on destroy
 )
 

windows/combobox.cpp

@@ -15,7 +15,6 @@ struct uiCombobox {
 
 uiWindowsDefineControlWithOnDestroy(
 	uiCombobox,							// type name
-	uiComboboxType,						// type function
 	uiWindowsUnregisterWM_COMMANDHandler(me->hwnd);	// on destroy
 )
 

windows/datetimepicker.cpp

@@ -8,7 +8,6 @@ struct uiDateTimePicker {
 
 uiWindowsDefineControlWithOnDestroy(
 	uiDateTimePicker,						// type name
-	uiDateTimePickerType,					// type function
 	uiWindowsUnregisterReceiveWM_WININICHANGE(me->hwnd);		// on destroy
 )
 

windows/entry.cpp

@@ -11,7 +11,6 @@ struct uiEntry {
 
 uiWindowsDefineControlWithOnDestroy(
 	uiEntry,								// type name
-	uiEntryType,							// type function
 	uiWindowsUnregisterWM_COMMANDHandler(me->hwnd);	// on destroy
 )
 

windows/fontbutton.cpp

@@ -14,7 +14,6 @@ static void onDestroy(uiFontButton *);
 
 uiWindowsDefineControlWithOnDestroy(
 	uiFontButton,							// type name
-	uiFontButtonType,						// type function
 	onDestroy(me);						// on destroy
 )
 

windows/group.cpp

@@ -12,7 +12,6 @@ static void onDestroy(uiGroup *);
 
 uiWindowsDefineControlWithOnDestroy(
 	uiGroup,								// type name
-	uiGroupType,							// type function
 	onDestroy(me);						// on destroy
 )
 

windows/label.cpp

@@ -7,8 +7,7 @@ struct uiLabel {
 };
 
 uiWindowsDefineControl(
-	uiLabel,								// type name
-	uiLabelType							// type function
+	uiLabel								// type name
 )
 
 // via http://msdn.microsoft.com/en-us/library/windows/desktop/dn742486.aspx#sizingandspacing

windows/multilineentry.cpp

@@ -14,7 +14,6 @@ struct uiMultilineEntry {
 
 uiWindowsDefineControlWithOnDestroy(
 	uiMultilineEntry,						// type name
-	uiMultilineEntryType,					// type function
 	uiWindowsUnregisterWM_COMMANDHandler(me->hwnd);	// on destroy
 )
 

windows/progressbar.cpp

@@ -7,8 +7,7 @@ struct uiProgressBar {
 };
 
 uiWindowsDefineControl(
-	uiProgressBar,							// type name
-	uiProgressBarType						// type function
+	uiProgressBar							// type name
 )
 
 // via http://msdn.microsoft.com/en-us/library/windows/desktop/dn742486.aspx#sizingandspacing

windows/radiobuttons.cpp

@@ -18,7 +18,6 @@ static void onDestroy(uiRadioButtons *);
 
 uiWindowsDefineControlWithOnDestroy(
 	uiRadioButtons,						// type name
-	uiRadioButtonsType,						// type function
 	onDestroy(me);						// on destroy
 )
 

windows/separator.cpp

@@ -11,8 +11,7 @@ struct uiSeparator {
 };
 
 uiWindowsDefineControl(
-	uiSeparator,							// type name
-	uiSeparatorType						// type function
+	uiSeparator							// type name
 )
 
 // via https://msdn.microsoft.com/en-us/library/windows/desktop/bb226818%28v=vs.85%29.aspx

windows/slider.cpp

@@ -10,7 +10,6 @@ struct uiSlider {
 
 uiWindowsDefineControlWithOnDestroy(
 	uiSlider,								// type name
-	uiSliderType,							// type function
 	uiWindowsUnregisterWM_HSCROLLHandler(me->hwnd);	// on destroy
 )
 

windows/spinbox.cpp

@@ -15,7 +15,6 @@ static void onDestroy(uiSpinbox *);
 
 uiWindowsDefineControlWithOnDestroy(
 	uiSpinbox,							// type name
-	uiSpinboxType,						// type function
 	onDestroy(me);						// on destroy
 )
 

windows/tab.cpp

@@ -17,7 +17,6 @@ static void onDestroy(uiTab *);
 
 uiWindowsDefineControlWithOnDestroy(
 	uiTab,								// type name
-	uiTabType,							// type function
 	onDestroy(me);						// on destroy
 )
 

windows/window.cpp

@@ -19,7 +19,6 @@ static void onDestroy(uiWindow *);
 
 uiWindowsDefineControlWithOnDestroy(
 	uiWindow,							// type name
-	uiWindowType,							// type function
 	onDestroy(me);						// on destroy
 )