Mercurial > hg > toolkit / changeset

--- a/ui/common/args.c	Sat Oct 11 13:31:49 2025 +0200
+++ b/ui/common/args.c	Sun Oct 12 07:46:38 2025 +0200
@@ -195,10 +195,6 @@
     args->label = strdup(label);
 }
 
-void ui_menuitem_args_set_stockid(UiMenuItemArgs *args, const char *stockid) {
-    args->stockid = strdup(stockid);
-}
-
 void ui_menuitem_args_set_icon(UiMenuItemArgs *args, const char *icon) {
     args->icon = strdup(icon);
 }
@@ -213,7 +209,6 @@
 
 void ui_menuitem_args_free(UiMenuItemArgs *args) {
     free((void*)args->label);
-    free((void*)args->stockid);
     free((void*)args->icon);
     free(args);
 }
@@ -231,10 +226,6 @@
     args->label = strdup(label);
 }
 
-void ui_menutoggleitem_args_set_stockid(UiMenuToggleItemArgs *args, const char *stockid) {
-    args->stockid = strdup(stockid);
-}
-
 void ui_menutoggleitem_args_set_icon(UiMenuToggleItemArgs *args, const char *icon) {
     args->icon = strdup(icon);
 }
@@ -253,7 +244,6 @@
 
 void ui_menutoggleitem_args_free(UiMenuToggleItemArgs *args) {
     free((void*)args->label);
-    free((void*)args->stockid);
     free((void*)args->icon);
     free((void*)args->varname);
     free(args);
@@ -304,10 +294,6 @@
     args->label = strdup(label);
 }
 
-void ui_toolbar_item_args_set_stockid(UiToolbarItemArgs *args, const char *stockid) {
-    args->stockid = strdup(stockid);
-}
-
 void ui_toolbar_item_args_set_icon(UiToolbarItemArgs *args, const char *icon) {
     args->icon = strdup(icon);
 }
@@ -327,7 +313,6 @@
 }
 void ui_toolbar_item_args_free(UiToolbarItemArgs *args) {
     free((void*)args->label);
-    free((void*)args->stockid);
     free((void*)args->icon);
     free((void*)args->groups);
     free(args);
@@ -341,47 +326,34 @@
     return args;
 }
 
-
 void ui_toolbar_toggleitem_args_set_label(UiToolbarToggleItemArgs *args, const char *label) {
     args->label = strdup(label);
 }
 
-
-void ui_toolbar_toggleitem_args_set_stockid(UiToolbarToggleItemArgs *args, const char *stockid) {
-    args->stockid = strdup(stockid);
-}
-
-
 void ui_toolbar_toggleitem_args_set_icon(UiToolbarToggleItemArgs *args, const char *icon) {
     args->icon = strdup(icon);
 }
 
-
 void ui_toolbar_toggleitem_args_set_varname(UiToolbarToggleItemArgs *args, const char *varname) {
     args->varname = strdup(varname);
 }
 
-
 void ui_toolbar_toggleitem_args_set_onchange(UiToolbarToggleItemArgs *args, ui_callback callback) {
     args->onchange = callback;
 }
 
-
 void ui_toolbar_toggleitem_args_set_onchangedata(UiToolbarToggleItemArgs *args, void *onchangedata) {
     args->onchangedata = onchangedata;
 }
 
-
 void ui_toolbar_toggleitem_args_set_groups(UiToolbarToggleItemArgs *args,int *states, int numstates) {
     args->groups = calloc(numstates+1, sizeof(int));
     memcpy((void*)args->groups, states, numstates * sizeof(int));
     ((int*)args->groups)[numstates] = -1;
 }
 
-
 void ui_toolbar_toggleitem_args_free(UiToolbarToggleItemArgs *args) {
     free((void*)args->label);
-    free((void*)args->stockid);
     free((void*)args->icon);
     free((void*)args->varname);
     free((void*)args->groups);
@@ -397,25 +369,16 @@
     return args;
 }
 
-
 void ui_toolbar_menu_args_set_label(UiToolbarMenuArgs *args, const char *label) {
     args->label = strdup(label);
 }
 
-
-void ui_toolbar_menu_args_set_stockid(UiToolbarMenuArgs *args, const char *stockid) {
-    args->stockid = strdup(stockid);
-}
-
-
 void ui_toolbar_menu_args_set_icon(UiToolbarMenuArgs *args, const char *icon) {
     args->icon = strdup(icon);
 }
 
-
 void ui_toolbar_menu_args_free(UiToolbarMenuArgs *args) {
     free((void*)args->label);
-    free((void*)args->stockid);
     free((void*)args->icon);
     free(args);
 }
@@ -651,7 +614,6 @@
     args->label = strdup(label);
 }
 
-
 void ui_frame_args_free(UiFrameArgs *args) {
     free((void*)args->name);
     free((void*)args->style_class);
@@ -668,17 +630,14 @@
     return args;
 }
 
-
 void ui_sidebar_args_set_name(UiSidebarArgs *args, const char *name) {
     args->name = strdup(name);
 }
 
-
 void ui_sidebar_args_set_style_class(UiSidebarArgs *args, const char *classname) {
     args->style_class = strdup(classname);
 }
 
-
 void ui_sidebar_args_set_margin(UiSidebarArgs *args, int value) {
     args->margin = value;
 }
@@ -703,7 +662,6 @@
     args->spacing = value;
 }
 
-
 void ui_sidebar_args_free(UiSidebarArgs *args) {
     free((void*)args->name);
     free((void*)args->style_class);
@@ -719,57 +677,46 @@
     return args;
 }
 
-
 void ui_splitpane_args_set_fill(UiSplitPaneArgs *args, UiBool fill) {
     args->fill = fill;
 }
 
-
 void ui_splitpane_args_set_hexpand(UiSplitPaneArgs *args, UiBool value) {
     args->hexpand = value;
 }
 
-
 void ui_splitpane_args_set_vexpand(UiSplitPaneArgs *args, UiBool value) {
     args->vexpand = value;
 }
 
-
 void ui_splitpane_args_set_hfill(UiSplitPaneArgs *args, UiBool value) {
     args->hfill = value;
 }
 
-
 void ui_splitpane_args_set_vfill(UiSplitPaneArgs *args, UiBool value) {
     args->vfill = value;
 }
 
-
 void ui_splitpane_args_set_override_defaults(UiSplitPaneArgs *args, UiBool value) {
     args->override_defaults = value;
 }
 
-
 void ui_splitpane_args_set_colspan(UiSplitPaneArgs *args, int colspan) {
     args->colspan = colspan;
 }
 
-
 void ui_splitpane_args_set_rowspan(UiSplitPaneArgs *args, int rowspan) {
     args->rowspan = rowspan;
 }
 
-
 void ui_splitpane_args_set_name(UiSplitPaneArgs *args, const char *name) {
     args->name = strdup(name);
 }
 
-
 void ui_splitpane_args_set_style_class(UiSplitPaneArgs *args, const char *classname) {
     args->style_class = strdup(classname);
 }
 
-
 void ui_splitpane_args_set_margin(UiSplitPaneArgs *args, int value) {
     args->margin = value;
 }
@@ -827,7 +774,6 @@
     args->max_panes = max;
 }
 
-
 void ui_splitpane_args_free(UiSplitPaneArgs *args) {
     free((void*)args->name);
     free((void*)args->style_class);
@@ -853,47 +799,38 @@
     args->hexpand = value;
 }
 
-
 void ui_tabview_args_set_vexpand(UiTabViewArgs *args, UiBool value) {
     args->vexpand = value;
 }
 
-
 void ui_tabview_args_set_hfill(UiTabViewArgs *args, UiBool value) {
     args->hfill = value;
 }
 
-
 void ui_tabview_args_set_vfill(UiTabViewArgs *args, UiBool value) {
     args->vfill = value;
 }
 
-
 void ui_tabview_args_set_override_defaults(UiTabViewArgs *args, UiBool value) {
     args->override_defaults = value;
 }
 
-
 void ui_tabview_args_set_colspan(UiTabViewArgs *args, int colspan) {
     args->colspan = colspan;
 }
 
-
 void ui_tabview_args_set_rowspan(UiTabViewArgs *args, int rowspan) {
     args->rowspan = rowspan;
 }
 
-
 void ui_tabview_args_set_name(UiTabViewArgs *args, const char *name) {
     args->name = strdup(name);
 }
 
-
 void ui_tabview_args_set_style_class(UiTabViewArgs *args, const char *classname) {
     args->style_class = strdup(classname);
 }
 
-
 void ui_tabview_args_set_margin(UiTabViewArgs *args, int value) {
     args->margin = value;
 }
@@ -1056,32 +993,26 @@
     return args;
 }
 
-
 void ui_label_args_set_fill(UiLabelArgs *args, UiBool fill) {
     args->fill = fill;
 }
 
-
 void ui_label_args_set_hexpand(UiLabelArgs *args, UiBool value) {
     args->hexpand = value;
 }
 
-
 void ui_label_args_set_vexpand(UiLabelArgs *args, UiBool value) {
     args->vexpand = value;
 }
 
-
 void ui_label_args_set_hfill(UiLabelArgs *args, UiBool value) {
     args->hfill = value;
 }
 
-
 void ui_label_args_set_vfill(UiLabelArgs *args, UiBool value) {
     args->vfill = value;
 }
 
-
 void ui_label_args_set_override_defaults(UiLabelArgs *args, UiBool value) {
     args->override_defaults = value;
 }
@@ -1106,7 +1037,6 @@
     args->margin_bottom = value;
 }
 
-
 void ui_label_args_set_colspan(UiLabelArgs *args, int colspan) {
     args->colspan = colspan;
 }
@@ -1116,12 +1046,10 @@
     args->rowspan = rowspan;
 }
 
-
 void ui_label_args_set_name(UiLabelArgs *args, const char *name) {
     args->name = strdup(name);
 }
 
-
 void ui_label_args_set_style_class(UiLabelArgs *args, const char *classname) {
     args->style_class = strdup(classname);
 }
@@ -1130,7 +1058,6 @@
     args->label = strdup(label);
 }
 
-
 void ui_label_args_set_align(UiLabelArgs *args, UiAlignment align) {
     args->align = align;
 }
@@ -1409,12 +1336,10 @@
     args->rowspan = rowspan;
 }
 
-
 void ui_button_args_set_name(UiButtonArgs *args, const char *name) {
     args->name = strdup(name);
 }
 
-
 void ui_button_args_set_style_class(UiButtonArgs *args, const char *classname) {
     args->style_class = strdup(classname);
 }
@@ -1423,12 +1348,6 @@
     args->label = strdup(label);
 }
 
-
-void ui_button_args_set_stockid(UiButtonArgs *args, const char *stockid){
-    args->stockid = strdup(stockid);
-}
-
-
 void ui_button_args_set_icon(UiButtonArgs *args, const char *icon){
     args->icon = strdup(icon);
 }
@@ -1442,7 +1361,6 @@
     args->onclick = callback;
 }
 
-
 void ui_button_args_set_onclickdata(UiButtonArgs *args, void *onclickdata){
     args->onclickdata = onclickdata;
 }
@@ -1457,7 +1375,6 @@
     free((void*)args->name);
     free((void*)args->style_class);
     free((void*)args->label);
-    free((void*)args->stockid);
     free((void*)args->icon);
     free((void*)args->groups);
     free(args);
@@ -1473,32 +1390,26 @@
     return args;
 }
 
-
 void ui_toggle_args_set_fill(UiToggleArgs *args, UiBool fill) {
     args->fill = fill;
 }
 
-
 void ui_toggle_args_set_hexpand(UiToggleArgs *args, UiBool value) {
     args->hexpand = value;
 }
 
-
 void ui_toggle_args_set_vexpand(UiToggleArgs *args, UiBool value) {
     args->vexpand = value;
 }
 
-
 void ui_toggle_args_set_hfill(UiToggleArgs *args, UiBool value) {
     args->hfill = value;
 }
 
-
 void ui_toggle_args_set_vfill(UiToggleArgs *args, UiBool value) {
     args->vfill = value;
 }
 
-
 void ui_toggle_args_set_override_defaults(UiToggleArgs *args, UiBool value) {
     args->override_defaults = value;
 }
@@ -1527,7 +1438,6 @@
     args->colspan = colspan;
 }
 
-
 void ui_toggle_args_set_rowspan(UiToggleArgs *args, int rowspan) {
     args->rowspan = rowspan;
 }
@@ -1537,7 +1447,6 @@
     args->name = strdup(name);
 }
 
-
 void ui_toggle_args_set_style_class(UiToggleArgs *args, const char *classname) {
     args->style_class = strdup(classname);
 }
@@ -1546,12 +1455,6 @@
     args->label = strdup(label);
 }
 
