Mercurial > hg > toolkit / file diff

--- a/ui/gtk/tree.c	Sun Nov 12 12:03:50 2017 +0100
+++ b/ui/gtk/tree.c	Thu Nov 16 12:04:10 2017 +0100
@@ -64,7 +64,7 @@
     // TODO: implement for gtk2
 #endif
     
-    UiModel *model = ui_model_info(obj->ctx, UI_STRING, "", -1);
+    UiModel *model = ui_model(obj->ctx, UI_STRING, "", -1);
     model->getvalue = getvalue;
     UiList *list = var->value;
     UiListModel *listmodel = ui_list_model_new(var, model);
@@ -153,7 +153,7 @@
             gtk_tree_view_column_pack_start(column, iconrenderer, FALSE);
             
             
-            gtk_tree_view_column_add_attribute(column, iconrenderer, "icon-name", i);
+            gtk_tree_view_column_add_attribute(column, iconrenderer, "pixbuf", i);
             gtk_tree_view_column_add_attribute(column, textrenderer, "text", i+1);
             
             addi++;
@@ -183,7 +183,7 @@
     
     // add TreeView as observer to the UiList to update the TreeView if the
     // data changes
-    UiListView *tableview = ucx_mempool_malloc(obj->ctx->mempool, sizeof(UiListView));
+    UiListView *tableview = malloc(sizeof(UiListView));
     tableview->ctx = obj->ctx;
     tableview->widget = view;
     tableview->var = var;
@@ -373,7 +373,7 @@
 }
 
 UIWIDGET ui_combobox_var(UiObject *obj, UiVar *var, ui_getvaluefunc getvalue, ui_callback f, void *udata) {
-    UiModel *model = ui_model_info(obj->ctx, UI_STRING, "", -1);
+    UiModel *model = ui_model(obj->ctx, UI_STRING, "", -1);
     model->getvalue = getvalue;
     UiListModel *listmodel = ui_list_model_new(var, model);