Store strings inside table cells for simplicity

2 files changed, 9 insertions, 15 deletions

diff --git a/src/widget/table.c b/src/widget/table.c
index 7a0ea03..dfb2e69 100644
--- a/src/widget/table.c
+++ b/src/widget/table.c
@@ -33,7 +33,7 @@ uiTable* uiMakeTable(int rows, int cols, const char** header) {
 
   if (header) {
     for (int col = 0; col < cols; ++col) {
-      table->header[col].child = (uiWidget*)uiMakeLabel(header[col]);
+      table->header[col].text = string_new(header[col]);
     }
   }
 
@@ -47,7 +47,7 @@ void uiTableClear(uiTable* table) {
   if (table->cells) {
     for (int row = 0; row < table->rows; ++row) {
       for (int col = 0; col < table->cols; ++col) {
-        DestroyWidget(&table->cells[row][col].child);
+        string_del(&table->cells[row][col].text);
       }
       free(table->cells[row]);
     }
@@ -81,23 +81,17 @@ void uiTableAddRow(uiTable* table, const char** row) {
   uiCell* lastRow = *pLastRow;
 
   for (int col = 0; col < table->cols; ++col) {
-    lastRow[col].child = (uiWidget*)uiMakeLabel(row[col]);
+    lastRow[col].text = string_new(row[col]);
   }
 }
 
-void uiTableSet(uiTable* table, int row, int col, uiPtr child) {
+void uiTableSet(uiTable* table, int row, int col, const char* text) {
   assert(table);
-  assert(child.widget);
-
-  GetCellMut(table, row, col)->child = child.widget;
-}
-
-const uiWidget* uiTableGet(const uiTable* table, int row, int col) {
-  assert(table);
-  return GetCell(table, row, col)->child;
+  assert(text);
+  GetCellMut(table, row, col)->text = string_new(text);
 }
 
-uiWidget* uiTableGetMut(uiTable* table, int row, int col) {
+const char* uiTableGet(const uiTable* table, int row, int col) {
   assert(table);
-  return GetCellMut(table, row, col)->child;
+  return string_data(GetCell(table, row, col)->text);
 }
diff --git a/src/widget/widget.h b/src/widget/widget.h
index 79a72f3..38acb9c 100644
--- a/src/widget/widget.h
+++ b/src/widget/widget.h
@@ -35,7 +35,7 @@ typedef struct uiLabel {
 
 /// Table cell.
 typedef struct uiCell {
-  uiWidget* child;
+  string text;
 } uiCell;
 
 /// Table.