diff --git a/gtk/gtktoolitem.c b/gtk/gtktoolitem.c index 606ce1e847..b6b3491ab0 100644 --- a/gtk/gtktoolitem.c +++ b/gtk/gtktoolitem.c @@ -78,7 +78,6 @@ enum { CREATE_MENU_PROXY, TOOLBAR_RECONFIGURED, - SET_TOOLTIP, LAST_SIGNAL }; @@ -274,33 +273,6 @@ gtk_tool_item_class_init (GtkToolItemClass *klass) NULL, NULL, _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); -/** - * GtkToolItem::set-tooltip: - * @tool_item: the object the signal was emitted on - * @tooltips: the #GtkTooltips - * @tip_text: the tooltip text - * @tip_private: the tooltip private text - * - * This signal is emitted when the toolitem's tooltip changes. - * Application developers can use gtk_tool_item_set_tooltip() to - * set the item's tooltip. - * - * Return value: %TRUE if the signal was handled, %FALSE if not - * - * Deprecated: 2.12: With the new tooltip API, there is no - * need to use this signal anymore. - **/ - toolitem_signals[SET_TOOLTIP] = - g_signal_new (I_("set-tooltip"), - G_OBJECT_CLASS_TYPE (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkToolItemClass, set_tooltip), - _gtk_boolean_handled_accumulator, NULL, - _gtk_marshal_BOOLEAN__OBJECT_STRING_STRING, - G_TYPE_BOOLEAN, 3, - GTK_TYPE_TOOLTIPS, - G_TYPE_STRING, - G_TYPE_STRING); g_type_class_add_private (object_class, sizeof (GtkToolItemPrivate)); } @@ -1093,35 +1065,6 @@ gtk_tool_item_real_set_tooltip (GtkToolItem *tool_item, return TRUE; } -/** - * gtk_tool_item_set_tooltip: - * @tool_item: a #GtkToolItem - * @tooltips: The #GtkTooltips object to be used - * @tip_text: (allow-none): text to be used as tooltip text for @tool_item - * @tip_private: (allow-none): text to be used as private tooltip text - * - * Sets the #GtkTooltips object to be used for @tool_item, the - * text to be displayed as tooltip on the item and the private text - * 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, - GtkTooltips *tooltips, - const gchar *tip_text, - const gchar *tip_private) -{ - gboolean retval; - - g_return_if_fail (GTK_IS_TOOL_ITEM (tool_item)); - - g_signal_emit (tool_item, toolitem_signals[SET_TOOLTIP], 0, - tooltips, tip_text, tip_private, &retval); -} - /** * gtk_tool_item_set_tooltip_text: * @tool_item: a #GtkToolItem diff --git a/gtk/gtktoolitem.h b/gtk/gtktoolitem.h index 7f8d9ada18..882530ad98 100644 --- a/gtk/gtktoolitem.h +++ b/gtk/gtktoolitem.h @@ -86,13 +86,6 @@ gboolean gtk_tool_item_get_homogeneous (GtkToolItem *tool_item); 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 *tool_item, const gchar *text); void gtk_tool_item_set_tooltip_markup (GtkToolItem *tool_item,