Mercurial > hg > toolkit / file diff

--- a/ui/ui/toolbar.h	Wed Oct 11 10:54:24 2023 +0200
+++ b/ui/ui/toolbar.h	Wed Oct 11 19:11:38 2023 +0200
@@ -55,13 +55,22 @@
 	void* onchangedata;
 } UiToolbarToggleItemArgs;
 
+typedef struct UiToolbarMenuArgs {
+	const char* label;
+	const char* stockid;
+	const char* icon;
+} UiToolbarMenuArgs;
+
 
 #define ui_toolbar_item(name, ...) ui_toolbar_item_create(name, (UiToolbarItemArgs){ __VA_ARGS__ } )
-#define ui_toolbar_toggleitem(name, ...) ui_toolbar_item_create(name, (UiToolbarItemArgs){ __VA_ARGS__ } )
+#define ui_toolbar_toggleitem(name, ...) ui_toolbar_toggleitem_create(name, (UiToolbarToggleItemArgs){ __VA_ARGS__ } )
+
+#define ui_toolbar_menu(obj, ...) for(ui_toolbar_menu_create(obj, (UiToolbarMenuArgs){ __VA_ARGS__ });ui_menu_is_open();ui_menu_close())
+
 
 UIEXPORT void ui_toolbar_item_create(const char* name, UiToolbarItemArgs args);
 UIEXPORT void ui_toolbar_toggleitem_create(const char* name, UiToolbarToggleItemArgs args);
-
+UIEXPORT void ui_toolbar_menu_create(const char* name, UiToolbarMenuArgs args);
 
 
 void ui_toolitem_deprecated(char *name, char *label, ui_callback f, void *udata);
@@ -72,16 +81,18 @@
 void ui_toolitem_img(char *name, char *label, char *img, ui_callback f, void *udata);
 
 void ui_toolitem_toggle(const char *name, const char *label, const char *img, UiInteger *i);
-void ui_toolitem_toggle_st(const char *name, const char *stockid, UiInteger *i);
-void ui_toolitem_toggle_nv(const char *name, const char *label, const char *img, const char *intvar);
-void ui_toolitem_toggle_stnv(const char *name, const char *stockid, const char *intvar);
+void ui_toolitem_toggle_st_deprecated(const char *name, const char *stockid, UiInteger *i);
+void ui_toolitem_toggle_nv_deprecated(const char *name, const char *label, const char *img, const char *intvar);
+void ui_toolitem_toggle_stnv_deprecated(const char *name, const char *stockid, const char *intvar);
 
-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_getvaluefunc getvalue, ui_callback f, void *udata);
+void ui_toolbar_combobox_deprecated(char *name, UiList *list, ui_getvaluefunc getvalue, ui_callback f, void *udata);
+void ui_toolbar_combobox_str_deprecated(char *name, UiList *list, ui_callback f, void *udata);
+void ui_toolbar_combobox_nv_deprecated(char *name, char *listname, ui_getvaluefunc getvalue, ui_callback f, void *udata);
 
 UIEXPORT void ui_toolbar_add_default(const char *name);
 
+
+
 #ifdef	__cplusplus
 }
 #endif