Mark children as composite. (#66360)

        * gtk/gtkcolorsel.c, gtk/gtkfilesel.c, gtk/gtkfontsel.c:
        Mark children as composite. (#66360)

        * gtk/gtkwidget.c (gtk_widget_push_composite_child): Explain
        composite children some more. (#66360)

diff --git a/ChangeLog b/ChangeLog
index b301f95861da6f5061cc4fa972c9108cfb8c194e..62e539d724f613641b3393cfc168a0f549b878f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-17  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkcolorsel.c, gtk/gtkfilesel.c, gtk/gtkfontsel.c:
+       Mark children as composite. (#66360)
+
+       * gtk/gtkwidget.c (gtk_widget_push_composite_child): Explain
+       composite children some more. (#66360)
+
 2002-01-17  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextlayout.c (_gtk_text_layout_get_line_xrange): new

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b301f95861da6f5061cc4fa972c9108cfb8c194e..62e539d724f613641b3393cfc168a0f549b878f7 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+2002-01-17  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkcolorsel.c, gtk/gtkfilesel.c, gtk/gtkfontsel.c:
+       Mark children as composite. (#66360)
+
+       * gtk/gtkwidget.c (gtk_widget_push_composite_child): Explain
+       composite children some more. (#66360)
+
 2002-01-17  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextlayout.c (_gtk_text_layout_get_line_xrange): new

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b301f95861da6f5061cc4fa972c9108cfb8c194e..62e539d724f613641b3393cfc168a0f549b878f7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2002-01-17  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkcolorsel.c, gtk/gtkfilesel.c, gtk/gtkfontsel.c:
+       Mark children as composite. (#66360)
+
+       * gtk/gtkwidget.c (gtk_widget_push_composite_child): Explain
+       composite children some more. (#66360)
+
 2002-01-17  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextlayout.c (_gtk_text_layout_get_line_xrange): new

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b301f95861da6f5061cc4fa972c9108cfb8c194e..62e539d724f613641b3393cfc168a0f549b878f7 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+2002-01-17  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkcolorsel.c, gtk/gtkfilesel.c, gtk/gtkfontsel.c:
+       Mark children as composite. (#66360)
+
+       * gtk/gtkwidget.c (gtk_widget_push_composite_child): Explain
+       composite children some more. (#66360)
+
 2002-01-17  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextlayout.c (_gtk_text_layout_get_line_xrange): new

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b301f95861da6f5061cc4fa972c9108cfb8c194e..62e539d724f613641b3393cfc168a0f549b878f7 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2002-01-17  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkcolorsel.c, gtk/gtkfilesel.c, gtk/gtkfontsel.c:
+       Mark children as composite. (#66360)
+
+       * gtk/gtkwidget.c (gtk_widget_push_composite_child): Explain
+       composite children some more. (#66360)
+
 2002-01-17  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextlayout.c (_gtk_text_layout_get_line_xrange): new

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b301f95861da6f5061cc4fa972c9108cfb8c194e..62e539d724f613641b3393cfc168a0f549b878f7 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2002-01-17  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkcolorsel.c, gtk/gtkfilesel.c, gtk/gtkfontsel.c:
+       Mark children as composite. (#66360)
+
+       * gtk/gtkwidget.c (gtk_widget_push_composite_child): Explain
+       composite children some more. (#66360)
+
 2002-01-17  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextlayout.c (_gtk_text_layout_get_line_xrange): new

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b301f95861da6f5061cc4fa972c9108cfb8c194e..62e539d724f613641b3393cfc168a0f549b878f7 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2002-01-17  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkcolorsel.c, gtk/gtkfilesel.c, gtk/gtkfontsel.c:
+       Mark children as composite. (#66360)
+
+       * gtk/gtkwidget.c (gtk_widget_push_composite_child): Explain
+       composite children some more. (#66360)
+
 2002-01-17  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextlayout.c (_gtk_text_layout_get_line_xrange): new

diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index 64be1c05b369f49807d0cf752e1b0092dea538e8..c6e455e20c44eb19d6a852b514b937266ca7e604 100644 (file)
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -1750,6 +1750,8 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
   gint i, j;
   ColorSelectionPrivate *priv;
   
+  gtk_widget_push_composite_child ();
+
   priv = colorsel->private_data = g_new0 (ColorSelectionPrivate, 1);
   priv->changing = FALSE;
   priv->default_set = FALSE;
@@ -1904,6 +1906,8 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
     {
       gtk_widget_hide (priv->palette_frame);
     }
+
+  gtk_widget_pop_composite_child ();
 }
 
 static void

diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c
index 88e620940ce291ef1c90b4f9e67290a7904dfa69..8845018b8ef1ba880f5a5ccde4f03f1b6e769628 100644 (file)
--- a/gtk/gtkfilesel.c
+++ b/gtk/gtkfilesel.c
@@ -603,6 +603,8 @@ gtk_file_selection_init (GtkFileSelection *filesel)
   char *dir_title [2];
   char *file_title [2];
 
+  gtk_widget_push_composite_child ();
+
   dialog = GTK_DIALOG (filesel);
 
   filesel->cmpl_state = cmpl_init_state ();
@@ -738,6 +740,8 @@ gtk_file_selection_init (GtkFileSelection *filesel)
     }
 
   gtk_widget_grab_focus (filesel->selection_entry);
+
+  gtk_widget_pop_composite_child ();
 }
 
 static gchar *

diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index a2aa274699604ab592facb571409b44bbede6d73..d24fa160d3c5f6a82a5968e7cf53cccaea7d229e 100644 (file)
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -262,6 +262,8 @@ gtk_font_selection_init (GtkFontSelection *fontsel)
   GtkWidget *text_box;
   GtkWidget *table, *label;
 
+  gtk_widget_push_composite_child ();
+
   fontsel->size = 12 * PANGO_SCALE;
   
   /* Create the table of font, style & size. */
@@ -410,6 +412,8 @@ gtk_font_selection_init (GtkFontSelection *fontsel)
                      TRUE, TRUE, 0);
 
   gtk_font_selection_update_preview (fontsel);
+
+  gtk_widget_pop_composite_child();
 }
 
 GtkWidget *
@@ -1017,6 +1021,8 @@ gtk_font_selection_dialog_init (GtkFontSelectionDialog *fontseldiag)
 {
   GtkDialog *dialog;
 
+  gtk_widget_push_composite_child ();
+
   dialog = GTK_DIALOG (fontseldiag);
   
   fontseldiag->dialog_width = -1;
@@ -1058,6 +1064,7 @@ gtk_font_selection_dialog_init (GtkFontSelectionDialog *fontseldiag)
   gtk_window_set_title (GTK_WINDOW (fontseldiag),
                         _("Font Selection"));
 
+  gtk_widget_pop_composite_child ();
 }
 
 GtkWidget*

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index e2238db7be98887926e26d90197d5118095a2a0f..c2eeae37a157376891aa9815077787b31b37e381 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -5284,6 +5284,12 @@ gtk_widget_get_composite_name (GtkWidget *widget)
  * Makes all newly-created widgets as composite children until
  * the corresponding gtk_widget_pop_composite_child() call.
  * 
+ * A composite child is a child that's an implementation detail of the
+ * container it's inside and should not be visible to people using the
+ * container. Composite children aren't treated differently by GTK (but
+ * see gtk_container_foreach() vs. gtk_container_forall()), but e.g. GUI 
+ * builders might want to treat them in a different way.
+ * 
  * Here is a simple example:
  * <informalexample><programlisting>
  * <!>  gtk_widget_push_composite_child (<!>);