From 991a7188ed0881bd5c1d26ef163bab13524baa60 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 23 Aug 2001 23:38:32 +0000 Subject: [PATCH] Rename gtk_container_children() to gtk_container_get_children. Added Thu Aug 23 19:33:54 2001 Owen Taylor * gtk/gtkcontainer.[ch]: Rename gtk_container_children() to gtk_container_get_children. Added deprecated compatibility macro. (Suggested by Vitaly Tishkov, #59051) * gtk/gtktoolbar.c gtkdialog.c: Fix gtk_container_children() calls. --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-0 | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gtk/gtkcontainer.c | 2 +- gtk/gtkcontainer.h | 7 ++++++- gtk/gtkdialog.c | 4 ++-- gtk/gtktoolbar.c | 4 ++-- 11 files changed, 74 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9c59f8738..859d73ef57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Thu Aug 23 19:33:54 2001 Owen Taylor + + * gtk/gtkcontainer.[ch]: Rename gtk_container_children() + to gtk_container_get_children. Added deprecated compatibility + macro. (Suggested by Vitaly Tishkov, #59051) + + * gtk/gtktoolbar.c gtkdialog.c: Fix gtk_container_children() + calls. + Thu Aug 23 19:10:01 2001 Owen Taylor * gtk/gtkmenubar.h (gtk_menu_bar_insert): Deprecate diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index d9c59f8738..859d73ef57 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +Thu Aug 23 19:33:54 2001 Owen Taylor + + * gtk/gtkcontainer.[ch]: Rename gtk_container_children() + to gtk_container_get_children. Added deprecated compatibility + macro. (Suggested by Vitaly Tishkov, #59051) + + * gtk/gtktoolbar.c gtkdialog.c: Fix gtk_container_children() + calls. + Thu Aug 23 19:10:01 2001 Owen Taylor * gtk/gtkmenubar.h (gtk_menu_bar_insert): Deprecate diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d9c59f8738..859d73ef57 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Thu Aug 23 19:33:54 2001 Owen Taylor + + * gtk/gtkcontainer.[ch]: Rename gtk_container_children() + to gtk_container_get_children. Added deprecated compatibility + macro. (Suggested by Vitaly Tishkov, #59051) + + * gtk/gtktoolbar.c gtkdialog.c: Fix gtk_container_children() + calls. + Thu Aug 23 19:10:01 2001 Owen Taylor * gtk/gtkmenubar.h (gtk_menu_bar_insert): Deprecate diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index d9c59f8738..859d73ef57 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +Thu Aug 23 19:33:54 2001 Owen Taylor + + * gtk/gtkcontainer.[ch]: Rename gtk_container_children() + to gtk_container_get_children. Added deprecated compatibility + macro. (Suggested by Vitaly Tishkov, #59051) + + * gtk/gtktoolbar.c gtkdialog.c: Fix gtk_container_children() + calls. + Thu Aug 23 19:10:01 2001 Owen Taylor * gtk/gtkmenubar.h (gtk_menu_bar_insert): Deprecate diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d9c59f8738..859d73ef57 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Thu Aug 23 19:33:54 2001 Owen Taylor + + * gtk/gtkcontainer.[ch]: Rename gtk_container_children() + to gtk_container_get_children. Added deprecated compatibility + macro. (Suggested by Vitaly Tishkov, #59051) + + * gtk/gtktoolbar.c gtkdialog.c: Fix gtk_container_children() + calls. + Thu Aug 23 19:10:01 2001 Owen Taylor * gtk/gtkmenubar.h (gtk_menu_bar_insert): Deprecate diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d9c59f8738..859d73ef57 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Thu Aug 23 19:33:54 2001 Owen Taylor + + * gtk/gtkcontainer.[ch]: Rename gtk_container_children() + to gtk_container_get_children. Added deprecated compatibility + macro. (Suggested by Vitaly Tishkov, #59051) + + * gtk/gtktoolbar.c gtkdialog.c: Fix gtk_container_children() + calls. + Thu Aug 23 19:10:01 2001 Owen Taylor * gtk/gtkmenubar.h (gtk_menu_bar_insert): Deprecate diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d9c59f8738..859d73ef57 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Thu Aug 23 19:33:54 2001 Owen Taylor + + * gtk/gtkcontainer.[ch]: Rename gtk_container_children() + to gtk_container_get_children. Added deprecated compatibility + macro. (Suggested by Vitaly Tishkov, #59051) + + * gtk/gtktoolbar.c gtkdialog.c: Fix gtk_container_children() + calls. + Thu Aug 23 19:10:01 2001 Owen Taylor * gtk/gtkmenubar.h (gtk_menu_bar_insert): Deprecate diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c index fa7d1402b5..ccda2e663a 100644 --- a/gtk/gtkcontainer.c +++ b/gtk/gtkcontainer.c @@ -1398,7 +1398,7 @@ gtk_container_set_focus_child (GtkContainer *container, } GList* -gtk_container_children (GtkContainer *container) +gtk_container_get_children (GtkContainer *container) { GList *children; diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h index a4651c0aa7..ceb1272991 100644 --- a/gtk/gtkcontainer.h +++ b/gtk/gtkcontainer.h @@ -127,7 +127,12 @@ void gtk_container_foreach_full (GtkContainer *container, GtkCallbackMarshal marshal, gpointer callback_data, GtkDestroyNotify notify); -GList* gtk_container_children (GtkContainer *container); +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); diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c index 8e77e60efc..15398ce199 100644 --- a/gtk/gtkdialog.c +++ b/gtk/gtkdialog.c @@ -631,7 +631,7 @@ gtk_dialog_set_response_sensitive (GtkDialog *dialog, GList *children; GList *tmp_list; - children = gtk_container_children (GTK_CONTAINER (dialog)); + children = gtk_container_get_children (GTK_CONTAINER (dialog)); tmp_list = children; while (tmp_list != NULL) @@ -666,7 +666,7 @@ gtk_dialog_set_default_response (GtkDialog *dialog, GList *children; GList *tmp_list; - children = gtk_container_children (GTK_CONTAINER (dialog->action_area)); + children = gtk_container_get_children (GTK_CONTAINER (dialog->action_area)); tmp_list = children; while (tmp_list != NULL) diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index fd6a809c55..27e5ec4e1e 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -1588,7 +1588,7 @@ gtk_real_toolbar_style_changed (GtkToolbar *toolbar, if (child->label && !GTK_WIDGET_VISIBLE (child->label)) gtk_widget_show (child->label); - box = (GtkWidget*)gtk_container_children (GTK_CONTAINER (child->widget))->data; + box = (GtkWidget*)gtk_container_get_children (GTK_CONTAINER (child->widget))->data; if (GTK_IS_HBOX (box)) { @@ -1632,7 +1632,7 @@ gtk_real_toolbar_style_changed (GtkToolbar *toolbar, if (child->label && !GTK_WIDGET_VISIBLE (child->label)) gtk_widget_show (child->label); - box = (GtkWidget*)gtk_container_children (GTK_CONTAINER (child->widget))->data; + box = (GtkWidget*)gtk_container_get_children (GTK_CONTAINER (child->widget))->data; if (GTK_IS_VBOX (box)) {