From d3fc78bfb6883dcda40b5698691374385106abfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Mon, 7 Dec 2009 22:42:08 +0100
Subject: [PATCH] [gtk/gtktoolitem] Remove deprecated GtkToolItem stuff

This completes 221dcb6955cb89d1f89e71f442fc4c42fb76fcf3
---
 docs/reference/gtk/tmpl/gtktoolitem.sgml | 11 -----------
 gtk/gtkmenutoolbutton.c                  |  4 ++--
 gtk/gtktoolitem.c                        | 21 ---------------------
 gtk/gtktoolitem.h                        |  8 --------
 4 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/docs/reference/gtk/tmpl/gtktoolitem.sgml b/docs/reference/gtk/tmpl/gtktoolitem.sgml
index 53a5799ac2..ecef9107ff 100644
--- a/docs/reference/gtk/tmpl/gtktoolitem.sgml
+++ b/docs/reference/gtk/tmpl/gtktoolitem.sgml
@@ -108,17 +108,6 @@ GtkToolItem
 @Returns: 
 
 
-<!-- ##### FUNCTION gtk_tool_item_set_tooltip ##### -->
-<para>
-
-</para>
-
-@tool_item: 
-@tooltips: 
-@tip_text: 
-@tip_private: 
-
-
 <!-- ##### FUNCTION gtk_tool_item_set_tooltip_text ##### -->
 <para>
 
diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c
index 59e0681ce8..425f8d5d74 100644
--- a/gtk/gtkmenutoolbutton.c
+++ b/gtk/gtkmenutoolbutton.c
@@ -598,7 +598,7 @@ gtk_menu_tool_button_get_menu (GtkMenuToolButton *button)
  * @text: text to be used as tooltip text for button's arrow button
  *
  * Sets the tooltip text to be used as tooltip for the arrow button which
- * pops up the menu.  See gtk_tool_item_set_tooltip() for setting a tooltip
+ * pops up the menu.  See gtk_tool_item_set_tooltip_text() for setting a tooltip
  * on the whole #GtkMenuToolButton.
  *
  * Since: 2.12
@@ -618,7 +618,7 @@ gtk_menu_tool_button_set_arrow_tooltip_text (GtkMenuToolButton *button,
  * @markup: markup text to be used as tooltip text for button's arrow button
  *
  * Sets the tooltip markup text to be used as tooltip for the arrow button
- * which pops up the menu.  See gtk_tool_item_set_tooltip() for setting a
+ * which pops up the menu.  See gtk_tool_item_set_tooltip_text() for setting a
  * tooltip on the whole #GtkMenuToolButton.
  *
  * Since: 2.12
diff --git a/gtk/gtktoolitem.c b/gtk/gtktoolitem.c
index b6b3491ab0..17309e9331 100644
--- a/gtk/gtktoolitem.c
+++ b/gtk/gtktoolitem.c
@@ -137,10 +137,6 @@ static void gtk_tool_item_size_request  (GtkWidget      *widget,
 					 GtkRequisition *requisition);
 static void gtk_tool_item_size_allocate (GtkWidget      *widget,
 					 GtkAllocation  *allocation);
-static gboolean gtk_tool_item_real_set_tooltip (GtkToolItem *tool_item,
-						GtkTooltips *tooltips,
-						const gchar *tip_text,
-						const gchar *tip_private);
 
 static void gtk_tool_item_activatable_interface_init (GtkActivatableIface  *iface);
 static void gtk_tool_item_update                     (GtkActivatable       *activatable,
@@ -183,7 +179,6 @@ gtk_tool_item_class_init (GtkToolItemClass *klass)
   widget_class->parent_set    = gtk_tool_item_parent_set;
 
   klass->create_menu_proxy = _gtk_tool_item_create_menu_proxy;
-  klass->set_tooltip       = gtk_tool_item_real_set_tooltip;
   
   g_object_class_install_property (object_class,
 				   PROP_VISIBLE_HORIZONTAL,
@@ -1049,22 +1044,6 @@ gtk_tool_item_set_is_important (GtkToolItem *tool_item, gboolean is_important)
     }
 }
 
-static gboolean
-gtk_tool_item_real_set_tooltip (GtkToolItem *tool_item,
-				GtkTooltips *tooltips,
-				const gchar *tip_text,
-				const gchar *tip_private)
-{
-  GtkWidget *child = GTK_BIN (tool_item)->child;
-
-  if (!child)
-    return FALSE;
-
-  gtk_widget_set_tooltip_text (child, tip_text);
-
-  return TRUE;
-}
-
 /**
  * gtk_tool_item_set_tooltip_text:
  * @tool_item: a #GtkToolItem 
diff --git a/gtk/gtktoolitem.h b/gtk/gtktoolitem.h
index 5c05f3096d..a3db72a709 100644
--- a/gtk/gtktoolitem.h
+++ b/gtk/gtktoolitem.h
@@ -60,14 +60,6 @@ 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);