Commit 77c28630 authored by Matthias Clasen's avatar Matthias Clasen

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)
parent 26b4dd28
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
......
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
......
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
......
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
......
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
......
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
......
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
......
......@@ -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
......
......@@ -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 *
......
......@@ -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*
......
......@@ -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 (<!>);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment