Mercurial > hg > idav / file diff

--- a/ui/gtk/toolbar.c	Sat Oct 04 14:54:25 2025 +0200
+++ b/ui/gtk/toolbar.c	Sun Oct 19 21:20:08 2025 +0200
@@ -128,15 +128,9 @@
 
 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);
     }
     
     gtk_tool_item_set_homogeneous(button, FALSE);
@@ -176,21 +170,16 @@
 
 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);
     }
     ui_set_widget_ngroups(obj->ctx, GTK_WIDGET(button), item->args.groups, item->ngroups);
     
@@ -282,21 +271,15 @@
 
 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) {
         set_toolbutton_icon(button, item->args.icon);
     }
+    if(item->args.tooltip) {
+        gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(button), item->args.tooltip);
+    }
     gtk_tool_item_set_is_important(button, TRUE);
     
     gtk_toolbar_insert(tb, button, -1);