summaryrefslogtreecommitdiff
path: root/gtk/gtktoolbar.h
diff options
context:
space:
mode:
authorKristian Rietveld <kris@imendio.com>2007-07-09 19:23:18 +0000
committerKristian Rietveld <kristian@src.gnome.org>2007-07-09 19:23:18 +0000
commitc255676e25b2aac01c8e9c2dcf65de5c909a4613 (patch)
treeac2ef88ce9ba7910510d83ba8a669aaa631d6944 /gtk/gtktoolbar.h
parent3461e2340a83ac9da89de9c9e3c476193ba2fc55 (diff)
downloadgtk+-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/gtktoolbar.h')
-rw-r--r--gtk/gtktoolbar.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h
index 24c0dde34d..dbe72a8167 100644
--- a/gtk/gtktoolbar.h
+++ b/gtk/gtktoolbar.h
@@ -99,7 +99,11 @@ struct _GtkToolbar
GtkToolbarStyle style;
GtkIconSize icon_size;
+#ifndef GTK_DISABLE_DEPRECATED
GtkTooltips *tooltips;
+#else
+ gpointer _tooltips;
+#endif
/*< private >*/
gint button_maxw; /* maximum width of homogeneous children */