ui/gtk/toolbar.c

changeset 836
5a8485ff7f54
parent 823
1e1df80772ed
child 973
aa39a986da78
--- 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) {

mercurial