Fully reintegrated the table code.

common/CMakeLists.txt

@@ -6,6 +6,7 @@ list(APPEND _LIBUI_SOURCES
 	common/debug.c
 	common/matrix.c
 	common/shouldquit.c
+	common/table.c
 	common/userbugs.c
 )
 set(_LIBUI_SOURCES ${_LIBUI_SOURCES} PARENT_SCOPE)

darwin/CMakeLists.txt

@@ -35,6 +35,7 @@ list(APPEND _LIBUI_SOURCES
 	darwin/spinbox.m
 	darwin/stddialogs.m
 	darwin/tab.m
+	darwin/table.m
 	darwin/text.m
 	darwin/util.m
 	darwin/window.m

test/CMakeLists.txt

@@ -6,6 +6,7 @@ endif()
 
 _add_exec(tester
 	drawtests.c
+	images.c
 	main.c
 	menus.c
 	page1.c
@@ -26,6 +27,7 @@ _add_exec(tester
 	page13.c
 	page14.c
 	page15.c
+	page16.c
 	spaced.c
 	${_TEST_RESOURCES_RC}
 )

test/main.c

@@ -159,8 +159,8 @@ int main(int argc, char *argv[])
 	innerTab = newTab();
 	uiTabAppend(outerTab, "Pages 16-?", uiControl(innerTab));
 
-//	page16 = makePage16();
-//	uiTabAppend(innerTab, "Page 16", uiControl(page16));
+	page16 = makePage16();
+	uiTabAppend(innerTab, "Page 16", uiControl(page16));
 
 	if (startspaced)
 		setSpaced(1);

test/test.h

@@ -89,3 +89,9 @@ extern uiTab *makePage14(void);
 
 // page15.c
 extern uiBox *makePage15(uiWindow *);
+
+// page16.c
+extern uiBox *makePage16(void);
+
+// images.c
+extern void appendImageNamed(uiImage *img, const char *name);

ui.h

@@ -684,6 +684,9 @@ _UI_EXTERN int uiGridPadded(uiGrid *g);
 _UI_EXTERN void uiGridSetPadded(uiGrid *g, int padded);
 _UI_EXTERN uiGrid *uiNewGrid(void);
 
+// TODO merge
+#include "uitable.h"
+
 #ifdef __cplusplus
 }
 #endif

unix/CMakeLists.txt

@@ -40,6 +40,7 @@ list(APPEND _LIBUI_SOURCES
 	unix/spinbox.c
 	unix/stddialogs.c
 	unix/tab.c
+	unix/table.c
 	unix/text.c
 	unix/util.c
 	unix/window.c