diff -r bf810176ddb8 -r e5f4d8af567e ui/gtk/toolbar.h
--- a/ui/gtk/toolbar.h	Mon Feb 12 21:13:23 2024 +0100
+++ b/ui/gtk/toolbar.h	Sun Jun 09 15:43:08 2024 +0200
@@ -30,10 +30,10 @@
 #define	TOOLBAR_H
 
 #include "../ui/toolbar.h"
+#include "../common/toolbar.h"
 #include <cx/map.h>
 #include <cx/list.h>
 
-#include "model.h"
 #include "tree.h"
 
 #ifdef	__cplusplus
@@ -102,7 +102,6 @@
     void                *userdata;
 };
 
-void ui_toolbar_init();
 
 void ui_toolitem_vstgr(
         char *name,
@@ -114,18 +113,31 @@
 
 GtkWidget* ui_create_toolbar(UiObject *obj);
 
-void add_toolitem_widget(GtkToolbar *tb, UiToolItem *item, UiObject *obj);
-void add_toolitem_st_widget(GtkToolbar *tb, UiStToolItem *item, UiObject *obj);
-void add_toolitem_toggle_widget(GtkToolbar *tb, UiToggleToolItem *item, UiObject *obj);
+void ui_toolbar_add_items(UiObject *obj, GtkWidget *toolbar, CxMap *items, CxList *defaults);
+
+void add_toolitem_widget(GtkToolbar *tb, UiToolbarItem *item, UiObject *obj);
+void add_toolitem_toggle_widget(GtkToolbar *tb, UiToolbarToggleItem *item, UiObject *obj);
+void add_toolitem_menu_widget(GtkToolbar *tb, UiToolbarMenuItem *item, UiObject *obj);
+
+void ui_tool_button_toggled(GtkToggleToolButton *widget, UiVarEventData *event);
+int64_t ui_tool_toggle_button_get(UiInteger *integer);
+void ui_tool_toggle_button_set(UiInteger *integer, int64_t value);
 
+GtkWidget* ui_create_headerbar(UiObject *obj);
+
+void ui_headerbar_add_items(UiObject *obj, GtkWidget *headerbar, CxMap *items, CxList *defaults);
+
+void add_headerbar_item_widget(GtkHeaderBar *hb, UiToolbarItem *item, UiObject *obj);
+void add_headerbar_item_toggle_widget(GtkHeaderBar *hb, UiToolbarToggleItem *item, UiObject *obj);
+void add_headerbar_item_menu_widget(GtkHeaderBar *hb, UiToolbarMenuItem *item, UiObject *obj);
+
+
+/*
 void add_toolbar_combobox(GtkToolbar *tb, UiToolbarComboBox *cb, UiObject *obj);
 void add_toolbar_combobox_nv(GtkToolbar *tb, UiToolbarComboBoxNV *cb, UiObject *obj);
 void ui_combobox_change_event(GtkComboBox *widget, UiEventData *e);
 void ui_combobox_update(UiEvent *event, void *combobox);
-
-void ui_tool_button_toggled(GtkToggleToolButton *widget, UiEventData *event);
-int64_t ui_tool_toggle_button_get(UiInteger *integer);
-void ui_tool_toggle_button_set(UiInteger *integer, int64_t value);
+*/
 
 #ifdef	__cplusplus
 }