From 18b103c988bb057d04c6b0bd930dad315a87d039 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Sun, 27 Nov 2016 17:44:52 -0500
Subject: [PATCH] Fully reintegrated the table code.

---
 common/CMakeLists.txt | 1 +
 darwin/CMakeLists.txt | 1 +
 test/CMakeLists.txt   | 2 ++
 test/main.c           | 4 ++--
 test/test.h           | 6 ++++++
 ui.h                  | 3 +++
 unix/CMakeLists.txt   | 1 +
 7 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 91d79493..7f704032 100644
--- a/common/CMakeLists.txt
+++ b/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)
diff --git a/darwin/CMakeLists.txt b/darwin/CMakeLists.txt
index dbef5d43..f0c936b5 100644
--- a/darwin/CMakeLists.txt
+++ b/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
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e4924bb3..b753a7d4 100644
--- a/test/CMakeLists.txt
+++ b/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}
 )
diff --git a/test/main.c b/test/main.c
index 18774dcd..f33f30ab 100644
--- a/test/main.c
+++ b/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);
diff --git a/test/test.h b/test/test.h
index 66b1baa7..224ef667 100644
--- a/test/test.h
+++ b/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);
diff --git a/ui.h b/ui.h
index 5a2069e8..5852bf6d 100644
--- a/ui.h
+++ b/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
diff --git a/unix/CMakeLists.txt b/unix/CMakeLists.txt
index 9300bcb7..e967f29a 100644
--- a/unix/CMakeLists.txt
+++ b/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