callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[gtk/gtktoolitem] Remove deprecated GtkToolItem stuff

Browse Source 
This completes 221dcb6955cb89d1f89e71f442fc4c42fb76fcf3
This commit is contained in:
Javier Jardón
2009-12-07 22:42:08 +01:00
parent 04a548a463
commit d3fc78bfb6
4 changed files with 2 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
docs/reference/gtk/tmpl/gtktoolitem.sgml
View File

@ -108,17 +108,6 @@ GtkToolItem
@Returns: @Returns:
<!-- ##### FUNCTION gtk_tool_item_set_tooltip ##### -->
<para>
</para>
@tool_item:
@tooltips:
@tip_text:
@tip_private:
<!-- ##### FUNCTION gtk_tool_item_set_tooltip_text ##### --> <!-- ##### FUNCTION gtk_tool_item_set_tooltip_text ##### -->
<para> <para>

4
gtk/gtkmenutoolbutton.c
View File

@ -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 * @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 * 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. * on the whole #GtkMenuToolButton.
* *
* Since: 2.12 * 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 * @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 * 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. * tooltip on the whole #GtkMenuToolButton.
* *
* Since: 2.12 * Since: 2.12

21
gtk/gtktoolitem.c
View File

@ -137,10 +137,6 @@ static void gtk_tool_item_size_request (GtkWidget *widget,
GtkRequisition *requisition); GtkRequisition *requisition);
static void gtk_tool_item_size_allocate (GtkWidget *widget, static void gtk_tool_item_size_allocate (GtkWidget *widget,
GtkAllocation *allocation); 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_activatable_interface_init (GtkActivatableIface *iface);
static void gtk_tool_item_update (GtkActivatable *activatable, 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; widget_class->parent_set = gtk_tool_item_parent_set;
klass->create_menu_proxy = _gtk_tool_item_create_menu_proxy; 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, g_object_class_install_property (object_class,
PROP_VISIBLE_HORIZONTAL, 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: * gtk_tool_item_set_tooltip_text:
* @tool_item: a #GtkToolItem * @tool_item: a #GtkToolItem

8
gtk/gtktoolitem.h
View File

@ -60,14 +60,6 @@ struct _GtkToolItemClass
/* signals */ /* signals */
gboolean (* create_menu_proxy) (GtkToolItem *tool_item); gboolean (* create_menu_proxy) (GtkToolItem *tool_item);
void (* toolbar_reconfigured) (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 */ /* Padding for future expansion */
void (* _gtk_reserved1) (void); void (* _gtk_reserved1) (void);