diff -r 79dd183dd4cb -r 1b321a0c624f ui/gtk/tree.h
--- a/ui/gtk/tree.h	Fri Feb 16 19:37:51 2024 +0100
+++ b/ui/gtk/tree.h	Sun Feb 18 19:55:56 2024 +0100
@@ -31,7 +31,6 @@
 
 #include "../ui/tree.h"
 #include "toolkit.h"
-#include "model.h"
 
 #ifdef	__cplusplus
 extern "C" {
@@ -48,7 +47,8 @@
     UiObject    *obj;
     ui_callback activate;
     ui_callback selection;
-    void        *userdata;
+    void        *activatedata;
+    void        *selectiondata;
 } UiTreeEventData;
     
 void* ui_strmodel_getvalue(void *elm, int column);
@@ -76,7 +76,7 @@
 int ui_tree_path_list_index(GtkTreePath *path);
 
 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);
+GtkWidget* ui_create_combobox(UiObject *obj, GtkListStore *store, ui_callback f, void *udata);
 void ui_combobox_change_event(GtkComboBox *widget, UiEventData *e);
 void ui_combobox_modelupdate(UiList *list, int i);