-
-void ui_toggle_args_set_stockid(UiToggleArgs *args, const char *stockid){
-    args->stockid = strdup(stockid);
-}
-
-
 void ui_toggle_args_set_icon(UiToggleArgs *args, const char *icon){
     args->icon = strdup(icon);
 }
@@ -1592,7 +1495,6 @@
     free((void*)args->name);
     free((void*)args->style_class);
     free((void*)args->label);
-    free((void*)args->stockid);
     free((void*)args->icon);
     free((void*)args->varname);
     free((void*)args->groups);

--- a/ui/common/args.h	Sat Oct 11 13:31:49 2025 +0200
+++ b/ui/common/args.h	Sun Oct 12 07:46:38 2025 +0200
@@ -80,7 +80,6 @@
     
 UIEXPORT UiMenuItemArgs* ui_menuitem_args_new(void);
 UIEXPORT void ui_menuitem_args_set_label(UiMenuItemArgs *args, const char *label);
-UIEXPORT void ui_menuitem_args_set_stockid(UiMenuItemArgs *args, const char *stockid);
 UIEXPORT void ui_menuitem_args_set_icon(UiMenuItemArgs *args, const char *icon);
 UIEXPORT void ui_menuitem_args_set_onclick(UiMenuItemArgs *args, ui_callback callback);
 UIEXPORT void ui_menuitem_args_set_onclickdata(UiMenuItemArgs *args, void *onclickdata);
@@ -88,7 +87,6 @@
 
 UIEXPORT UiMenuToggleItemArgs* ui_menutoggleitem_args_new(void);
 UIEXPORT void ui_menutoggleitem_args_set_label(UiMenuToggleItemArgs *args, const char *label);
-UIEXPORT void ui_menutoggleitem_args_set_stockid(UiMenuToggleItemArgs *args, const char *stockid);
 UIEXPORT void ui_menutoggleitem_args_set_icon(UiMenuToggleItemArgs *args, const char *icon);
 UIEXPORT void ui_menutoggleitem_args_set_varname(UiMenuToggleItemArgs *args, const char *varname);
 UIEXPORT void ui_menutoggleitem_args_set_onchange(UiMenuToggleItemArgs *args, ui_callback callback);
@@ -105,7 +103,6 @@
 
 UIEXPORT UiToolbarItemArgs* ui_toolbar_item_args_new(void);
 UIEXPORT void ui_toolbar_item_args_set_label(UiToolbarItemArgs *args, const char *label);
-UIEXPORT void ui_toolbar_item_args_set_stockid(UiToolbarItemArgs *args, const char *stockid);
 UIEXPORT void ui_toolbar_item_args_set_icon(UiToolbarItemArgs *args, const char *icon);
 UIEXPORT void ui_toolbar_item_args_set_onclick(UiToolbarItemArgs *args, ui_callback callback);
 UIEXPORT void ui_toolbar_item_args_set_onclickdata(UiToolbarItemArgs *args, void *onclickdata);
@@ -114,7 +111,6 @@
 
 UIEXPORT UiToolbarToggleItemArgs* ui_toolbar_toggleitem_args_new(void);
 UIEXPORT void ui_toolbar_toggleitem_args_set_label(UiToolbarToggleItemArgs *args, const char *label);
-UIEXPORT void ui_toolbar_toggleitem_args_set_stockid(UiToolbarToggleItemArgs *args, const char *stockid);
 UIEXPORT void ui_toolbar_toggleitem_args_set_icon(UiToolbarToggleItemArgs *args, const char *icon);
 UIEXPORT void ui_toolbar_toggleitem_args_set_varname(UiToolbarToggleItemArgs *args, const char *varname);
 UIEXPORT void ui_toolbar_toggleitem_args_set_onchange(UiToolbarToggleItemArgs *args, ui_callback callback);
@@ -124,7 +120,6 @@
 
 UIEXPORT UiToolbarMenuArgs* ui_toolbar_menu_args_new(void);
 UIEXPORT void ui_toolbar_menu_args_set_label(UiToolbarMenuArgs *args, const char *label);
-UIEXPORT void ui_toolbar_menu_args_set_stockid(UiToolbarMenuArgs *args, const char *stockid);
 UIEXPORT void ui_toolbar_menu_args_set_icon(UiToolbarMenuArgs *args, const char *icon);
 UIEXPORT void ui_toolbar_menu_args_free(UiToolbarMenuArgs *args);
     
