gcalctool-01-gtk-tooltips.diff revision 10955
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync--- gcacltool-5.19.6/gcalctool/gtk.c 2007/07/22 06:13:02 1622
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync+++ gcacltool-5.19.6/gcalctool/gtk.c 2007/07/24 14:31:01 1624
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync@@ -91,7 +91,6 @@
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync GConfClient *client;
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync GtkUIManager *ui;
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync GtkActionGroup *actions;
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync- GtkTooltips *tips;
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync GtkWidget *aframe; /* ASCII window. */
3e729152bacbdd8ae206df8fafe3187bb9fb7614vboxsync GtkWidget *aframe_ch;
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync GtkWidget *base[MAXBASES]; /* Numeric base radio buttons. */
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync@@ -494,7 +493,6 @@
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync gtk_rc_parse(g_build_path(v->home, RCNAME, NULL));
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync X->kbd_accel = gtk_accel_group_new();
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync- X->tips = gtk_tooltips_new();
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync X->dpy = GDK_DISPLAY();
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync gtk_window_set_default_icon_name("gnome-calculator");
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync@@ -1713,7 +1711,7 @@
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync for (i = 0; i < MAXTRIGMODES; i++) {
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync X->trig[i] = gtk_radio_button_new_with_mnemonic(NULL, _(ttype_str[i]));
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync- gtk_tooltips_set_tip(X->tips, X->trig[i], _(ttype_desc[i]), "");
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync+ gtk_widget_set_tooltip_text (X->trig[i], _(ttype_desc[i]));
4651430e55b9df9726347e3e3968618e540fe729vboxsync g_object_set_data(G_OBJECT(X->trig[i]), "trig", GINT_TO_POINTER(i));
4651430e55b9df9726347e3e3968618e540fe729vboxsync gtk_widget_show(X->trig[i]);
4651430e55b9df9726347e3e3968618e540fe729vboxsync gtk_box_pack_start(GTK_BOX(trig_hbox), X->trig[i], FALSE, FALSE, 0);
4651430e55b9df9726347e3e3968618e540fe729vboxsync@@ -1734,7 +1732,7 @@
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync for (i = 0; i < MAXBASES; i++) {
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync X->base[i] = gtk_radio_button_new_with_mnemonic(NULL, _(base_str[i]));
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync- gtk_tooltips_set_tip(X->tips, X->base[i], _(base_desc[i]), "");
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync+ gtk_widget_set_tooltip_text (X->base[i], _(base_desc[i]));
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync g_object_set_data(G_OBJECT(X->base[i]), "base", GINT_TO_POINTER(i));
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync gtk_widget_show(X->base[i]);
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync gtk_box_pack_start(GTK_BOX(base_hbox), X->base[i], FALSE, FALSE, 0);
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync@@ -1751,7 +1749,7 @@
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync /* Make Hyp and Inv trigonometric check boxes. */
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync X->inv = gtk_check_button_new_with_mnemonic(_("_Inv"));
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync- gtk_tooltips_set_tip(X->tips, X->inv, _(inv_desc), "");
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync+ gtk_widget_set_tooltip_text (X->inv, _(inv_desc));
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync gtk_widget_show(X->inv);
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync gtk_box_pack_start(GTK_BOX(row2_hbox), X->inv, FALSE, FALSE, 0);
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync access_object = gtk_widget_get_accessible(X->inv);
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync@@ -1759,7 +1757,7 @@
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync g_signal_connect(G_OBJECT(X->inv), "toggled", G_CALLBACK(inv_cb), NULL);
e475db425142b37cb088dc96daae0d4e8d13166evboxsync X->hyp = gtk_check_button_new_with_mnemonic(_("H_yp"));
e475db425142b37cb088dc96daae0d4e8d13166evboxsync- gtk_tooltips_set_tip(X->tips, X->hyp, _(hyp_desc), "");
e475db425142b37cb088dc96daae0d4e8d13166evboxsync+ gtk_widget_set_tooltip_text (X->hyp, _(hyp_desc));
e475db425142b37cb088dc96daae0d4e8d13166evboxsync gtk_widget_show(X->hyp);
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync gtk_box_pack_start(GTK_BOX(row2_hbox), X->hyp, FALSE, FALSE, 0);
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync access_object = gtk_widget_get_accessible(X->hyp);
e475db425142b37cb088dc96daae0d4e8d13166evboxsync@@ -1773,7 +1771,7 @@
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync for (i = 0; i < MAXTRIGMODES; i++) {
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync X->disp[i] = gtk_radio_button_new_with_mnemonic(NULL, _(dtype_str[i]));
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync- gtk_tooltips_set_tip(X->tips, X->disp[i], _(dtype_desc[i]), "");
3e729152bacbdd8ae206df8fafe3187bb9fb7614vboxsync+ gtk_widget_set_tooltip_text (X->disp[i], _(dtype_desc[i]));
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync g_object_set_data(G_OBJECT(X->disp[i]), "disp", GINT_TO_POINTER(i));
e475db425142b37cb088dc96daae0d4e8d13166evboxsync gtk_widget_show(X->disp[i]);
e475db425142b37cb088dc96daae0d4e8d13166evboxsync gtk_box_pack_start(GTK_BOX(disp_hbox), X->disp[i], FALSE, FALSE, 0);
e475db425142b37cb088dc96daae0d4e8d13166evboxsync@@ -2431,7 +2429,7 @@
e475db425142b37cb088dc96daae0d4e8d13166evboxsync snprintf(tooltip, MAXLINE,
e475db425142b37cb088dc96daae0d4e8d13166evboxsync _("Set accuracy from 0 to %d numeric places. Currently set to %d places. [a]"),
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync MAXACC, accuracy);
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync- gtk_tooltips_set_tip(X->tips, BUT_ACC, tooltip, "");
e07acfb7f2dbb8bb40804024c79fd3139bdb3f24vboxsync+ gtk_widget_set_tooltip_text (BUT_ACC, tooltip);
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync@@ -2501,8 +2499,7 @@
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync SNPRINTF(name, MAXLINE, "%s_button%1d", tag, n);
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync gtk_widget_set_name(Gtk_buttons[n], name);
3e729152bacbdd8ae206df8fafe3187bb9fb7614vboxsync if (buttons[n].hstr != NULL) {
3e729152bacbdd8ae206df8fafe3187bb9fb7614vboxsync- gtk_tooltips_set_tip(X->tips, Gtk_buttons[n],
3e729152bacbdd8ae206df8fafe3187bb9fb7614vboxsync- _(buttons[n].hstr), "");
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync+ gtk_widget_set_tooltip_text (Gtk_buttons[n],_(buttons[n].hstr));
3e729152bacbdd8ae206df8fafe3187bb9fb7614vboxsync g_object_set_data(G_OBJECT(Gtk_buttons[n]),
2c4460e3cb462e743aa08229a17e49aa4f061effvboxsync "button", &buttons[n]);