Commit 4edfee8c authored by Cosimo Cecchi's avatar Cosimo Cecchi

eel: don't use deprecated GtkStock and GtkImageMenuItem

parent 973421d9
...@@ -2978,11 +2978,11 @@ activate_cb (GtkWidget *menuitem, ...@@ -2978,11 +2978,11 @@ activate_cb (GtkWidget *menuitem,
static void static void
append_action_signal (EelEditableLabel *label, append_action_signal (EelEditableLabel *label,
GtkWidget *menu, GtkWidget *menu,
const gchar *stock_id, const gchar *mnemonic_label,
const gchar *signal, const gchar *signal,
gboolean sensitive) gboolean sensitive)
{ {
GtkWidget *menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); GtkWidget *menuitem = gtk_menu_item_new_with_mnemonic (mnemonic_label);
g_object_set_data (G_OBJECT (menuitem), "gtk-signal", (char *)signal); g_object_set_data (G_OBJECT (menuitem), "gtk-signal", (char *)signal);
g_signal_connect (menuitem, "activate", g_signal_connect (menuitem, "activate",
...@@ -3023,8 +3023,7 @@ popup_position_func (GtkMenu *menu, ...@@ -3023,8 +3023,7 @@ popup_position_func (GtkMenu *menu,
gdk_window_get_origin (label->text_area, x, y); gdk_window_get_origin (label->text_area, x, y);
/*gtk_widget_size_request (label->popup_menu, &req);*/ gtk_widget_get_preferred_size (widget, &req, NULL);
gtk_widget_get_requisition (widget, &req);
gtk_widget_get_allocation (widget, &allocation); gtk_widget_get_allocation (widget, &allocation);
*x += allocation.width / 2; *x += allocation.width / 2;
...@@ -3078,11 +3077,11 @@ popup_targets_received (GtkClipboard *clipboard, ...@@ -3078,11 +3077,11 @@ popup_targets_received (GtkClipboard *clipboard,
clipboard_contains_text = gtk_selection_data_targets_include_text (data); clipboard_contains_text = gtk_selection_data_targets_include_text (data);
append_action_signal (label, label->popup_menu, GTK_STOCK_CUT, "cut-clipboard", append_action_signal (label, label->popup_menu, _("Cu_t"), "cut-clipboard",
have_selection); have_selection);
append_action_signal (label, label->popup_menu, GTK_STOCK_COPY, "copy-clipboard", append_action_signal (label, label->popup_menu, _("_Copy"), "copy-clipboard",
have_selection); have_selection);
append_action_signal (label, label->popup_menu, GTK_STOCK_PASTE, "paste-clipboard", append_action_signal (label, label->popup_menu, _("_Paste"), "paste-clipboard",
clipboard_contains_text); clipboard_contains_text);
menuitem = gtk_menu_item_new_with_label (_("Select All")); menuitem = gtk_menu_item_new_with_label (_("Select All"));
......
...@@ -193,7 +193,7 @@ timed_wait_callback (gpointer callback_data) ...@@ -193,7 +193,7 @@ timed_wait_callback (gpointer callback_data)
wait = callback_data; wait = callback_data;
/* Put up the timed wait window. */ /* Put up the timed wait window. */
button = wait->cancel_callback != NULL ? GTK_STOCK_CANCEL : GTK_STOCK_OK; button = wait->cancel_callback != NULL ? _("_Cancel") : ("_OK");
dialog = GTK_DIALOG (gtk_message_dialog_new (wait->parent_window, dialog = GTK_DIALOG (gtk_message_dialog_new (wait->parent_window,
0, 0,
GTK_MESSAGE_INFO, GTK_MESSAGE_INFO,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment