diff options
| author | Kristian Rietveld <kris@imendio.com> | 2007-07-09 19:23:18 +0000 |
|---|---|---|
| committer | Kristian Rietveld <kristian@src.gnome.org> | 2007-07-09 19:23:18 +0000 |
| commit | c255676e25b2aac01c8e9c2dcf65de5c909a4613 (patch) | |
| tree | ac2ef88ce9ba7910510d83ba8a669aaa631d6944 /gtk/gtktoolitem.c | |
| parent | 3461e2340a83ac9da89de9c9e3c476193ba2fc55 (diff) | |
| download | gtk+-c255676e25b2aac01c8e9c2dcf65de5c909a4613.tar.gz | |
Replace non-deprecated API using old tooltips API, deprecate old tooltips
2007-07-09 Kristian Rietveld <kris@imendio.com>
Replace non-deprecated API using old tooltips API, deprecate
old tooltips API for real. (#451575).
* gtk/gtk.symbols: updated.
* gtk/gtkwidget.c (gtk_widget_real_show_help): don't call
_gtk_tooltips_toggle_keyboard_mode() anymore.
* gtk/gtkmenutoolbutton.[ch] (gtk_menu_tool_button_set_arrow_tooltip):
deprecated,
(gtk_menu_tool_button_set_arrow_tooltip_{text,markup}): replacements.
* gtk/gtktoolitem.[ch] (gtk_tool_item_real_set_tooltip): use
new API,
(gtk_tool_item_set_tooltip): deprecated,
(gtk_tool_item_set_tooltip_{text,markup): replacements.
(GtkToolItemClass:set_tooltip): deprecated.
* gtk/gtktooltips.[ch]: strip out all unused parts, made
gtk_tooltips_set_tip() call gtk_widget_set_tooltip_text(),
deprecate all of gtk_tooltips_*.
* gtk/gtktoolbar.[ch] (gtk_toolbar_get_tooltips): always return
TRUE,
(GtkToolbar:tooltips): deprecated, renamed.
* gtk/gtkaction.c (gtk_action_sync_tooltip): use new API to
set the tooltip text.
* tests/autotestfilechooser.c: #undef GTK_DISABLE_DEPRECATED for now,
will be removed GtkFileChooserDefault has been converted.
svn path=/trunk/; revision=18418
Diffstat (limited to 'gtk/gtktoolitem.c')
| -rw-r--r-- | gtk/gtktoolitem.c | 52 |
1 files changed, 51 insertions, 1 deletions
diff --git a/gtk/gtktoolitem.c b/gtk/gtktoolitem.c index d82a66b147..2ae4406fb7 100644 --- a/gtk/gtktoolitem.c +++ b/gtk/gtktoolitem.c @@ -773,7 +773,7 @@ gtk_tool_item_real_set_tooltip (GtkToolItem *tool_item, if (!child) return FALSE; - gtk_tooltips_set_tip (tooltips, child, tip_text, tip_private); + gtk_widget_set_tooltip_text (child, tip_text); return TRUE; } @@ -790,6 +790,8 @@ gtk_tool_item_real_set_tooltip (GtkToolItem *tool_item, * to be used. See gtk_tooltips_set_tip(). * * Since: 2.4 + * + * Deprecated: 2.12: Use gtk_tool_item_set_tooltip_text() instead. **/ void gtk_tool_item_set_tooltip (GtkToolItem *tool_item, @@ -806,6 +808,54 @@ gtk_tool_item_set_tooltip (GtkToolItem *tool_item, } /** + * gtk_tool_item_set_tooltip_text: + * @tool_item: a #GtkToolItem: + * @text: text to be used as tooltip for @tool_item + * + * Sets the text to be displayed as tooltip on the item. + * See gtk_widget_set_tooltip_text(). + * + * Since: 2.12 + **/ +void +gtk_tool_item_set_tooltip_text (GtkToolItem *tool_item, + const gchar *text) +{ + GtkWidget *child; + + g_return_if_fail (GTK_IS_TOOL_ITEM (tool_item)); + + child = GTK_BIN (tool_item)->child; + + if (child) + gtk_widget_set_tooltip_text (child, text); +} + +/** + * gtk_tool_item_set_tooltip_markup: + * @tool_item: a #GtkToolItem: + * @markup: markup text to be used as tooltip for @tool_item + * + * Sets the markup text to be displayed as tooltip on the item. + * See gtk_widget_set_tooltip_markup(). + * + * Since: 2.12 + **/ +void +gtk_tool_item_set_tooltip_markup (GtkToolItem *tool_item, + const gchar *markup) +{ + GtkWidget *child; + + g_return_if_fail (GTK_IS_TOOL_ITEM (tool_item)); + + child = GTK_BIN (tool_item)->child; + + if (child) + gtk_widget_set_tooltip_markup (child, markup); +} + +/** * gtk_tool_item_set_use_drag_window: * @toolitem: a #GtkToolItem * @use_drag_window: Whether @toolitem has a drag window. |