Ignore unmapped widgets when ignore_hidden is TRUE. (#344707, Christian

2006-06-16  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtksizegroup.c (compute_dimension): Ignore unmapped widgets
	when ignore_hidden is TRUE.  (#344707, Christian Persch)

diff --git a/ChangeLog b/ChangeLog
index f7bf4905176af08fc2093cbe88b837b190e64fe0..c4dc0df78bac55fe643c104d430a2f978c9d11bd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-06-16  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtksizegroup.c (compute_dimension): Ignore unmapped widgets
+       when ignore_hidden is TRUE.  (#344707, Christian Persch)
+
        * configure.in: Require cvs glib.
 
        * gtk/gtkprintoperation-unix.c: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f7bf4905176af08fc2093cbe88b837b190e64fe0..c4dc0df78bac55fe643c104d430a2f978c9d11bd 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2006-06-16  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtksizegroup.c (compute_dimension): Ignore unmapped widgets
+       when ignore_hidden is TRUE.  (#344707, Christian Persch)
+
        * configure.in: Require cvs glib.
 
        * gtk/gtkprintoperation-unix.c: 

diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c
index c1e4f683131337fd56a505e23dce448e3746c69a..ecd42c0fd722f0bc2eaaa3ca063fe826eb277d56 100644 (file)
--- a/gtk/gtksizegroup.c
+++ b/gtk/gtksizegroup.c
@@ -273,7 +273,7 @@ gtk_size_group_class_init (GtkSizeGroupClass *klass)
   /**
    * GtkSizeGroup:ignore-hidden:
    *
-   * If %TRUE, hidden widgets are ignored when determining 
+   * If %TRUE, unmapped widgets are ignored when determining 
    * the size of the group.
    *
    * Since: 2.8
@@ -282,7 +282,7 @@ gtk_size_group_class_init (GtkSizeGroupClass *klass)
                                   PROP_IGNORE_HIDDEN,
                                   g_param_spec_boolean ("ignore-hidden",
                                                         P_("Ignore hidden"),
-                                                        P_("If TRUE, hidden widgets are ignored "
+                                                        P_("If TRUE, unmapped widgets are ignored "
                                                            "when determining the size of the group"),
                                                         FALSE,
                                                         GTK_PARAM_READWRITE));
@@ -414,10 +414,10 @@ gtk_size_group_get_mode (GtkSizeGroup *size_group)
 /**
  * gtk_size_group_set_ignore_hidden:
  * @size_group: a #GtkSizeGroup
- * @ignore_hidden: whether hidden widgets should be ignored
+ * @ignore_hidden: whether unmapped widgets should be ignored
  *   when calculating the size
  * 
- * Sets whether invisible widgets should be ignored when
+ * Sets whether unmapped widgets should be ignored when
  * calculating the size.
  *
  * Since: 2.8 
@@ -632,7 +632,7 @@ compute_dimension (GtkWidget        *widget,
 
              gint dimension = compute_base_dimension (tmp_widget, mode);
 
-             if (GTK_WIDGET_VISIBLE (tmp_widget) || !group->ignore_hidden)
+             if (GTK_WIDGET_MAPPED (tmp_widget) || !group->ignore_hidden)
                {
                  if (dimension > result)
                    result = dimension;