From bb1824c131f247c2ef64f3c5f8b9ffe3885c9d90 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 4 Jan 2010 07:49:26 +0100 Subject: Deprecate flag macros for toplevel, state, no window and composite child Deprecate widget flag macros GTK_WIDGET_STATE, GTK_WIDGET_SAVED_STATE, GTK_WIDGET_FLAGS, GTK_WIDGET_TOPLEVEL, GTK_WIDGET_NO_WINDOW and GTK_WIDGET_COMPOSITE_CHILD. Also deprecate the type macros GTK_WIDGET_TYPE, GTK_OBJECT_TYPE_NAME and GTK_OBJECT_TYPE which have become redundant. Instances of GTK_WIDGET_TOPLEVEL are replaced with gtk_widget_is_toplevel, GTK_WIDGET_TYPE is replaced with G_OBJECT_TYPE, GTK_WIDGET_COMPOSITE_CHILD is replaced with use of the "composite-child" property and uses of GTK_WIDGET_NO_WINDOW are adjusted to use gtk_widget_get_has_window. Uses of GTK_WIDGET_SAVED_STATE and GTK_WIDGET_FLAGS inside GtkWidget are changed to direct flag usage. Documentation is updated to refer to gtk_widget_set_has_window and gtk_widget_get_has_window. Gail and tests are updated as well. Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=69872 --- gtk/gtkassistant.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gtk/gtkassistant.c') diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c index f43193e68c..5ee37c112e 100644 --- a/gtk/gtkassistant.c +++ b/gtk/gtkassistant.c @@ -1695,7 +1695,7 @@ gtk_assistant_insert_page (GtkAssistant *assistant, g_return_val_if_fail (GTK_IS_ASSISTANT (assistant), 0); g_return_val_if_fail (GTK_IS_WIDGET (page), 0); g_return_val_if_fail (page->parent == NULL, 0); - g_return_val_if_fail (!GTK_WIDGET_TOPLEVEL (page), 0); + g_return_val_if_fail (!gtk_widget_is_toplevel (page), 0); priv = assistant->priv; -- cgit v1.2.1