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.h | |
| 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.h')
| -rw-r--r-- | gtk/gtktoolitem.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/gtk/gtktoolitem.h b/gtk/gtktoolitem.h index 10cf4711ca..3cc68a2324 100644 --- a/gtk/gtktoolitem.h +++ b/gtk/gtktoolitem.h @@ -55,10 +55,14 @@ struct _GtkToolItemClass /* signals */ gboolean (* create_menu_proxy) (GtkToolItem *tool_item); void (* toolbar_reconfigured) (GtkToolItem *tool_item); +#ifndef GTK_DISABLE_DEPRECATED gboolean (* set_tooltip) (GtkToolItem *tool_item, GtkTooltips *tooltips, const gchar *tip_text, const gchar *tip_private); +#else + gpointer _set_tooltip; +#endif /* Padding for future expansion */ void (* _gtk_reserved1) (void); @@ -78,10 +82,16 @@ void gtk_tool_item_set_expand (GtkToolItem *tool_item, gboolean expand); gboolean gtk_tool_item_get_expand (GtkToolItem *tool_item); +#ifndef GTK_DISABLE_DEPRECATED void gtk_tool_item_set_tooltip (GtkToolItem *tool_item, GtkTooltips *tooltips, const gchar *tip_text, const gchar *tip_private); +#endif /* GTK_DISABLE_DEPRECATED */ +void gtk_tool_item_set_tooltip_text (GtkToolItem *toolitem, + const gchar *text); +void gtk_tool_item_set_tooltip_markup (GtkToolItem *toolitem, + const gchar *markup); void gtk_tool_item_set_use_drag_window (GtkToolItem *toolitem, gboolean use_drag_window); |