Commit 8d9e37f4 authored by Javier Jardón's avatar Javier Jardón

Remove all deprecated stuff from GtkContainer

parent 72323e6d
......@@ -985,7 +985,6 @@ gtk_combo_box_entry_get_type
GtkContainer
GTK_IS_RESIZE_CONTAINER
GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID
gtk_container_border_width
gtk_container_add
gtk_container_remove
gtk_container_add_with_properties
......@@ -993,7 +992,6 @@ gtk_container_get_resize_mode
gtk_container_set_resize_mode
gtk_container_check_resize
gtk_container_foreach
gtk_container_children
gtk_container_get_children
gtk_container_set_reallocate_redraws
gtk_container_get_focus_child
......
......@@ -219,14 +219,6 @@ properties in set_child_property() and get_child_property() implementations.
@pspec: the #GParamSpec of the property
<!-- ##### MACRO gtk_container_border_width ##### -->
<para>
Does the same as gtk_container_set_border_width().
</para>
@Deprecated: Use gtk_container_set_border_width() instead.
<!-- ##### FUNCTION gtk_container_add ##### -->
<para>
......@@ -292,14 +284,6 @@ Does the same as gtk_container_set_border_width().
@callback_data:
<!-- ##### MACRO gtk_container_children ##### -->
<para>
Does the same as gtk_container_get_children().
</para>
@Deprecated: Use gtk_container_get_children() instead.
<!-- ##### FUNCTION gtk_container_get_children ##### -->
<para>
......
......@@ -193,9 +193,9 @@ void sigh_button_event( GtkWidget *gtklist,
/* Look for already imprisoned list items, we
* will put them back into the list.
* Remember to free the doubly linked list that
* gtk_container_children() returns
* gtk_container_get_children() returns
*/
dlist = gtk_container_children (GTK_CONTAINER (frame));
dlist = gtk_container_get_children (GTK_CONTAINER (frame));
free_list = dlist;
while (dlist) {
GtkWidget *list_item;
......
......@@ -1557,36 +1557,6 @@ gtk_container_foreach_unmarshal (GtkWidget *child,
fdata->callback (fdata->container, fdata->callback_data, 1, args);
}
void
gtk_container_foreach_full (GtkContainer *container,
GtkCallback callback,
GtkCallbackMarshal marshal,
gpointer callback_data,
GDestroyNotify notify)
{
g_return_if_fail (GTK_IS_CONTAINER (container));
if (marshal)
{
GtkForeachData fdata;
fdata.container = GTK_OBJECT (container);
fdata.callback = marshal;
fdata.callback_data = callback_data;
gtk_container_foreach (container, gtk_container_foreach_unmarshal, &fdata);
}
else
{
g_return_if_fail (callback != NULL);
gtk_container_foreach (container, callback, &callback_data);
}
if (notify)
notify (callback_data);
}
/**
* gtk_container_set_focus_child:
* @container: a #GtkContainer
......
......@@ -122,19 +122,8 @@ void gtk_container_check_resize (GtkContainer *container);
void gtk_container_foreach (GtkContainer *container,
GtkCallback callback,
gpointer callback_data);
#ifndef GTK_DISABLE_DEPRECATED
void gtk_container_foreach_full (GtkContainer *container,
GtkCallback callback,
GtkCallbackMarshal marshal,
gpointer callback_data,
GDestroyNotify notify);
#endif /* GTK_DISABLE_DEPRECATED */
GList* gtk_container_get_children (GtkContainer *container);
#ifndef GTK_DISABLE_DEPRECATED
#define gtk_container_children gtk_container_get_children
#endif
void gtk_container_propagate_expose (GtkContainer *container,
GtkWidget *child,
GdkEventExpose *event);
......@@ -220,9 +209,6 @@ GList *_gtk_container_focus_sort (GtkContainer *container,
GtkDirectionType direction,
GtkWidget *old_focus);
#ifndef GTK_DISABLE_DEPRECATED
#define gtk_container_border_width gtk_container_set_border_width
#endif /* GTK_DISABLE_DEPRECATED */
G_END_DECLS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment