diff -r 62921b370c60 -r ee49d1852a5f ui/motif/list.h
--- a/ui/motif/list.h	Sun Jan 21 12:13:09 2018 +0100
+++ b/ui/motif/list.h	Sun Jul 01 19:03:26 2018 +0200
@@ -38,23 +38,23 @@
 #endif
 
 typedef struct UiListView {
-    Widget              widget;
-    UiListPtr           *list;
-    ui_model_getvalue_f getvalue;
+    Widget          widget;
+    UiVar           *list;
+    ui_getvaluefunc getvalue;
 } UiListView;
 
 typedef struct UiListViewEventData {
     UiEventData event;
-    UiListPtr *list;
+    UiVar *var;
 } UiListViewEventData;
 
 void* ui_strmodel_getvalue(void *elm, int column);
 
-XmStringTable ui_create_stringlist(UiList *list, ui_model_getvalue_f getvalue, int *count);
+XmStringTable ui_create_stringlist(UiList *list, ui_getvaluefunc getvalue, int *count);
 void ui_listview_update(UiEvent *event, UiListView *view);
 void ui_list_selection_callback (Widget widget, UiListViewEventData *event, XtPointer data);
 
-UIWIDGET ui_combobox_var(UiObject *obj, UiListPtr *list, 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);
 
 #ifdef	__cplusplus
 }