* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
+ * file for a list of people on the GTK+ Team. See the ChangeLog
+ * files for a list of changes. These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+#include <config.h>
#include "gtkbox.h"
+#include "gtkprivate.h"
+#include "gtkintl.h"
+#include "gtkalias.h"
enum {
- ARG_0,
- ARG_SPACING,
- ARG_HOMOGENEOUS
+ PROP_0,
+ PROP_SPACING,
+ PROP_HOMOGENEOUS
+};
+
+enum {
+ CHILD_PROP_0,
+ CHILD_PROP_EXPAND,
+ CHILD_PROP_FILL,
+ CHILD_PROP_PADDING,
+ CHILD_PROP_PACK_TYPE,
+ CHILD_PROP_POSITION
};
static void gtk_box_class_init (GtkBoxClass *klass);
static void gtk_box_init (GtkBox *box);
-static void gtk_box_get_arg (GtkBox *box,
- GtkArg *arg,
- guint arg_id);
-static void gtk_box_set_arg (GtkBox *box,
- GtkArg *arg,
- guint arg_id);
-static void gtk_box_destroy (GtkObject *object);
-static void gtk_box_map (GtkWidget *widget);
-static void gtk_box_unmap (GtkWidget *widget);
-static void gtk_box_draw (GtkWidget *widget,
- GdkRectangle *area);
-static gint gtk_box_expose (GtkWidget *widget,
- GdkEventExpose *event);
+static void gtk_box_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gtk_box_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
static void gtk_box_add (GtkContainer *container,
GtkWidget *widget);
static void gtk_box_remove (GtkContainer *container,
GtkWidget *widget);
-static void gtk_box_foreach (GtkContainer *container,
+static void gtk_box_forall (GtkContainer *container,
+ gboolean include_internals,
GtkCallback callback,
gpointer callback_data);
-
+static void gtk_box_set_child_property (GtkContainer *container,
+ GtkWidget *child,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gtk_box_get_child_property (GtkContainer *container,
+ GtkWidget *child,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec);
+static GType gtk_box_child_type (GtkContainer *container);
+
static GtkContainerClass *parent_class = NULL;
-guint
-gtk_box_get_type ()
+GType
+gtk_box_get_type (void)
{
- static guint box_type = 0;
+ static GType box_type = 0;
if (!box_type)
{
- GtkTypeInfo box_info =
+ static const GTypeInfo box_info =
{
- "GtkBox",
- sizeof (GtkBox),
sizeof (GtkBoxClass),
- (GtkClassInitFunc) gtk_box_class_init,
- (GtkObjectInitFunc) gtk_box_init,
- (GtkArgSetFunc) gtk_box_set_arg,
- (GtkArgGetFunc) gtk_box_get_arg,
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gtk_box_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkBox),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gtk_box_init,
+ NULL, /* value_table */
};
- box_type = gtk_type_unique (gtk_container_get_type (), &box_info);
+ box_type = g_type_register_static (GTK_TYPE_CONTAINER, I_("GtkBox"),
+ &box_info, G_TYPE_FLAG_ABSTRACT);
}
return box_type;
static void
gtk_box_class_init (GtkBoxClass *class)
{
- GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
- GtkContainerClass *container_class;
-
- object_class = (GtkObjectClass*) class;
- widget_class = (GtkWidgetClass*) class;
- container_class = (GtkContainerClass*) class;
-
- parent_class = gtk_type_class (gtk_container_get_type ());
-
- gtk_object_add_arg_type ("GtkBox::spacing", GTK_TYPE_INT, ARG_SPACING);
- gtk_object_add_arg_type ("GtkBox::homogeneous", GTK_TYPE_BOOL, ARG_HOMOGENEOUS);
-
- object_class->destroy = gtk_box_destroy;
+ GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+ GtkContainerClass *container_class = GTK_CONTAINER_CLASS (class);
- widget_class->map = gtk_box_map;
- widget_class->unmap = gtk_box_unmap;
- widget_class->draw = gtk_box_draw;
- widget_class->expose_event = gtk_box_expose;
+ parent_class = g_type_class_peek_parent (class);
+ gobject_class->set_property = gtk_box_set_property;
+ gobject_class->get_property = gtk_box_get_property;
+
container_class->add = gtk_box_add;
container_class->remove = gtk_box_remove;
- container_class->foreach = gtk_box_foreach;
+ container_class->forall = gtk_box_forall;
+ container_class->child_type = gtk_box_child_type;
+ container_class->set_child_property = gtk_box_set_child_property;
+ container_class->get_child_property = gtk_box_get_child_property;
+
+ g_object_class_install_property (gobject_class,
+ PROP_SPACING,
+ g_param_spec_int ("spacing",
+ P_("Spacing"),
+ P_("The amount of space between children"),
+ 0,
+ G_MAXINT,
+ 0,
+ GTK_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_HOMOGENEOUS,
+ g_param_spec_boolean ("homogeneous",
+ P_("Homogeneous"),
+ P_("Whether the children should all be the same size"),
+ FALSE,
+ GTK_PARAM_READWRITE));
+
+ gtk_container_class_install_child_property (container_class,
+ CHILD_PROP_EXPAND,
+ g_param_spec_boolean ("expand",
+ P_("Expand"),
+ P_("Whether the child should receive extra space when the parent grows"),
+ TRUE,
+ GTK_PARAM_READWRITE));
+ gtk_container_class_install_child_property (container_class,
+ CHILD_PROP_FILL,
+ g_param_spec_boolean ("fill",
+ P_("Fill"),
+ P_("Whether extra space given to the child should be allocated to the child or used as padding"),
+ TRUE,
+ GTK_PARAM_READWRITE));
+ gtk_container_class_install_child_property (container_class,
+ CHILD_PROP_PADDING,
+ g_param_spec_uint ("padding",
+ P_("Padding"),
+ P_("Extra space to put between the child and its neighbors, in pixels"),
+ 0, G_MAXINT, 0,
+ GTK_PARAM_READWRITE));
+ gtk_container_class_install_child_property (container_class,
+ CHILD_PROP_PACK_TYPE,
+ g_param_spec_enum ("pack-type",
+ P_("Pack type"),
+ P_("A GtkPackType indicating whether the child is packed with reference to the start or end of the parent"),
+ GTK_TYPE_PACK_TYPE, GTK_PACK_START,
+ GTK_PARAM_READWRITE));
+ gtk_container_class_install_child_property (container_class,
+ CHILD_PROP_POSITION,
+ g_param_spec_int ("position",
+ P_("Position"),
+ P_("The index of the child in the parent"),
+ -1, G_MAXINT, 0,
+ GTK_PARAM_READWRITE));
}
static void
gtk_box_init (GtkBox *box)
{
- GTK_WIDGET_SET_FLAGS (box, GTK_NO_WINDOW | GTK_BASIC);
-
+ GTK_WIDGET_SET_FLAGS (box, GTK_NO_WINDOW);
+ gtk_widget_set_redraw_on_allocate (GTK_WIDGET (box), FALSE);
+
box->children = NULL;
box->spacing = 0;
box->homogeneous = FALSE;
}
+static void
+gtk_box_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ GtkBox *box;
+
+ box = GTK_BOX (object);
+
+ switch (prop_id)
+ {
+ case PROP_SPACING:
+ gtk_box_set_spacing (box, g_value_get_int (value));
+ break;
+ case PROP_HOMOGENEOUS:
+ gtk_box_set_homogeneous (box, g_value_get_boolean (value));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+static void gtk_box_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GtkBox *box;
+
+ box = GTK_BOX (object);
+
+ switch (prop_id)
+ {
+ case PROP_SPACING:
+ g_value_set_int (value, box->spacing);
+ break;
+ case PROP_HOMOGENEOUS:
+ g_value_set_boolean (value, box->homogeneous);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+static GType
+gtk_box_child_type (GtkContainer *container)
+{
+ return GTK_TYPE_WIDGET;
+}
+
static void
-gtk_box_set_arg (GtkBox *box,
- GtkArg *arg,
- guint arg_id)
+gtk_box_set_child_property (GtkContainer *container,
+ GtkWidget *child,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
- switch (arg_id)
+ gboolean expand = 0;
+ gboolean fill = 0;
+ guint padding = 0;
+ GtkPackType pack_type = 0;
+
+ if (property_id != CHILD_PROP_POSITION)
+ gtk_box_query_child_packing (GTK_BOX (container),
+ child,
+ &expand,
+ &fill,
+ &padding,
+ &pack_type);
+ switch (property_id)
{
- case ARG_SPACING:
- gtk_box_set_spacing (box, GTK_VALUE_INT (*arg));
+ case CHILD_PROP_EXPAND:
+ gtk_box_set_child_packing (GTK_BOX (container),
+ child,
+ g_value_get_boolean (value),
+ fill,
+ padding,
+ pack_type);
+ break;
+ case CHILD_PROP_FILL:
+ gtk_box_set_child_packing (GTK_BOX (container),
+ child,
+ expand,
+ g_value_get_boolean (value),
+ padding,
+ pack_type);
+ break;
+ case CHILD_PROP_PADDING:
+ gtk_box_set_child_packing (GTK_BOX (container),
+ child,
+ expand,
+ fill,
+ g_value_get_uint (value),
+ pack_type);
break;
- case ARG_HOMOGENEOUS:
- gtk_box_set_homogeneous (box, GTK_VALUE_BOOL (*arg));
+ case CHILD_PROP_PACK_TYPE:
+ gtk_box_set_child_packing (GTK_BOX (container),
+ child,
+ expand,
+ fill,
+ padding,
+ g_value_get_enum (value));
+ break;
+ case CHILD_PROP_POSITION:
+ gtk_box_reorder_child (GTK_BOX (container),
+ child,
+ g_value_get_int (value));
+ break;
+ default:
+ GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
break;
}
}
static void
-gtk_box_get_arg (GtkBox *box,
- GtkArg *arg,
- guint arg_id)
+gtk_box_get_child_property (GtkContainer *container,
+ GtkWidget *child,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
{
- switch (arg_id)
+ gboolean expand = 0;
+ gboolean fill = 0;
+ guint padding = 0;
+ GtkPackType pack_type = 0;
+ GList *list;
+
+ if (property_id != CHILD_PROP_POSITION)
+ gtk_box_query_child_packing (GTK_BOX (container),
+ child,
+ &expand,
+ &fill,
+ &padding,
+ &pack_type);
+ switch (property_id)
{
- case ARG_SPACING:
- GTK_VALUE_INT (*arg) = box->spacing;
+ guint i;
+ case CHILD_PROP_EXPAND:
+ g_value_set_boolean (value, expand);
+ break;
+ case CHILD_PROP_FILL:
+ g_value_set_boolean (value, fill);
+ break;
+ case CHILD_PROP_PADDING:
+ g_value_set_uint (value, padding);
break;
- case ARG_HOMOGENEOUS:
- GTK_VALUE_BOOL (*arg) = box->homogeneous;
+ case CHILD_PROP_PACK_TYPE:
+ g_value_set_enum (value, pack_type);
+ break;
+ case CHILD_PROP_POSITION:
+ i = 0;
+ for (list = GTK_BOX (container)->children; list; list = list->next)
+ {
+ GtkBoxChild *child_entry;
+
+ child_entry = list->data;
+ if (child_entry->widget == child)
+ break;
+ i++;
+ }
+ g_value_set_int (value, list ? i : -1);
break;
default:
- arg->type = GTK_TYPE_INVALID;
+ GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
break;
}
}
void
gtk_box_pack_start (GtkBox *box,
GtkWidget *child,
- gint expand,
- gint fill,
- gint padding)
+ gboolean expand,
+ gboolean fill,
+ guint padding)
{
GtkBoxChild *child_info;
- g_return_if_fail (box != NULL);
g_return_if_fail (GTK_IS_BOX (box));
- g_return_if_fail (child != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (child));
+ g_return_if_fail (child->parent == NULL);
child_info = g_new (GtkBoxChild, 1);
child_info->widget = child;
child_info->expand = expand ? TRUE : FALSE;
child_info->fill = fill ? TRUE : FALSE;
child_info->pack = GTK_PACK_START;
+ child_info->is_secondary = FALSE;
box->children = g_list_append (box->children, child_info);
- gtk_widget_set_parent (child, GTK_WIDGET (box));
-
- if (GTK_WIDGET_VISIBLE (GTK_WIDGET (box)))
- {
- if (GTK_WIDGET_REALIZED (GTK_WIDGET (box)) &&
- !GTK_WIDGET_REALIZED (child))
- gtk_widget_realize (child);
-
- if (GTK_WIDGET_MAPPED (GTK_WIDGET (box)) &&
- !GTK_WIDGET_MAPPED (child))
- gtk_widget_map (child);
- }
+ gtk_widget_freeze_child_notify (child);
- if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (box))
- gtk_widget_queue_resize (child);
+ gtk_widget_set_parent (child, GTK_WIDGET (box));
+
+ gtk_widget_child_notify (child, "expand");
+ gtk_widget_child_notify (child, "fill");
+ gtk_widget_child_notify (child, "padding");
+ gtk_widget_child_notify (child, "pack-type");
+ gtk_widget_child_notify (child, "position");
+ gtk_widget_thaw_child_notify (child);
}
void
gtk_box_pack_end (GtkBox *box,
GtkWidget *child,
- gint expand,
- gint fill,
- gint padding)
+ gboolean expand,
+ gboolean fill,
+ guint padding)
{
GtkBoxChild *child_info;
- g_return_if_fail (box != NULL);
g_return_if_fail (GTK_IS_BOX (box));
- g_return_if_fail (child != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (child));
+ g_return_if_fail (child->parent == NULL);
child_info = g_new (GtkBoxChild, 1);
child_info->widget = child;
child_info->expand = expand ? TRUE : FALSE;
child_info->fill = fill ? TRUE : FALSE;
child_info->pack = GTK_PACK_END;
+ child_info->is_secondary = FALSE;
box->children = g_list_append (box->children, child_info);
+ gtk_widget_freeze_child_notify (child);
+
gtk_widget_set_parent (child, GTK_WIDGET (box));
- if (GTK_WIDGET_VISIBLE (GTK_WIDGET (box)))
- {
- if (GTK_WIDGET_REALIZED (GTK_WIDGET (box)) &&
- !GTK_WIDGET_REALIZED (child))
- gtk_widget_realize (child);
-
- if (GTK_WIDGET_MAPPED (GTK_WIDGET (box)) &&
- !GTK_WIDGET_MAPPED (child))
- gtk_widget_map (child);
- }
-
- if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (box))
- gtk_widget_queue_resize (child);
+ gtk_widget_child_notify (child, "expand");
+ gtk_widget_child_notify (child, "fill");
+ gtk_widget_child_notify (child, "padding");
+ gtk_widget_child_notify (child, "pack-type");
+ gtk_widget_child_notify (child, "position");
+ gtk_widget_thaw_child_notify (child);
}
void
gtk_box_pack_start_defaults (GtkBox *box,
GtkWidget *child)
{
- g_return_if_fail (box != NULL);
- g_return_if_fail (GTK_IS_BOX (box));
- g_return_if_fail (child != NULL);
-
gtk_box_pack_start (box, child, TRUE, TRUE, 0);
}
gtk_box_pack_end_defaults (GtkBox *box,
GtkWidget *child)
{
- g_return_if_fail (box != NULL);
- g_return_if_fail (GTK_IS_BOX (box));
- g_return_if_fail (child != NULL);
-
gtk_box_pack_end (box, child, TRUE, TRUE, 0);
}
void
-gtk_box_set_homogeneous (GtkBox *box,
- gint homogeneous)
+gtk_box_set_homogeneous (GtkBox *box,
+ gboolean homogeneous)
{
- g_return_if_fail (box != NULL);
g_return_if_fail (GTK_IS_BOX (box));
if ((homogeneous ? TRUE : FALSE) != box->homogeneous)
{
box->homogeneous = homogeneous ? TRUE : FALSE;
+ g_object_notify (G_OBJECT (box), "homogeneous");
gtk_widget_queue_resize (GTK_WIDGET (box));
}
}
+/**
+ * gtk_box_get_homogeneous:
+ * @box: a #GtkBox
+ *
+ * Returns whether the box is homogeneous (all children are the
+ * same size). See gtk_box_set_homogeneous ().
+ *
+ * Return value: %TRUE if the box is homogeneous.
+ **/
+gboolean
+gtk_box_get_homogeneous (GtkBox *box)
+{
+ g_return_val_if_fail (GTK_IS_BOX (box), FALSE);
+
+ return box->homogeneous;
+}
+
void
gtk_box_set_spacing (GtkBox *box,
gint spacing)
{
- g_return_if_fail (box != NULL);
g_return_if_fail (GTK_IS_BOX (box));
if (spacing != box->spacing)
{
box->spacing = spacing;
+ g_object_notify (G_OBJECT (box), "spacing");
gtk_widget_queue_resize (GTK_WIDGET (box));
}
}
+/**
+ * gtk_box_get_spacing:
+ * @box: a #GtkBox
+ *
+ * Gets the value set by gtk_box_set_spacing().
+ *
+ * Return value: spacing between children
+ **/
+gint
+gtk_box_get_spacing (GtkBox *box)
+{
+ g_return_val_if_fail (GTK_IS_BOX (box), 0);
+
+ return box->spacing;
+}
+
void
-gtk_box_reorder_child (GtkBox *box,
- GtkWidget *child,
- guint pos)
+gtk_box_reorder_child (GtkBox *box,
+ GtkWidget *child,
+ gint position)
{
- GList *list;
+ GList *old_link;
+ GList *new_link;
+ GtkBoxChild *child_info = NULL;
+ gint old_position;
- g_return_if_fail (box != NULL);
g_return_if_fail (GTK_IS_BOX (box));
- g_return_if_fail (child != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (child));
- list = box->children;
- while (list)
+ old_link = box->children;
+ old_position = 0;
+ while (old_link)
{
- GtkBoxChild *child_info;
-
- child_info = list->data;
+ child_info = old_link->data;
if (child_info->widget == child)
break;
- list = list->next;
+ old_link = old_link->next;
+ old_position++;
}
- if (list)
- {
- GList *tmp_list;
+ g_return_if_fail (old_link != NULL);
- if (list->next)
- list->next->prev = list->prev;
- if (list->prev)
- list->prev->next = list->next;
+ if (position == old_position)
+ return;
- tmp_list = box->children;
- while (pos && tmp_list->next)
- {
- pos--;
- tmp_list = tmp_list->next;
- }
+ box->children = g_list_delete_link (box->children, old_link);
- if (pos)
- {
- tmp_list->next = list;
- list->prev = tmp_list;
- list->next = NULL;
- }
- else
- {
- if (tmp_list->prev)
- tmp_list->prev->next = list;
- else
- box->children = list;
- list->prev = tmp_list->prev;
- tmp_list->prev = list;
- list->next = tmp_list;
- }
+ if (position < 0)
+ new_link = NULL;
+ else
+ new_link = g_list_nth (box->children, position);
- if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (box))
- gtk_widget_queue_resize (child);
- }
+ box->children = g_list_insert_before (box->children, new_link, child_info);
+
+ gtk_widget_child_notify (child, "position");
+ if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (box))
+ gtk_widget_queue_resize (child);
}
void
gtk_box_query_child_packing (GtkBox *box,
GtkWidget *child,
- gint *expand,
- gint *fill,
- gint *padding,
+ gboolean *expand,
+ gboolean *fill,
+ guint *padding,
GtkPackType *pack_type)
{
GList *list;
- GtkBoxChild *child_info;
+ GtkBoxChild *child_info = NULL;
- g_return_if_fail (box != NULL);
g_return_if_fail (GTK_IS_BOX (box));
- g_return_if_fail (child != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (child));
list = box->children;
while (list)
void
gtk_box_set_child_packing (GtkBox *box,
GtkWidget *child,
- gint expand,
- gint fill,
- gint padding,
- GtkPackType pack_type)
+ gboolean expand,
+ gboolean fill,
+ guint padding,
+ GtkPackType pack_type)
{
GList *list;
- GtkBoxChild *child_info;
+ GtkBoxChild *child_info = NULL;
- g_return_if_fail (box != NULL);
g_return_if_fail (GTK_IS_BOX (box));
- g_return_if_fail (child != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (child));
list = box->children;
while (list)
list = list->next;
}
+ gtk_widget_freeze_child_notify (child);
if (list)
{
child_info->expand = expand != FALSE;
+ gtk_widget_child_notify (child, "expand");
child_info->fill = fill != FALSE;
+ gtk_widget_child_notify (child, "fill");
child_info->padding = padding;
+ gtk_widget_child_notify (child, "padding");
if (pack_type == GTK_PACK_END)
child_info->pack = GTK_PACK_END;
else
child_info->pack = GTK_PACK_START;
+ gtk_widget_child_notify (child, "pack-type");
if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (box))
gtk_widget_queue_resize (child);
}
-}
-
-
-static void
-gtk_box_destroy (GtkObject *object)
-{
- GtkBox *box;
- GtkBoxChild *child;
- GList *children;
-
- g_return_if_fail (object != NULL);
- g_return_if_fail (GTK_IS_BOX (object));
-
- box = GTK_BOX (object);
-
- children = box->children;
- while (children)
- {
- child = children->data;
- children = children->next;
-
- child->widget->parent = NULL;
- gtk_object_unref (GTK_OBJECT (child->widget));
- gtk_widget_destroy (child->widget);
- g_free (child);
- }
-
- g_list_free (box->children);
-
- if (GTK_OBJECT_CLASS (parent_class)->destroy)
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-gtk_box_map (GtkWidget *widget)
-{
- GtkBox *box;
- GtkBoxChild *child;
- GList *children;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_BOX (widget));
-
- box = GTK_BOX (widget);
- GTK_WIDGET_SET_FLAGS (box, GTK_MAPPED);
-
- children = box->children;
- while (children)
- {
- child = children->data;
- children = children->next;
-
- if (GTK_WIDGET_VISIBLE (child->widget) &&
- !GTK_WIDGET_MAPPED (child->widget))
- gtk_widget_map (child->widget);
- }
-}
-
-static void
-gtk_box_unmap (GtkWidget *widget)
-{
- GtkBox *box;
- GtkBoxChild *child;
- GList *children;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_BOX (widget));
-
- box = GTK_BOX (widget);
- GTK_WIDGET_UNSET_FLAGS (box, GTK_MAPPED);
-
- children = box->children;
- while (children)
- {
- child = children->data;
- children = children->next;
-
- if (GTK_WIDGET_VISIBLE (child->widget) &&
- GTK_WIDGET_MAPPED (child->widget))
- gtk_widget_unmap (child->widget);
- }
-}
-
-static void
-gtk_box_draw (GtkWidget *widget,
- GdkRectangle *area)
-{
- GtkBox *box;
- GtkBoxChild *child;
- GdkRectangle child_area;
- GList *children;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_BOX (widget));
-
- if (GTK_WIDGET_DRAWABLE (widget))
- {
- box = GTK_BOX (widget);
-
- children = box->children;
- while (children)
- {
- child = children->data;
- children = children->next;
-
- if (gtk_widget_intersect (child->widget, area, &child_area))
- gtk_widget_draw (child->widget, &child_area);
- }
- }
-}
-
-static gint
-gtk_box_expose (GtkWidget *widget,
- GdkEventExpose *event)
-{
- GtkBox *box;
- GtkBoxChild *child;
- GdkEventExpose child_event;
- GList *children;
-
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_BOX (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
-
- if (GTK_WIDGET_DRAWABLE (widget))
- {
- box = GTK_BOX (widget);
-
- child_event = *event;
-
- children = box->children;
- while (children)
- {
- child = children->data;
- children = children->next;
-
- if (GTK_WIDGET_NO_WINDOW (child->widget) &&
- gtk_widget_intersect (child->widget, &event->area, &child_event.area))
- gtk_widget_event (child->widget, (GdkEvent*) &child_event);
- }
- }
-
- return FALSE;
+ gtk_widget_thaw_child_notify (child);
}
static void
gtk_box_add (GtkContainer *container,
GtkWidget *widget)
{
- g_return_if_fail (container != NULL);
- g_return_if_fail (GTK_IS_BOX (container));
- g_return_if_fail (widget != NULL);
-
gtk_box_pack_start_defaults (GTK_BOX (container), widget);
}
GtkBoxChild *child;
GList *children;
- g_return_if_fail (container != NULL);
- g_return_if_fail (GTK_IS_BOX (container));
- g_return_if_fail (widget != NULL);
-
box = GTK_BOX (container);
children = box->children;
if (child->widget == widget)
{
+ gboolean was_visible;
+
+ was_visible = GTK_WIDGET_VISIBLE (widget);
gtk_widget_unparent (widget);
box->children = g_list_remove_link (box->children, children);
g_list_free (children);
g_free (child);
- if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (container))
+ /* queue resize regardless of GTK_WIDGET_VISIBLE (container),
+ * since that's what is needed by toplevels.
+ */
+ if (was_visible)
gtk_widget_queue_resize (GTK_WIDGET (container));
break;
}
static void
-gtk_box_foreach (GtkContainer *container,
- GtkCallback callback,
- gpointer callback_data)
+gtk_box_forall (GtkContainer *container,
+ gboolean include_internals,
+ GtkCallback callback,
+ gpointer callback_data)
{
GtkBox *box;
GtkBoxChild *child;
GList *children;
- g_return_if_fail (container != NULL);
- g_return_if_fail (GTK_IS_BOX (container));
g_return_if_fail (callback != NULL);
box = GTK_BOX (container);
(* callback) (child->widget, callback_data);
}
}
+
+#define __GTK_BOX_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff