AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Remove deprecated GtkContainer function and macros"

Browse Source 
This reverts commit 0e3a46915e.
This commit is contained in:
Michael Natterer 2009-10-10 18:26:07 +02:00
parent 0e3a46915e
commit 59f2a62e9c
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gtk/gtkcontainer.c
View File

@ -1553,6 +1553,36 @@ 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

14
gtk/gtkcontainer.h
View File

@ -122,8 +122,19 @@ 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);
@ -209,6 +220,9 @@ 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