@@ -343,7 +338,6 @@
 UIEXPORT void ui_button_args_set_name(UiButtonArgs *args, const char *name);
 UIEXPORT void ui_button_args_set_style_class(UiButtonArgs *args, const char *classname);
 UIEXPORT void ui_button_args_set_label(UiButtonArgs *args, const char *label);
-UIEXPORT void ui_button_args_set_stockid(UiButtonArgs *args, const char *stockid);
 UIEXPORT void ui_button_args_set_icon(UiButtonArgs *args, const char *icon);
 UIEXPORT void ui_button_args_set_labeltype(UiButtonArgs *args, int labeltype);
 UIEXPORT void ui_button_args_set_onclick(UiButtonArgs *args, ui_callback callback);
@@ -368,7 +362,6 @@
 UIEXPORT void ui_toggle_args_set_name(UiToggleArgs *args, const char *name);
 UIEXPORT void ui_toggle_args_set_style_class(UiToggleArgs *args, const char *classname);
 UIEXPORT void ui_toggle_args_set_label(UiToggleArgs *args, const char *label);
-UIEXPORT void ui_toggle_args_set_stockid(UiToggleArgs *args, const char *stockid);
 UIEXPORT void ui_toggle_args_set_icon(UiToggleArgs *args, const char *icon);
 UIEXPORT void ui_toggle_args_set_labeltype(UiToggleArgs *args, int labeltype);
 UIEXPORT void ui_toggle_args_set_onchange(UiToggleArgs *args, ui_callback callback);

--- a/ui/common/menu.c	Sat Oct 11 13:31:49 2025 +0200
+++ b/ui/common/menu.c	Sun Oct 12 07:46:38 2025 +0200
@@ -133,7 +133,6 @@
     item->item.type = UI_MENU_ITEM;
 
     item->label = nl_strdup(args->label);
-    item->stockid = nl_strdup(args->stockid);
     item->icon = nl_strdup(args->icon);
     item->userdata = args->onclickdata;
     item->callback = args->onclick;
@@ -160,7 +159,6 @@
     item->item.type = UI_MENU_CHECK_ITEM;
 
     item->label = nl_strdup(args->label);
-    item->stockid = nl_strdup(args->stockid);
     item->icon = nl_strdup(args->icon);
     item->varname = nl_strdup(args->varname);
     item->userdata = args->onchangedata;
@@ -178,7 +176,6 @@
     item->item.type = UI_MENU_RADIO_ITEM;
 
     item->label = nl_strdup(args->label);
-    item->stockid = nl_strdup(args->stockid);
     item->icon = nl_strdup(args->icon);
     item->varname = nl_strdup(args->varname);
     item->userdata = args->onchangedata;
@@ -284,7 +281,6 @@
             UiMenuItem *i = (UiMenuItem*)item;
             free(i->groups);
             free(i->label);
-            free(i->stockid);
             free(i->icon);
             break;
         }
@@ -292,7 +288,6 @@
             UiMenuCheckItem *i = (UiMenuCheckItem*)item;
             free(i->groups);
             free(i->label);
-            free(i->stockid);
             free(i->icon);
             free(i->varname);
             break;
@@ -301,9 +296,8 @@
             UiMenuRadioItem *i = (UiMenuRadioItem*)item;
             free(i->groups);
             free(i->label);
-            free(i->stockid);
             free(i->icon);
