r21688 - gnucash/trunk/src - Replace deprecated GtkTooltips with new GtkTooltip interface.
Geert Janssens
gjanssens at code.gnucash.org
Thu Dec 8 12:11:32 EST 2011
Author: gjanssens
Date: 2011-12-08 12:11:32 -0500 (Thu, 08 Dec 2011)
New Revision: 21688
Trac: http://svn.gnucash.org/trac/changeset/21688
Modified:
gnucash/trunk/src/business/business-gnome/business-options-gnome.c
gnucash/trunk/src/business/business-gnome/dialog-billterms.c
gnucash/trunk/src/gnome-utils/dialog-options.c
gnucash/trunk/src/gnome-utils/dialog-options.h
gnucash/trunk/src/gnome-utils/dialog-reset-warnings.c
gnucash/trunk/src/gnome-utils/dialog-transfer.c
gnucash/trunk/src/gnome-utils/dialog-utils.c
gnucash/trunk/src/gnome-utils/gnc-main-window.c
gnucash/trunk/src/gnome-utils/gnc-plugin-page.c
gnucash/trunk/src/gnome-utils/gnc-plugin-page.h
gnucash/trunk/src/gnome-utils/gnc-tree-view.c
Log:
Replace deprecated GtkTooltips with new GtkTooltip interface.
Modified: gnucash/trunk/src/business/business-gnome/business-options-gnome.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/business-options-gnome.c 2011-12-08 17:11:21 UTC (rev 21687)
+++ gnucash/trunk/src/business/business-gnome/business-options-gnome.c 2011-12-08 17:11:32 UTC (rev 21688)
@@ -107,7 +107,6 @@
/* Function to set the UI widget based upon the option */
static GtkWidget *
owner_set_widget (GNCOption *option, GtkBox *page_box,
- GtkTooltips *tooltips,
char *name, char *documentation,
/* Return values */
GtkWidget **enclosing, gboolean *packed)
@@ -177,7 +176,6 @@
/* Function to set the UI widget based upon the option */
static GtkWidget *
customer_set_widget (GNCOption *option, GtkBox *page_box,
- GtkTooltips *tooltips,
char *name, char *documentation,
/* Return values */
GtkWidget **enclosing, gboolean *packed)
@@ -236,7 +234,6 @@
/* Function to set the UI widget based upon the option */
static GtkWidget *
vendor_set_widget (GNCOption *option, GtkBox *page_box,
- GtkTooltips *tooltips,
char *name, char *documentation,
/* Return values */
GtkWidget **enclosing, gboolean *packed)
@@ -294,7 +291,6 @@
/* Function to set the UI widget based upon the option */
static GtkWidget *
employee_set_widget (GNCOption *option, GtkBox *page_box,
- GtkTooltips *tooltips,
char *name, char *documentation,
/* Return values */
GtkWidget **enclosing, gboolean *packed)
@@ -369,7 +365,6 @@
/* Function to set the UI widget based upon the option */
static GtkWidget *
invoice_set_widget (GNCOption *option, GtkBox *page_box,
- GtkTooltips *tooltips,
char *name, char *documentation,
/* Return values */
GtkWidget **enclosing, gboolean *packed)
@@ -448,7 +443,6 @@
/* Function to set the UI widget based upon the option */
static GtkWidget *
taxtable_set_widget (GNCOption *option, GtkBox *page_box,
- GtkTooltips *tooltips,
char *name, char *documentation,
/* Return values */
GtkWidget **enclosing, gboolean *packed)
Modified: gnucash/trunk/src/business/business-gnome/dialog-billterms.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-billterms.c 2011-12-08 17:11:21 UTC (rev 21687)
+++ gnucash/trunk/src/business/business-gnome/dialog-billterms.c 2011-12-08 17:11:32 UTC (rev 21688)
@@ -56,7 +56,6 @@
typedef struct _billterm_notebook
{
- GtkTooltips * tooltips;
GtkWidget * notebook;
/* "Days" widgets */
@@ -125,9 +124,6 @@
GladeXML *xml;
GtkWidget *parent;
- /* Initialize the tooltips */
- notebook->tooltips = gtk_tooltips_new ();
-
/* Load the notebook from XML */
xml = gnc_glade_xml_new ("billterms.glade", "Term Notebook");
notebook->notebook = glade_xml_get_widget (xml, "term_notebook");
Modified: gnucash/trunk/src/gnome-utils/dialog-options.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-options.c 2011-12-08 17:11:21 UTC (rev 21687)
+++ gnucash/trunk/src/gnome-utils/dialog-options.c 2011-12-08 17:11:32 UTC (rev 21688)
@@ -85,8 +85,6 @@
gboolean toplevel;
- GtkTooltips * tips;
-
GNCOptionWinCallback apply_cb;
gpointer apply_cb_data;
@@ -659,7 +657,7 @@
}
static GtkWidget *
-gnc_option_create_multichoice_widget(GNCOption *option, GtkTooltips *tooltips)
+gnc_option_create_multichoice_widget(GNCOption *option)
{
GtkWidget *widget;
int num_values;
@@ -736,18 +734,9 @@
return widget;
}
-static void
-radiobutton_destroy_cb (GtkObject *obj, gpointer data)
-{
- GtkTooltips *tips = data;
-
- g_object_unref (tips);
-}
-
static GtkWidget *
gnc_option_create_radiobutton_widget(char *name, GNCOption *option)
{
- GtkTooltips *tooltips;
GtkWidget *frame, *box;
GtkWidget *widget = NULL;
int num_values;
@@ -766,10 +755,6 @@
box = gtk_hbox_new (FALSE, 5);
gtk_container_add (GTK_CONTAINER (frame), box);
- /* Create the tooltips */
- tooltips = gtk_tooltips_new ();
- g_object_ref_sink(tooltips);
-
/* Iterate over the options and create a radio button for each one */
for (i = 0; i < num_values; i++)
{
@@ -783,7 +768,7 @@
label && *label ? _(label) : "");
g_object_set_data (G_OBJECT (widget), "gnc_radiobutton_index",
GINT_TO_POINTER (i));
- gtk_tooltips_set_tip(tooltips, widget, tip && *tip ? _(tip) : "", NULL);
+ gtk_widget_set_tooltip_text(widget, tip && *tip ? _(tip) : "");
g_signal_connect(G_OBJECT(widget), "toggled",
G_CALLBACK(gnc_option_radiobutton_cb), option);
gtk_box_pack_start (GTK_BOX (box), widget, FALSE, FALSE, 0);
@@ -794,9 +779,6 @@
free (tip);
}
- g_signal_connect (G_OBJECT (frame), "destroy",
- G_CALLBACK (radiobutton_destroy_cb), tooltips);
-
return frame;
}
@@ -853,7 +835,7 @@
}
static GtkWidget *
-gnc_option_create_account_widget(GNCOption *option, char *name, GtkTooltips *tooltips)
+gnc_option_create_account_widget(GNCOption *option, char *name)
{
gboolean multiple_selection;
GtkWidget *scroll_win;
@@ -932,21 +914,21 @@
{
button = gtk_button_new_with_label(_("Select All"));
gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
- gtk_tooltips_set_tip(tooltips, button, _("Select all accounts."), NULL);
+ gtk_widget_set_tooltip_text(button, _("Select all accounts."));
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(gnc_option_account_select_all_cb), option);
button = gtk_button_new_with_label(_("Clear All"));
gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
- gtk_tooltips_set_tip(tooltips, button, _("Clear the selection and unselect all accounts."), NULL);
+ gtk_widget_set_tooltip_text(button, _("Clear the selection and unselect all accounts."));
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(gnc_option_account_clear_all_cb), option);
button = gtk_button_new_with_label(_("Select Children"));
gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
- gtk_tooltips_set_tip(tooltips, button, _("Select all descendents of selected account."), NULL);
+ gtk_widget_set_tooltip_text(button, _("Select all descendents of selected account."));
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(gnc_option_account_select_children_cb), option);
@@ -954,7 +936,7 @@
button = gtk_button_new_with_label(_("Select Default"));
gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
- gtk_tooltips_set_tip(tooltips, button, _("Select the default account selection."), NULL);
+ gtk_widget_set_tooltip_text(button, _("Select the default account selection."));
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(gnc_option_default_cb), option);
@@ -970,7 +952,7 @@
button = gtk_check_button_new_with_label(_("Show Hidden Accounts"));
gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
- gtk_tooltips_set_tip(tooltips, button, _("Show accounts that have been marked hidden."), NULL);
+ gtk_widget_set_tooltip_text(button, _("Show accounts that have been marked hidden."));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), FALSE);
g_signal_connect(G_OBJECT(button), "toggled",
G_CALLBACK(gnc_option_show_hidden_toggled_cb), option);
@@ -1017,7 +999,7 @@
}
static GtkWidget *
-gnc_option_create_list_widget(GNCOption *option, char *name, GtkTooltips *tooltips)
+gnc_option_create_list_widget(GNCOption *option, char *name)
{
GtkListStore *store;
GtkTreeView *view;
@@ -1075,21 +1057,21 @@
button = gtk_button_new_with_label(_("Select All"));
gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
- gtk_tooltips_set_tip(tooltips, button, _("Select all entries."), NULL);
+ gtk_widget_set_tooltip_text(button, _("Select all entries."));
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(gnc_option_list_select_all_cb), option);
button = gtk_button_new_with_label(_("Clear All"));
gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
- gtk_tooltips_set_tip(tooltips, button, _("Clear the selection and unselect all entries."), NULL);
+ gtk_widget_set_tooltip_text(button, _("Clear the selection and unselect all entries."));
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(gnc_option_list_clear_all_cb), option);
button = gtk_button_new_with_label(_("Select Default"));
gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
- gtk_tooltips_set_tip(tooltips, button, _("Select the default selection."), NULL);
+ gtk_widget_set_tooltip_text(button, _("Select the default selection."));
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(gnc_option_default_cb), option);
@@ -1113,8 +1095,7 @@
static void
gnc_option_set_ui_widget(GNCOption *option,
- GtkBox *page_box,
- GtkTooltips *tooltips)
+ GtkBox *page_box)
{
GtkWidget *enclosing = NULL;
GtkWidget *value = NULL;
@@ -1124,8 +1105,8 @@
char *type;
GNCOptionDef_t *option_def;
- ENTER("option %p(%s), box %p, tips %p",
- option, gnc_option_name(option), page_box, tooltips);
+ ENTER("option %p(%s), box %p",
+ option, gnc_option_name(option), page_box);
type = gnc_option_type(option);
if (type == NULL)
{
@@ -1149,7 +1130,7 @@
if (option_def && option_def->set_widget)
{
value = option_def->set_widget (option, page_box,
- tooltips, name, documentation,
+ name, documentation,
/* Return values */
&enclosing, &packed);
}
@@ -1167,11 +1148,11 @@
gtk_container_add (GTK_CONTAINER (eventbox), enclosing);
gtk_box_pack_start (page_box, eventbox, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, eventbox, documentation, NULL);
+ gtk_widget_set_tooltip_text (eventbox, documentation);
}
if (value != NULL)
- gtk_tooltips_set_tip(tooltips, value, documentation, NULL);
+ gtk_widget_set_tooltip_text(value, documentation);
if (raw_name != NULL)
free(raw_name);
@@ -1183,16 +1164,14 @@
static void
gnc_options_dialog_add_option(GtkWidget *page,
- GNCOption *option,
- GtkTooltips *tooltips)
+ GNCOption *option)
{
- gnc_option_set_ui_widget(option, GTK_BOX(page), tooltips);
+ gnc_option_set_ui_widget(option, GTK_BOX(page));
}
static gint
gnc_options_dialog_append_page(GNCOptionWin * propertybox,
- GNCOptionSection *section,
- GtkTooltips *tooltips)
+ GNCOptionSection *section)
{
GNCOption *option;
GtkWidget *page_label;
@@ -1236,8 +1215,7 @@
for (i = 0; i < num_options; i++)
{
option = gnc_get_option_section_option(section, i);
- gnc_options_dialog_add_option(options_box, option,
- propertybox->tips);
+ gnc_options_dialog_add_option(options_box, option);
}
/* Add a button box at the bottom of the page */
@@ -1249,8 +1227,8 @@
/* The reset button on each option page */
reset_button = gtk_button_new_with_label (_("Reset defaults"));
- gtk_tooltips_set_tip(tooltips, reset_button,
- _("Reset all values to their defaults."), NULL);
+ gtk_widget_set_tooltip_text(reset_button,
+ _("Reset all values to their defaults."));
g_signal_connect(G_OBJECT(reset_button), "clicked",
G_CALLBACK(gnc_options_dialog_reset_cb), propertybox);
@@ -1329,11 +1307,8 @@
gnc_option_set_ui_value_internal,
gnc_option_set_selectable_internal);
- propertybox->tips = gtk_tooltips_new();
propertybox->option_db = odb;
- g_object_ref_sink(propertybox->tips);
-
num_sections = gnc_option_db_num_sections(odb);
default_section_name = gnc_option_db_get_default_section(odb);
@@ -1344,7 +1319,7 @@
const char *section_name;
section = gnc_option_db_get_section(odb, i);
- page = gnc_options_dialog_append_page(propertybox, section, propertybox->tips);
+ page = gnc_options_dialog_append_page(propertybox, section);
section_name = gnc_option_section_name(section);
if (safe_strcmp(section_name, default_section_name) == 0)
@@ -1632,16 +1607,10 @@
gtk_widget_destroy(win->dialog);
- if (win->tips)
- {
- g_object_unref (win->tips);
- }
-
win->dialog = NULL;
win->notebook = NULL;
win->apply_cb = NULL;
win->help_cb = NULL;
- win->tips = NULL;
g_free(win);
}
@@ -1685,7 +1654,6 @@
*/
static GtkWidget *
gnc_option_set_ui_widget_boolean (GNCOption *option, GtkBox *page_box,
- GtkTooltips *tooltips,
char *name, char *documentation,
/* Return values */
GtkWidget **enclosing, gboolean *packed)
@@ -1709,7 +1677,6 @@
static GtkWidget *
gnc_option_set_ui_widget_string (GNCOption *option, GtkBox *page_box,
- GtkTooltips *tooltips,
char *name, char *documentation,
/* Return values */
GtkWidget **enclosing, gboolean *packed)
@@ -1740,7 +1707,6 @@
static GtkWidget *
gnc_option_set_ui_widget_text (GNCOption *option, GtkBox *page_box,
- GtkTooltips *tooltips,
char *name, char *documentation,
/* Return values */
GtkWidget **enclosing, gboolean *packed)
@@ -1780,7 +1746,6 @@
static GtkWidget *
gnc_option_set_ui_widget_currency (GNCOption *option, GtkBox *page_box,
- GtkTooltips *tooltips,
char *name, char *documentation,
/* Return values */
GtkWidget **enclosing, gboolean *packed)
@@ -1811,7 +1776,6 @@
static GtkWidget *
gnc_option_set_ui_widget_commodity (GNCOption *option, GtkBox *page_box,
- GtkTooltips *tooltips,
char *name, char *documentation,
/* Return values */
GtkWidget **enclosing, gboolean *packed)
@@ -1835,8 +1799,8 @@
gnc_option_set_ui_value(option, FALSE);
if (documentation != NULL)
- gtk_tooltips_set_tip(tooltips, GNC_GENERAL_SELECT(value)->entry,
- documentation, NULL);
+ gtk_widget_set_tooltip_text(GNC_GENERAL_SELECT(value)->entry,
+ documentation);
g_signal_connect(G_OBJECT(GNC_GENERAL_SELECT(value)->entry), "changed",
G_CALLBACK(gnc_option_changed_widget_cb), option);
@@ -1849,7 +1813,6 @@
static GtkWidget *
gnc_option_set_ui_widget_multichoice (GNCOption *option, GtkBox *page_box,
- GtkTooltips *tooltips,
char *name, char *documentation,
/* Return values */
GtkWidget **enclosing, gboolean *packed)
@@ -1865,7 +1828,7 @@
*enclosing = gtk_hbox_new(FALSE, 5);
- value = gnc_option_create_multichoice_widget(option, tooltips);
+ value = gnc_option_create_multichoice_widget(option);
gnc_option_set_widget (option, value);
gnc_option_set_ui_value(option, FALSE);
@@ -1877,7 +1840,6 @@
static GtkWidget *
gnc_option_set_ui_widget_date (GNCOption *option, GtkBox *page_box,
- GtkTooltips *tooltips,
char *name, char *documentation,
/* Return values */
GtkWidget **enclosing, gboolean *packed)
@@ -1908,7 +1870,7 @@
gtk_box_pack_start(page_box, eventbox, FALSE, FALSE, 5);
*packed = TRUE;
- gtk_tooltips_set_tip (tooltips, eventbox, documentation, NULL);
+ gtk_widget_set_tooltip_text (eventbox, documentation);
gnc_option_set_ui_value(option, FALSE);
gtk_widget_show_all(*enclosing);
@@ -1917,7 +1879,6 @@
static GtkWidget *
gnc_option_set_ui_widget_account_list (GNCOption *option, GtkBox *page_box,
- GtkTooltips *tooltips,
char *name, char *documentation,
/* Return values */
GtkWidget **enclosing, gboolean *packed)
@@ -1925,10 +1886,10 @@
GtkWidget *value;
GtkTreeSelection *selection;
- *enclosing = gnc_option_create_account_widget(option, name, tooltips);
+ *enclosing = gnc_option_create_account_widget(option, name);
value = gnc_option_get_gtk_widget (option);
- gtk_tooltips_set_tip(tooltips, *enclosing, documentation, NULL);
+ gtk_widget_set_tooltip_text(*enclosing, documentation);
gtk_box_pack_start(page_box, *enclosing, TRUE, TRUE, 5);
*packed = TRUE;
@@ -1949,7 +1910,6 @@
static GtkWidget *
gnc_option_set_ui_widget_account_sel (GNCOption *option, GtkBox *page_box,
- GtkTooltips *tooltips,
char *name, char *documentation,
/* Return values */
GtkWidget **enclosing, gboolean *packed)
@@ -1985,7 +1945,6 @@
static GtkWidget *
gnc_option_set_ui_widget_list (GNCOption *option, GtkBox *page_box,
- GtkTooltips *tooltips,
char *name, char *documentation,
/* Return values */
GtkWidget **enclosing, gboolean *packed)
@@ -1993,7 +1952,7 @@
GtkWidget *value;
GtkWidget *eventbox;
- *enclosing = gnc_option_create_list_widget(option, name, tooltips);
+ *enclosing = gnc_option_create_list_widget(option, name);
value = gnc_option_get_gtk_widget (option);
/* Pack option widget into an extra eventbox because otherwise the
@@ -2003,7 +1962,7 @@
gtk_box_pack_start(page_box, eventbox, FALSE, FALSE, 5);
*packed = TRUE;
- gtk_tooltips_set_tip(tooltips, eventbox, documentation, NULL);
+ gtk_widget_set_tooltip_text(eventbox, documentation);
gnc_option_set_ui_value(option, FALSE);
gtk_widget_show(*enclosing);
@@ -2012,7 +1971,6 @@
static GtkWidget *
gnc_option_set_ui_widget_number_range (GNCOption *option, GtkBox *page_box,
- GtkTooltips *tooltips,
char *name, char *documentation,
/* Return values */
GtkWidget **enclosing, gboolean *packed)
@@ -2078,7 +2036,6 @@
static GtkWidget *
gnc_option_set_ui_widget_color (GNCOption *option, GtkBox *page_box,
- GtkTooltips *tooltips,
char *name, char *documentation,
/* Return values */
GtkWidget **enclosing, gboolean *packed)
@@ -2115,7 +2072,6 @@
static GtkWidget *
gnc_option_set_ui_widget_font (GNCOption *option, GtkBox *page_box,
- GtkTooltips *tooltips,
char *name, char *documentation,
/* Return values */
GtkWidget **enclosing, gboolean *packed)
@@ -2152,7 +2108,6 @@
static GtkWidget *
gnc_option_set_ui_widget_pixmap (GNCOption *option, GtkBox *page_box,
- GtkTooltips *tooltips,
char *name, char *documentation,
/* Return values */
GtkWidget **enclosing, gboolean *packed)
@@ -2171,11 +2126,11 @@
*enclosing = gtk_hbox_new(FALSE, 5);
button = gtk_button_new_with_label(_("Clear"));
- gtk_tooltips_set_tip(tooltips, button, _("Clear any selected image file."), NULL);
+ gtk_widget_set_tooltip_text(button, _("Clear any selected image file."));
value = gtk_file_chooser_button_new(_("Select image"),
GTK_FILE_CHOOSER_ACTION_OPEN);
- gtk_tooltips_set_tip(tooltips, value, _("Select an image file."), NULL);
+ gtk_widget_set_tooltip_text(value, _("Select an image file."));
g_object_set(G_OBJECT(value),
"width-chars", 30,
"preview-widget", gtk_image_new(),
@@ -2205,7 +2160,6 @@
static GtkWidget *
gnc_option_set_ui_widget_radiobutton (GNCOption *option, GtkBox *page_box,
- GtkTooltips *tooltips,
char *name, char *documentation,
/* Return values */
GtkWidget **enclosing, gboolean *packed)
@@ -2225,7 +2179,6 @@
static GtkWidget *
gnc_option_set_ui_widget_dateformat (GNCOption *option, GtkBox *page_box,
- GtkTooltips *tooltips,
char *name, char *documentation,
/* Return values */
GtkWidget **enclosing, gboolean *packed)
@@ -2242,7 +2195,6 @@
static GtkWidget *
gnc_option_set_ui_widget_budget (GNCOption *option, GtkBox *page_box,
- GtkTooltips *tooltips,
char *name, char *documentation,
/* Return values */
GtkWidget **enclosing, gboolean *packed)
Modified: gnucash/trunk/src/gnome-utils/dialog-options.h
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-options.h 2011-12-08 17:11:21 UTC (rev 21687)
+++ gnucash/trunk/src/gnome-utils/dialog-options.h 2011-12-08 17:11:32 UTC (rev 21688)
@@ -76,28 +76,27 @@
/* Function to set the UI widget based upon the option */
typedef GtkWidget *
-(*GNCOptionUISetWidget) (GNCOption *option, GtkBox *page_box,
- GtkTooltips *tooltips,
+(*GNCOptionUISetWidget) (GNCOption *option, GtkBox *page_box,
char *name, char *documentation,
/* Return values */
GtkWidget **enclosing, gboolean *packed);
/* Function to set the UI Value for a particular option */
typedef gboolean
-(*GNCOptionUISetValue) (GNCOption *option, gboolean use_default,
+(*GNCOptionUISetValue) (GNCOption *option, gboolean use_default,
GtkWidget *widget, SCM value);
/* Function to get the UI Value for a particular option */
typedef SCM
-(*GNCOptionUIGetValue) (GNCOption *option, GtkWidget *widget);
+(*GNCOptionUIGetValue) (GNCOption *option, GtkWidget *widget);
typedef struct gnc_option_def
{
- const char * option_name;
- GNCOptionUISetWidget set_widget;
- GNCOptionUISetValue set_value;
- GNCOptionUIGetValue get_value;
+ const char * option_name;
+ GNCOptionUISetWidget set_widget;
+ GNCOptionUISetValue set_value;
+ GNCOptionUIGetValue get_value;
} GNCOptionDef_t;
Modified: gnucash/trunk/src/gnome-utils/dialog-reset-warnings.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-reset-warnings.c 2011-12-08 17:11:21 UTC (rev 21687)
+++ gnucash/trunk/src/gnome-utils/dialog-reset-warnings.c 2011-12-08 17:11:32 UTC (rev 21688)
@@ -298,16 +298,7 @@
long_desc = gconf_schema_get_long_desc(schema);
checkbox = gtk_check_button_new_with_label(desc ? desc : name);
if (long_desc)
- {
- GtkTooltips *tips;
- tips = g_object_get_data(G_OBJECT(box), TIPS_STRING);
- if (!tips)
- {
- tips = gtk_tooltips_new();
- g_object_set_data(G_OBJECT(box), TIPS_STRING, tips);
- }
- gtk_tooltips_set_tip(tips, checkbox, long_desc, NULL);
- }
+ gtk_widget_set_tooltip_text(checkbox, long_desc);
gconf_schema_free(schema);
}
else
Modified: gnucash/trunk/src/gnome-utils/dialog-transfer.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-transfer.c 2011-12-08 17:11:21 UTC (rev 21687)
+++ gnucash/trunk/src/gnome-utils/dialog-transfer.c 2011-12-08 17:11:32 UTC (rev 21688)
@@ -115,8 +115,6 @@
GtkWidget * fetch_button;
- GtkTooltips *tips;
-
QofBook * book;
GNCPriceDB * pricedb;
@@ -570,7 +568,7 @@
gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), FALSE);
- gtk_tooltips_set_tip (xferData->tips, GTK_WIDGET (button), show_inc_exp_message, NULL);
+ gtk_widget_set_tooltip_text (button, show_inc_exp_message);
if (direction == XFER_DIALOG_TO)
{
@@ -1624,8 +1622,6 @@
g_signal_handlers_disconnect_matched (G_OBJECT (entry), G_SIGNAL_MATCH_DATA,
0, 0, NULL, NULL, xferData);
- g_object_unref (xferData->tips);
-
DEBUG("unregister component");
gnc_unregister_gui_component_by_data (DIALOG_TRANSFER_CM_CLASS, xferData);
@@ -1715,10 +1711,6 @@
if (parent != NULL)
gtk_window_set_transient_for (GTK_WINDOW (xferData->dialog), GTK_WINDOW (parent));
- xferData->tips = gtk_tooltips_new();
-
- g_object_ref_sink(xferData->tips);
-
/* default to quickfilling off of the "From" account. */
xferData->quickfill = XFER_DIALOG_FROM;
Modified: gnucash/trunk/src/gnome-utils/dialog-utils.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-utils.c 2011-12-08 17:11:21 UTC (rev 21687)
+++ gnucash/trunk/src/gnome-utils/dialog-utils.c 2011-12-08 17:11:32 UTC (rev 21688)
@@ -65,14 +65,6 @@
cb(w, index, data);
}
-static void
-option_menu_destroy_cb (GtkObject *obj, gpointer data)
-{
- GtkTooltips *tips = data;
-
- g_object_unref (tips);
-}
-
/********************************************************************\
* gnc_build_option_menu: *
* create an GTK "option menu" given the option structure *
@@ -84,7 +76,6 @@
GtkWidget *
gnc_build_option_menu(GNCOptionInfo *option_info, gint num_options)
{
- GtkTooltips *tooltips;
GtkWidget *omenu;
GtkWidget *menu;
GtkWidget *menu_item;
@@ -96,14 +87,10 @@
menu = gtk_menu_new();
gtk_widget_show(menu);
- tooltips = gtk_tooltips_new();
-
- g_object_ref_sink(tooltips);
-
for (i = 0; i < num_options; i++)
{
menu_item = gtk_menu_item_new_with_label(option_info[i].name);
- gtk_tooltips_set_tip(tooltips, menu_item, option_info[i].tip, NULL);
+ gtk_widget_set_tooltip_text(menu_item, option_info[i].tip);
gtk_widget_show(menu_item);
g_object_set_data(G_OBJECT(menu_item),
@@ -128,9 +115,6 @@
gtk_option_menu_set_menu(GTK_OPTION_MENU(omenu), menu);
- g_signal_connect (omenu, "destroy",
- G_CALLBACK (option_menu_destroy_cb), tooltips);
-
return omenu;
}
Modified: gnucash/trunk/src/gnome-utils/gnc-main-window.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-main-window.c 2011-12-08 17:11:21 UTC (rev 21687)
+++ gnucash/trunk/src/gnome-utils/gnc-main-window.c 2011-12-08 17:11:32 UTC (rev 21688)
@@ -461,11 +461,6 @@
};
-/* This data structure holds the tooltops for all notebook tabs.
- * Typically these are used to provide the full path of a register
- * page. */
-static GtkTooltips *tips = NULL;
-
/************************************************************
* *
************************************************************/
@@ -1962,7 +1957,7 @@
gnc_plugin_page_set_page_long_name(page, new_page_long_name);
if (main_window_find_tab_event(window, page, &event_box))
- gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), event_box, new_page_long_name, NULL);
+ gtk_widget_set_tooltip_text(event_box, new_page_long_name);
g_free(new_page_long_name);
}
@@ -2231,7 +2226,6 @@
gnc_hook_add_dangler(HOOK_BOOK_OPENED,
(GFunc)gnc_main_window_attach_to_book, NULL);
- tips = gtk_tooltips_new();
}
@@ -2658,7 +2652,7 @@
text = gnc_plugin_page_get_page_long_name(page);
if (text)
{
- gtk_tooltips_set_tip(tips, event_box, text, NULL);
+ gtk_widget_set_tooltip_text(event_box, text);
}
entry = gtk_entry_new();
Modified: gnucash/trunk/src/gnome-utils/gnc-plugin-page.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-plugin-page.c 2011-12-08 17:11:21 UTC (rev 21687)
+++ gnucash/trunk/src/gnome-utils/gnc-plugin-page.c 2011-12-08 17:11:32 UTC (rev 21688)
@@ -808,7 +808,7 @@
/* Retrieve the long name of this page. This is the string used in
- * the tooltip that is attached to the pate name in the notebook
+ * the tooltip that is attached to the page name in the notebook
* tab. */
const gchar *
gnc_plugin_page_get_page_long_name (GncPluginPage *page)
Modified: gnucash/trunk/src/gnome-utils/gnc-plugin-page.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-plugin-page.h 2011-12-08 17:11:21 UTC (rev 21687)
+++ gnucash/trunk/src/gnome-utils/gnc-plugin-page.h 2011-12-08 17:11:32 UTC (rev 21688)
@@ -355,7 +355,7 @@
/** Retrieve the long name of this page. This is the string used in
- * the tooltip that is attached to the pate name in the notebook
+ * the tooltip that is attached to the page name in the notebook
* tab.
*
* @param page The page whose name should be retrieved.
@@ -367,7 +367,7 @@
/** Set the long name of this page. This is the string used in the
- * tooltip that is attached to the pate name in the notebook tab.
+ * tooltip that is attached to the page name in the notebook tab.
*
* @param page The page whose name should be set.
*
Modified: gnucash/trunk/src/gnome-utils/gnc-tree-view.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-view.c 2011-12-08 17:11:21 UTC (rev 21687)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-view.c 2011-12-08 17:11:32 UTC (rev 21688)
@@ -117,8 +117,6 @@
typedef struct GncTreeViewPrivate
{
- GtkTooltips *title_tips;
-
/* Spacer column */
GtkTreeViewColumn *spacer_column;
GtkTreeViewColumn *selection_column;
@@ -1929,9 +1927,7 @@
gnc_tree_view_append_column (view, column);
/* Also add the full title to the object as a tooltip */
- if (!priv->title_tips)
- priv->title_tips = gtk_tooltips_new();
- gtk_tooltips_set_tip(priv->title_tips, column->button, column_title, NULL);
+ gtk_widget_set_tooltip_text(column->button, column_title);
return column;
}
More information about the gnucash-changes
mailing list