summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPablo Barciela <[email protected]>2018-01-28 01:04:04 +0100
committerPablo Barciela <[email protected]>2018-01-28 21:16:31 +0100
commit719cc6f6ba0f0d06b875746c99cf1a51031c35f1 (patch)
tree0c9ef8e1ef1a1a8539f8d59d362273d27a15e8ab
parentbfdf09e125f80513a49151d005512b63fe1e97a9 (diff)
downloadmate-calc-719cc6f6ba0f0d06b875746c99cf1a51031c35f1.tar.bz2
mate-calc-719cc6f6ba0f0d06b875746c99cf1a51031c35f1.tar.xz
avoid deprecated GtkStock
-rw-r--r--src/math-variable-popup.c6
-rw-r--r--src/math-window.c16
2 files changed, 11 insertions, 11 deletions
diff --git a/src/math-variable-popup.c b/src/math-variable-popup.c
index afd62bd..e5c0926 100644
--- a/src/math-variable-popup.c
+++ b/src/math-variable-popup.c
@@ -162,7 +162,7 @@ make_variable_entry(MathVariablePopup *popup, const gchar *name, const MPNumber
button = gtk_button_new();
g_object_set_data(G_OBJECT(button), "variable_name", g_strdup(name));
- image = gtk_image_new_from_stock(GTK_STOCK_SAVE, GTK_ICON_SIZE_BUTTON);
+ image = gtk_image_new_from_icon_name("document-save", GTK_ICON_SIZE_BUTTON);
gtk_container_add(GTK_CONTAINER(button), image);
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(save_variable_cb), popup);
@@ -171,7 +171,7 @@ make_variable_entry(MathVariablePopup *popup, const gchar *name, const MPNumber
button = gtk_button_new();
g_object_set_data(G_OBJECT(button), "variable_name", g_strdup(name));
- image = gtk_image_new_from_stock(GTK_STOCK_DELETE, GTK_ICON_SIZE_BUTTON);
+ image = gtk_image_new_from_icon_name("edit-delete", GTK_ICON_SIZE_BUTTON);
gtk_container_add(GTK_CONTAINER(button), image);
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(delete_variable_cb), popup);
@@ -225,7 +225,7 @@ math_variable_popup_set_property(GObject *object,
self->priv->add_variable_button = gtk_button_new();
gtk_widget_set_sensitive(self->priv->add_variable_button, FALSE);
g_signal_connect(G_OBJECT(self->priv->add_variable_button), "clicked", G_CALLBACK(add_variable_cb), self);
- image = gtk_image_new_from_stock(GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON);
+ image = gtk_image_new_from_icon_name("list-add", GTK_ICON_SIZE_BUTTON);
gtk_container_add(GTK_CONTAINER(self->priv->add_variable_button), image);
gtk_box_pack_start(GTK_BOX(entry), self->priv->add_variable_button, FALSE, TRUE, 0);
gtk_widget_show(image);
diff --git a/src/math-window.c b/src/math-window.c
index 47b2f60..56194e3 100644
--- a/src/math-window.c
+++ b/src/math-window.c
@@ -109,7 +109,7 @@ math_window_critical_error(MathWindow *window, const gchar *title, const gchar *
"%s", title);
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
"%s", contents);
- gtk_dialog_add_buttons(GTK_DIALOG(dialog), GTK_STOCK_QUIT, GTK_RESPONSE_ACCEPT, NULL);
+ gtk_dialog_add_buttons(GTK_DIALOG(dialog), "gtk-quit", GTK_RESPONSE_ACCEPT, NULL);
gtk_dialog_run(GTK_DIALOG(dialog));
@@ -383,16 +383,16 @@ static void create_menu(MathWindow* window)
#define HELP_CONTENTS_LABEL _("_Contents")
menu = add_menu(window->priv->menu_bar, CALCULATOR_MENU_LABEL);
- add_menu_item(menu, gtk_image_menu_item_new_from_stock(GTK_STOCK_COPY, accel_group), G_CALLBACK(copy_cb), window);
- add_menu_item(menu, gtk_image_menu_item_new_from_stock(GTK_STOCK_PASTE, accel_group), G_CALLBACK(paste_cb), window);
- menu_item = add_menu_item(menu, gtk_image_menu_item_new_from_stock(GTK_STOCK_UNDO, accel_group), G_CALLBACK(undo_cb), window);
+ add_menu_item(menu, gtk_image_menu_item_new_from_stock("gtk-copy", accel_group), G_CALLBACK(copy_cb), window);
+ add_menu_item(menu, gtk_image_menu_item_new_from_stock("gtk-paste", accel_group), G_CALLBACK(paste_cb), window);
+ menu_item = add_menu_item(menu, gtk_image_menu_item_new_from_stock("gtk-undo", accel_group), G_CALLBACK(undo_cb), window);
gtk_widget_add_accelerator(menu_item, "activate", accel_group, GDK_KEY_Z, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
- menu_item = add_menu_item(menu, gtk_image_menu_item_new_from_stock(GTK_STOCK_REDO, accel_group), G_CALLBACK(redo_cb), window);
+ menu_item = add_menu_item(menu, gtk_image_menu_item_new_from_stock("gtk-redo", accel_group), G_CALLBACK(redo_cb), window);
gtk_widget_add_accelerator(menu_item, "activate", accel_group, GDK_KEY_Z, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_ACCEL_VISIBLE);
add_menu_item(menu, gtk_separator_menu_item_new(), NULL, NULL);
- add_menu_item(menu, gtk_image_menu_item_new_from_stock(GTK_STOCK_PREFERENCES, accel_group), G_CALLBACK(show_preferences_cb), window);
+ add_menu_item(menu, gtk_image_menu_item_new_from_stock("gtk-preferences", accel_group), G_CALLBACK(show_preferences_cb), window);
add_menu_item(menu, gtk_separator_menu_item_new(), NULL, NULL);
- menu_item = add_menu_item(menu, gtk_image_menu_item_new_from_stock(GTK_STOCK_QUIT, accel_group), G_CALLBACK(quit_cb), window);
+ menu_item = add_menu_item(menu, gtk_image_menu_item_new_from_stock("gtk-quit", accel_group), G_CALLBACK(quit_cb), window);
gtk_widget_add_accelerator(menu_item, "activate", accel_group, GDK_KEY_W, GDK_CONTROL_MASK, 0);
menu = add_menu(window->priv->menu_bar, MODE_MENU_LABEL);
@@ -408,7 +408,7 @@ static void create_menu(MathWindow* window)
menu = add_menu(window->priv->menu_bar, HELP_MENU_LABEL);
menu_item = add_menu_item(menu, gtk_menu_item_new_with_mnemonic(HELP_CONTENTS_LABEL), G_CALLBACK(help_cb), window);
gtk_widget_add_accelerator(menu_item, "activate", accel_group, GDK_KEY_F1, 0, GTK_ACCEL_VISIBLE);
- add_menu_item(menu, gtk_image_menu_item_new_from_stock(GTK_STOCK_ABOUT, accel_group), G_CALLBACK(about_cb), window);
+ add_menu_item(menu, gtk_image_menu_item_new_from_stock("gtk-about", accel_group), G_CALLBACK(about_cb), window);
}
static void