forked from AuroraMiddleware/gtk
Remove deprecated GtkContainer function and macros
This commit is contained in:
parent
1b32f7ad17
commit
0e3a46915e
@ -1553,36 +1553,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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user