Deprecate flag macros for toplevel, state, no window and composite child

[~andy/gtk] / gtk / gtksizegroup.c

diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c
index 7a8e9b95ee59d55953ca959ef28a81ec9be7dd9d..fb63aeb96252226abbaab2edee9f67463e604ab5 100644 (file)
--- a/gtk/gtksizegroup.c
+++ b/gtk/gtksizegroup.c
@@ -1,4 +1,4 @@
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * gtksizegroup.c: 
  * Copyright (C) 2001 Red Hat Software
  *
@@ -157,7 +157,7 @@ real_queue_resize (GtkWidget *widget)
   
   if (widget->parent)
     _gtk_container_queue_resize (GTK_CONTAINER (widget->parent));
-  else if (GTK_WIDGET_TOPLEVEL (widget) && GTK_IS_CONTAINER (widget))
+  else if (gtk_widget_is_toplevel (widget) && GTK_IS_CONTAINER (widget))
     _gtk_container_queue_resize (GTK_CONTAINER (widget));
 }
 
@@ -223,6 +223,10 @@ queue_resize_on_widget (GtkWidget *widget,
              if (widget == parent)
                real_queue_resize (parent);
            }
+         else if (tmp_list->data == widget)
+            {
+              g_warning ("A container and its child are part of this SizeGroup");
+            }
          else
            queue_resize_on_widget (tmp_list->data, FALSE);
 
@@ -249,6 +253,10 @@ queue_resize_on_widget (GtkWidget *widget,
              if (widget == parent)
                real_queue_resize (parent);
            }
+         else if (tmp_list->data == widget)
+            {
+              g_warning ("A container and its child are part of this SizeGroup");
+            }
          else
            queue_resize_on_widget (tmp_list->data, FALSE);
 
@@ -275,7 +283,7 @@ initialize_size_group_quarks (void)
   if (!size_groups_quark)
     {
       size_groups_quark = g_quark_from_static_string (size_groups_tag);
-      visited_quark = g_quark_from_string (visited_tag);
+      visited_quark = g_quark_from_static_string (visited_tag);
     }
 }
 
@@ -577,8 +585,8 @@ gtk_size_group_remove_widget (GtkSizeGroup *size_group,
  * 
  * Returns the list of widgets associated with @size_group.
  *
- * Return value: a #GSList of widgets. The list is owned by GTK+ 
- *   and should not be modified.
+ * Return value:  (element-type GtkWidget) (transfer none): a #GSList of
+ *   widgets. The list is owned by GTK+ and should not be modified.
  *
  * Since: 2.10
  **/
@@ -618,7 +626,7 @@ do_size_request (GtkWidget *widget)
       gtk_widget_ensure_style (widget);      
       GTK_PRIVATE_UNSET_FLAG (widget, GTK_REQUEST_NEEDED);
       g_signal_emit_by_name (widget,
-                            "size_request",
+                            "size-request",
                             &widget->requisition);
     }
 }