diff -r cc2170ea05ad -r 46448d38885c ui/ui/toolbar.h
--- a/ui/ui/toolbar.h	Fri Nov 10 18:04:40 2017 +0100
+++ b/ui/ui/toolbar.h	Sat Nov 11 08:34:06 2017 +0100
@@ -46,9 +46,9 @@
 void ui_toolitem_toggle_stgr(char *name, char *stockid, ui_callback f, void *udata, ...);
 void ui_toolitem_toggle_imggr(char *name, char *label, char *img, ui_callback f, void *udata, ...);
 
-void ui_toolbar_combobox(char *name, UiList *list, ui_model_getvalue_f getvalue, ui_callback f, void *udata);
+void ui_toolbar_combobox(char *name, UiList *list, ui_getvaluefunc getvalue, ui_callback f, void *udata);
 void ui_toolbar_combobox_str(char *name, UiList *list, ui_callback f, void *udata);
-void ui_toolbar_combobox_nv(char *name, char *listname, ui_model_getvalue_f getvalue, ui_callback f, void *udata);
+void ui_toolbar_combobox_nv(char *name, char *listname, ui_getvaluefunc getvalue, ui_callback f, void *udata);
 
 void ui_toolbar_add_default(char *name);