-            //free(i->varname);
+            free(i->varname);
             break;
         }
         case UI_MENU_ITEM_LIST: {

--- a/ui/common/menu.h	Sat Oct 11 13:31:49 2025 +0200
+++ b/ui/common/menu.h	Sun Oct 12 07:46:38 2025 +0200
@@ -77,7 +77,6 @@
     UiMenuItemI    item;
     ui_callback    callback;
     char           *label;
-    char           *stockid;
     char           *icon;
     void           *userdata;
     int            *groups;
@@ -87,7 +86,6 @@
 struct UiMenuCheckItem {
     UiMenuItemI    item;
     char           *label;
-    char           *stockid;
     char           *icon;
     char           *varname;
     ui_callback    callback;
@@ -99,7 +97,6 @@
 struct UiMenuRadioItem {
     UiMenuItemI    item;
     char           *label;
-    char           *stockid;
     char           *icon;
     char           *varname;
     ui_callback    callback;

--- a/ui/common/toolbar.c	Sat Oct 11 13:31:49 2025 +0200
+++ b/ui/common/toolbar.c	Sun Oct 12 07:46:38 2025 +0200
@@ -53,7 +53,6 @@
 static UiToolbarItemArgs itemargs_copy(UiToolbarItemArgs *args, size_t *ngroups) {
     UiToolbarItemArgs newargs;
     newargs.label = nl_strdup(args->label);
-    newargs.stockid = nl_strdup(args->stockid);
     newargs.icon = nl_strdup(args->icon);
     newargs.tooltip = nl_strdup(args->tooltip);
     newargs.onclick = args->onclick;
@@ -73,7 +72,6 @@
 static UiToolbarToggleItemArgs toggleitemargs_copy(UiToolbarToggleItemArgs *args, size_t *ngroups) {
     UiToolbarToggleItemArgs newargs;
     newargs.label = nl_strdup(args->label);
-    newargs.stockid = nl_strdup(args->stockid);
     newargs.icon = nl_strdup(args->icon);
     newargs.tooltip = nl_strdup(args->tooltip);
     newargs.varname = nl_strdup(args->varname);
@@ -93,7 +91,6 @@
 static UiToolbarMenuArgs menuargs_copy(UiToolbarMenuArgs *args) {
     UiToolbarMenuArgs newargs;
     newargs.label = nl_strdup(args->label);
-    newargs.stockid = nl_strdup(args->stockid);
     newargs.icon = nl_strdup(args->icon);
     newargs.tooltip = nl_strdup(args->tooltip);
     return newargs;

--- a/ui/gtk/menu.c	Sat Oct 11 13:31:49 2025 +0200
+++ b/ui/gtk/menu.c	Sun Oct 12 07:46:38 2025 +0200
@@ -136,44 +136,6 @@
     }
 }
 
-/*
-void add_menuitem_st_widget(
-        GtkWidget *parent,
-        int index,
-        UiMenuItemI *item,
-        UiObject *obj)
-{
-    UiStMenuItem *i = (UiStMenuItem*)item;
-    
-    GtkWidget *widget = gtk_image_menu_item_new_from_stock(i->stockid, obj->ctx->accel_group);
-    
-    if(i->callback != NULL) {
-        UiEventData *event = malloc(sizeof(UiEventData));
-        event->obj = obj;
-        event->userdata = i->userdata;
-        event->callback = i->callback;
-        event->value = 0;
-
-        g_signal_connect(
-                widget,
-                "activate",
-                G_CALLBACK(ui_menu_event_wrapper),
-                event);
-        g_signal_connect(
-                widget,
-                "destroy",
-                G_CALLBACK(ui_destroy_userdata),
-                event);
-    }
-    
-    gtk_menu_shell_append(GTK_MENU_SHELL(parent), widget);
-    
-    if(i->groups) {
-        uic_add_group_widget(obj->ctx, widget, (ui_enablefunc)ui_set_enabled, i->groups);
-    }
-}
-*/
-
 void add_menuseparator_widget(
         GtkWidget *parent,
         int index,
@@ -215,25 +177,6 @@
     // TODO
 }
 
-/*
-void add_checkitemnv_widget(GtkWidget *p, int index, UiMenuItemI *item, UiObject *obj) {
-    UiCheckItemNV *ci = (UiCheckItemNV*)item;
-    GtkWidget *widget = gtk_check_menu_item_new_with_mnemonic(ci->label);
-    gtk_menu_shell_append(GTK_MENU_SHELL(p), widget);
-    
-    UiVar *var = uic_create_var(obj->ctx, ci->varname, UI_VAR_INTEGER);
-    if(var) {
-        UiInteger *value = var->value;
-        value->obj = widget;
-        value->get = ui_checkitem_get;
-        value->set = ui_checkitem_set;
-        value = 0;
-    } else {
-        // TODO: error
-    }
-}
-*/
-
 static void menuitem_list_remove_binding(void *obj) {
     UiActiveMenuItemList *ls = obj;
     UiList *list = ls->var->value;

--- a/ui/gtk/toolbar.c	Sat Oct 11 13:31:49 2025 +0200
+++ b/ui/gtk/toolbar.c	Sun Oct 12 07:46:38 2025 +0200
@@ -128,16 +128,7 @@
 
 void add_toolitem_widget(GtkToolbar *tb, UiToolbarItem *item, UiObject *obj) {
     GtkToolItem *button;
-    if(item->args.stockid) {
-#ifdef UI_GTK2
-        button = gtk_tool_button_new_from_stock(item->args.stockid);
-#else
-        // TODO: gtk3 stock
-        button = gtk_tool_button_new(NULL, item->args.label);
-#endif
-    } else {
-        button = gtk_tool_button_new(NULL, item->args.label);
-    }
+    button = gtk_tool_button_new(NULL, item->args.label);
     if(item->args.tooltip) {
         gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(button), item->args.tooltip);
     }
@@ -179,21 +170,13 @@
 
 void add_toolitem_toggle_widget(GtkToolbar *tb, UiToolbarToggleItem *item, UiObject *obj) {
     GtkToolItem *button;
-    if(item->args.stockid) {
-#ifdef UI_GTK2
-        button = gtk_toggle_tool_button_new_from_stock(item->args.stockid);
-#else
-        button = gtk_toggle_tool_button_new_from_stock(item->args.stockid); // TODO: gtk3 stock
-#endif
-    } else {
-        button = gtk_toggle_tool_button_new();
-        gtk_tool_item_set_homogeneous(button, FALSE);
-        if(item->args.label) {
-            gtk_tool_button_set_label(GTK_TOOL_BUTTON(button), item->args.label);
-        }
-        if(item->args.icon) {
-            set_toolbutton_icon(button, item->args.icon);
-        }    
+    button = gtk_toggle_tool_button_new();
+    gtk_tool_item_set_homogeneous(button, FALSE);
+    if(item->args.label) {
+        gtk_tool_button_set_label(GTK_TOOL_BUTTON(button), item->args.label);
+    }
+    if(item->args.icon) {
+        set_toolbutton_icon(button, item->args.icon);
     }
     if(item->args.tooltip) {
         gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(button), item->args.tooltip);
@@ -288,16 +271,7 @@
 
 void add_toolitem_menu_widget(GtkToolbar *tb, UiToolbarMenuItem *item, UiObject *obj) {
     GtkToolItem *button;
-    if(item->args.stockid) {
-#ifdef UI_GTK2
-        button = gtk_tool_button_new_from_stock(item->args.stockid);
-#else
-        // TODO: gtk3 stock
-        button = gtk_tool_button_new(NULL, item->args.label);
-#endif
-    } else {
-        button = gtk_tool_button_new(NULL, item->args.label);
-    }
+    button = gtk_tool_button_new(NULL, item->args.label);
     
     gtk_tool_item_set_homogeneous(button, FALSE);
     if(item->args.icon) {

--- a/ui/ui/button.h	Sat Oct 11 13:31:49 2025 +0200
+++ b/ui/ui/button.h	Sun Oct 12 07:46:38 2025 +0200
@@ -59,7 +59,6 @@
     const char *style_class;
 
     const char* label;
-    const char* stockid;
     const char* icon;
     UiLabelType labeltype;
     ui_callback onclick;
@@ -86,7 +85,6 @@
     const char *style_class;
     
     const char* label;
-    const char* stockid;
     const char* icon;
     UiLabelType labeltype;
     UiInteger* value;

--- a/ui/ui/menu.h	Sat Oct 11 13:31:49 2025 +0200
+++ b/ui/ui/menu.h	Sun Oct 12 07:46:38 2025 +0200
@@ -38,7 +38,6 @@
 
 typedef struct UiMenuItemArgs {
 	const char* label;
-	const char* stockid;
 	const char* icon;
 
 	ui_callback onclick;
@@ -49,7 +48,6 @@
 
 typedef struct UiMenuToggleItemArgs {
 	const char* label;
-	const char* stockid;
 	const char* icon;
 
 	const char* varname;

--- a/ui/ui/toolbar.h	Sat Oct 11 13:31:49 2025 +0200
+++ b/ui/ui/toolbar.h	Sun Oct 12 07:46:38 2025 +0200
@@ -38,7 +38,6 @@
 
 typedef struct UiToolbarItemArgs {
     const char *label;
-    const char *stockid;
     const char *icon;
     const char *tooltip;
 
@@ -50,7 +49,6 @@
 
 typedef struct UiToolbarToggleItemArgs {
     const char *label;
-    const char *stockid;
     const char *icon;
     const char *tooltip;
 
@@ -63,7 +61,6 @@
 
 typedef struct UiToolbarMenuArgs {
     const char *label;
-    const char *stockid;
     const char *icon;
     const char *tooltip;
 } UiToolbarMenuArgs;