diff -r cc2170ea05ad -r 46448d38885c ui/gtk/tree.h
--- a/ui/gtk/tree.h	Fri Nov 10 18:04:40 2017 +0100
+++ b/ui/gtk/tree.h	Sat Nov 11 08:34:06 2017 +0100
@@ -41,7 +41,7 @@
     UiContext   *ctx;
     GtkWidget   *widget;
     UiVar       *var;
-    UiModelInfo *modelinfo;
+    UiModel     *model;
 } UiListView;
 
 typedef struct UiTreeEventData {
@@ -53,8 +53,8 @@
     
 void* ui_strmodel_getvalue(void *elm, int column);
 
-UIWIDGET ui_listview_var(UiObject *obj, UiVar *var, ui_model_getvalue_f getvalue, ui_callback f, void *udata);
-UIWIDGET ui_table_var(UiObject *obj, UiVar *var, UiModelInfo *modelinfo);
+UIWIDGET ui_listview_var(UiObject *obj, UiVar *var, ui_getvaluefunc getvalue, ui_callback f, void *udata);
+UIWIDGET ui_table_var(UiObject *obj, UiVar *var, UiModel *model, UiListCallbacks cb);
 
 void ui_listview_update(UiList *list, int i);
 void ui_listview_destroy(GtkWidget *w, UiListView *v);
@@ -72,7 +72,7 @@
         UiTreeEventData *event);
 int ui_tree_path_list_index(GtkTreePath *path);
 
-UIWIDGET ui_combobox_var(UiObject *obj, UiVar *var, ui_model_getvalue_f getvalue, ui_callback f, void *udata);
+UIWIDGET ui_combobox_var(UiObject *obj, UiVar *var, ui_getvaluefunc getvalue, ui_callback f, void *udata);
 GtkWidget* ui_create_combobox(UiObject *obj, UiListModel *model, ui_callback f, void *udata);
 void ui_combobox_change_event(GtkComboBox *widget, UiEventData *e);
 void ui_combobox_modelupdate(UiList *list, int i);