#include "gtkcontainer.h"
#include "gtkprivate.h"
-#include "gtksignal.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
#include "gtkwindow.h"
PROP_0,
PROP_BORDER_WIDTH,
PROP_RESIZE_MODE,
- PROP_CHILD,
+ PROP_CHILD
};
#define PARAM_SPEC_PARAM_ID(pspec) ((pspec)->param_id)
GtkDirectionType direction);
static void gtk_container_real_set_focus_child (GtkContainer *container,
GtkWidget *widget);
-static GList * gtk_container_focus_sort (GtkContainer *container,
- GList *children,
- GtkDirectionType direction);
static gboolean gtk_container_focus_move (GtkContainer *container,
GList *children,
/* --- functions --- */
-GtkType
+GType
gtk_container_get_type (void)
{
- static GtkType container_type = 0;
+ static GType container_type = 0;
if (!container_type)
{
- static GTypeInfo container_info = {
+ static const GTypeInfo container_info =
+ {
sizeof (GtkContainerClass),
(GBaseInitFunc) gtk_container_base_class_init,
(GBaseFinalizeFunc) gtk_container_base_class_finalize,
(GClassInitFunc) gtk_container_class_init,
- NULL /* class_destroy */,
+ NULL /* class_finalize */,
NULL /* class_data */,
sizeof (GtkContainer),
0 /* n_preallocs */,
NULL, /* value_table */
};
- container_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkContainer", &container_info, 0);
+ container_type =
+ g_type_register_static (GTK_TYPE_WIDGET, "GtkContainer",
+ &container_info, G_TYPE_FLAG_ABSTRACT);
}
return container_type;
PROP_BORDER_WIDTH,
g_param_spec_uint ("border_width",
_("Border width"),
- _("The width of the empty border outside the containers children."),
+ _("The width of the empty border outside the containers children"),
0,
G_MAXINT,
0,
PROP_CHILD,
g_param_spec_object ("child",
_("Child"),
- _("Can be used to add a new child to the container."),
+ _("Can be used to add a new child to the container"),
GTK_TYPE_WIDGET,
G_PARAM_WRITABLE));
container_signals[ADD] =
- gtk_signal_new ("add",
- GTK_RUN_FIRST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkContainerClass, add),
- _gtk_marshal_VOID__OBJECT,
- GTK_TYPE_NONE, 1,
- GTK_TYPE_WIDGET);
+ g_signal_new ("add",
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (GtkContainerClass, add),
+ NULL, NULL,
+ _gtk_marshal_VOID__OBJECT,
+ G_TYPE_NONE, 1,
+ GTK_TYPE_WIDGET);
container_signals[REMOVE] =
- gtk_signal_new ("remove",
- GTK_RUN_FIRST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkContainerClass, remove),
- _gtk_marshal_VOID__OBJECT,
- GTK_TYPE_NONE, 1,
- GTK_TYPE_WIDGET);
+ g_signal_new ("remove",
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (GtkContainerClass, remove),
+ NULL, NULL,
+ _gtk_marshal_VOID__OBJECT,
+ G_TYPE_NONE, 1,
+ GTK_TYPE_WIDGET);
container_signals[CHECK_RESIZE] =
- gtk_signal_new ("check_resize",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkContainerClass, check_resize),
- _gtk_marshal_VOID__VOID,
- GTK_TYPE_NONE, 0);
+ g_signal_new ("check_resize",
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GtkContainerClass, check_resize),
+ NULL, NULL,
+ _gtk_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
container_signals[SET_FOCUS_CHILD] =
- gtk_signal_new ("set-focus-child",
- GTK_RUN_FIRST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkContainerClass, set_focus_child),
- _gtk_marshal_VOID__OBJECT,
- GTK_TYPE_NONE, 1,
- GTK_TYPE_WIDGET);
+ g_signal_new ("set-focus-child",
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (GtkContainerClass, set_focus_child),
+ NULL, NULL,
+ _gtk_marshal_VOID__OBJECT,
+ G_TYPE_NONE, 1,
+ GTK_TYPE_WIDGET);
}
/**
*
* Returns the type of the children supported by the container.
*
- * Note that this may return %GTK_TYPE_NONE to indicate that no more
+ * Note that this may return %G_TYPE_NONE to indicate that no more
* children can be added, e.g. for a #GtkPaned which already has two
* children.
*
- * Return value: a #GtkType.
+ * Return value: a #GType.
**/
-GtkType
+GType
gtk_container_child_type (GtkContainer *container)
{
- GtkType slot;
+ GType slot;
GtkContainerClass *class;
g_return_val_if_fail (GTK_IS_CONTAINER (container), 0);
if (class->child_type)
slot = class->child_type (container);
else
- slot = GTK_TYPE_NONE;
+ slot = G_TYPE_NONE;
return slot;
}
g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (widget->parent == NULL);
- gtk_widget_ref (GTK_WIDGET (container));
- gtk_widget_ref (widget);
+ g_object_ref (container);
+ g_object_ref (widget);
gtk_widget_freeze_child_notify (widget);
- gtk_signal_emit (GTK_OBJECT (container), container_signals[ADD], widget);
+ g_signal_emit (container, container_signals[ADD], 0, widget);
if (widget->parent)
{
va_list var_args;
}
gtk_widget_thaw_child_notify (widget);
- gtk_widget_unref (widget);
- gtk_widget_unref (GTK_WIDGET (container));
+ g_object_unref (widget);
+ g_object_unref (container);
}
void
{
va_list var_args;
- g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_CONTAINER (container));
- g_return_if_fail (child != NULL);
g_return_if_fail (GTK_IS_WIDGET (child));
g_return_if_fail (child->parent == GTK_WIDGET (container));
}
void
-gtk_container_class_install_child_property (GtkContainerClass *class,
+gtk_container_class_install_child_property (GtkContainerClass *cclass,
guint property_id,
GParamSpec *pspec)
{
- g_return_if_fail (GTK_IS_CONTAINER_CLASS (class));
+ g_return_if_fail (GTK_IS_CONTAINER_CLASS (cclass));
g_return_if_fail (G_IS_PARAM_SPEC (pspec));
if (pspec->flags & G_PARAM_WRITABLE)
- g_return_if_fail (class->set_child_property != NULL);
+ g_return_if_fail (cclass->set_child_property != NULL);
if (pspec->flags & G_PARAM_READABLE)
- g_return_if_fail (class->get_child_property != NULL);
+ g_return_if_fail (cclass->get_child_property != NULL);
g_return_if_fail (property_id > 0);
g_return_if_fail (PARAM_SPEC_PARAM_ID (pspec) == 0); /* paranoid */
if (pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY))
g_return_if_fail ((pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY)) == 0);
- if (g_param_spec_pool_lookup (_gtk_widget_child_property_pool, pspec->name, G_OBJECT_CLASS_TYPE (class), FALSE))
+ if (g_param_spec_pool_lookup (_gtk_widget_child_property_pool, pspec->name, G_OBJECT_CLASS_TYPE (cclass), FALSE))
{
- g_warning (G_STRLOC ": class `%s' already contains a property named `%s'",
- G_OBJECT_CLASS_NAME (class),
+ g_warning (G_STRLOC ": class `%s' already contains a child property named `%s'",
+ G_OBJECT_CLASS_NAME (cclass),
pspec->name);
return;
}
g_param_spec_ref (pspec);
g_param_spec_sink (pspec);
PARAM_SPEC_SET_PARAM_ID (pspec, property_id);
- g_param_spec_pool_insert (_gtk_widget_child_property_pool, pspec, G_OBJECT_CLASS_TYPE (class));
+ g_param_spec_pool_insert (_gtk_widget_child_property_pool, pspec, G_OBJECT_CLASS_TYPE (cclass));
}
+/**
+ * gtk_container_class_find_child_property:
+ * @cclass: a #GtkContainerClass
+ * @property_name: the name of the child property to find
+ * @returns: the #GParamSpec of the child property or %NULL if @class has ho
+ * child property with that name.
+ *
+ * Finds a child property of a container class by name.
+ */
GParamSpec*
-gtk_container_class_find_child_property (GObjectClass *class,
+gtk_container_class_find_child_property (GObjectClass *cclass,
const gchar *property_name)
{
- g_return_val_if_fail (GTK_IS_CONTAINER_CLASS (class), NULL);
+ g_return_val_if_fail (GTK_IS_CONTAINER_CLASS (cclass), NULL);
g_return_val_if_fail (property_name != NULL, NULL);
return g_param_spec_pool_lookup (_gtk_widget_child_property_pool,
property_name,
- G_OBJECT_CLASS_TYPE (class),
+ G_OBJECT_CLASS_TYPE (cclass),
TRUE);
}
-GParamSpec** /* free result */
-gtk_container_class_list_child_properties (GObjectClass *class,
+/**
+ * gtk_container_class_list_child_properties:
+ * @cclass: a #GtkContainerClass
+ * @n_properties: location to return the number of child properties found
+ * @returns: an newly allocated array of #GParamSpec*. The array must be freed with g_free().
+ *
+ * Returns all child properties of a container class.
+ */
+GParamSpec**
+gtk_container_class_list_child_properties (GObjectClass *cclass,
guint *n_properties)
{
GParamSpec **pspecs;
guint n;
- g_return_val_if_fail (GTK_IS_CONTAINER_CLASS (class), NULL);
+ g_return_val_if_fail (GTK_IS_CONTAINER_CLASS (cclass), NULL);
pspecs = g_param_spec_pool_list (_gtk_widget_child_property_pool,
- G_OBJECT_CLASS_TYPE (class),
+ G_OBJECT_CLASS_TYPE (cclass),
&n);
if (n_properties)
*n_properties = n;
gtk_container_add_unimplemented (GtkContainer *container,
GtkWidget *widget)
{
- g_warning ("GtkContainerClass::add not implemented for `%s'", gtk_type_name (GTK_OBJECT_TYPE (container)));
+ g_warning ("GtkContainerClass::add not implemented for `%s'", g_type_name (G_TYPE_FROM_INSTANCE (container)));
}
static void
gtk_container_remove_unimplemented (GtkContainer *container,
GtkWidget *widget)
{
- g_warning ("GtkContainerClass::remove not implemented for `%s'", gtk_type_name (GTK_OBJECT_TYPE (container)));
+ g_warning ("GtkContainerClass::remove not implemented for `%s'", g_type_name (G_TYPE_FROM_INSTANCE (container)));
}
static void
static void
gtk_container_destroy (GtkObject *object)
{
- GtkContainer *container;
-
- g_return_if_fail (object != NULL);
- g_return_if_fail (GTK_IS_CONTAINER (object));
-
- container = GTK_CONTAINER (object);
+ GtkContainer *container = GTK_CONTAINER (object);
if (GTK_CONTAINER_RESIZE_PENDING (container))
_gtk_container_dequeue_resize_handler (container);
const GValue *value,
GParamSpec *pspec)
{
- GtkContainer *container;
-
- container = GTK_CONTAINER (object);
+ GtkContainer *container = GTK_CONTAINER (object);
switch (prop_id)
{
GValue *value,
GParamSpec *pspec)
{
- GtkContainer *container;
-
- container = GTK_CONTAINER (object);
+ GtkContainer *container = GTK_CONTAINER (object);
switch (prop_id)
{
gtk_container_set_border_width (GtkContainer *container,
guint border_width)
{
- g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_CONTAINER (container));
if (container->border_width != border_width)
gtk_container_add (GtkContainer *container,
GtkWidget *widget)
{
- g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_CONTAINER (container));
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_WIDGET (widget));
if (widget->parent != NULL)
return;
}
- gtk_signal_emit (GTK_OBJECT (container), container_signals[ADD], widget);
+ g_signal_emit (container, container_signals[ADD], 0, widget);
}
/**
gtk_container_remove (GtkContainer *container,
GtkWidget *widget)
{
- g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_CONTAINER (container));
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (widget->parent == GTK_WIDGET (container));
- gtk_signal_emit (GTK_OBJECT (container), container_signals[REMOVE], widget);
+ g_signal_emit (container, container_signals[REMOVE], 0, widget);
}
void
gtk_container_set_resize_mode (GtkContainer *container,
GtkResizeMode resize_mode)
{
- g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_CONTAINER (container));
g_return_if_fail (resize_mode <= GTK_RESIZE_IMMEDIATE);
static GtkContainer*
gtk_container_get_resize_container (GtkContainer *container)
{
- GtkWidget *widget;
-
- widget = GTK_WIDGET (container);
+ GtkWidget *widget = GTK_WIDGET (container);
while (widget->parent)
{
_gtk_container_queue_resize (GtkContainer *container)
{
GtkContainer *resize_container;
+ GtkWidget *widget;
- g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_CONTAINER (container));
+ widget = GTK_WIDGET (container);
resize_container = gtk_container_get_resize_container (container);
- if (resize_container)
+ while (!GTK_WIDGET_ALLOC_NEEDED (widget) || !GTK_WIDGET_REQUEST_NEEDED (widget))
{
- GtkWidget *widget = GTK_WIDGET (container);
+ GTK_PRIVATE_SET_FLAG (widget, GTK_ALLOC_NEEDED);
+ GTK_PRIVATE_SET_FLAG (widget, GTK_REQUEST_NEEDED);
+ if ((resize_container && widget == GTK_WIDGET (resize_container)) ||
+ !widget->parent)
+ break;
- while (!GTK_WIDGET_ALLOC_NEEDED (widget) || !GTK_WIDGET_REQUEST_NEEDED (widget))
- {
- GTK_PRIVATE_SET_FLAG (widget, GTK_ALLOC_NEEDED);
- GTK_PRIVATE_SET_FLAG (widget, GTK_REQUEST_NEEDED);
- if (widget == GTK_WIDGET (resize_container))
- break;
-
- widget = widget->parent;
- }
+ widget = widget->parent;
+ }
+ if (resize_container)
+ {
if (GTK_WIDGET_VISIBLE (resize_container) &&
(GTK_WIDGET_TOPLEVEL (resize_container) || GTK_WIDGET_REALIZED (resize_container)))
{
void
gtk_container_check_resize (GtkContainer *container)
{
- g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_CONTAINER (container));
- gtk_signal_emit (GTK_OBJECT (container), container_signals[CHECK_RESIZE]);
+ g_signal_emit (container, container_signals[CHECK_RESIZE], 0);
}
static void
gtk_container_real_check_resize (GtkContainer *container)
{
- GtkWidget *widget;
+ GtkWidget *widget = GTK_WIDGET (container);
GtkRequisition requisition;
- g_return_if_fail (container != NULL);
- g_return_if_fail (GTK_IS_CONTAINER (container));
-
- widget = GTK_WIDGET (container);
-
gtk_widget_size_request (widget, &requisition);
if (requisition.width > widget->allocation.width ||
* containers that have an idle sizer pending must be flagged with
* RESIZE_PENDING.
*/
- g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_CONTAINER (container));
widget = GTK_WIDGET (container);
{
GtkContainerClass *class;
- g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_CONTAINER (container));
g_return_if_fail (callback != NULL);
{
GtkContainerClass *class;
- g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_CONTAINER (container));
g_return_if_fail (callback != NULL);
/* first argument */
args[0].name = NULL;
- args[0].type = GTK_OBJECT_TYPE (child);
+ args[0].type = G_TYPE_FROM_INSTANCE (child);
GTK_VALUE_OBJECT (args[0]) = GTK_OBJECT (child);
/* location for return value */
args[1].name = NULL;
- args[1].type = GTK_TYPE_NONE;
+ args[1].type = G_TYPE_NONE;
fdata->callback (fdata->container, fdata->callback_data, 1, args);
}
gpointer callback_data,
GtkDestroyNotify notify)
{
- g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_CONTAINER (container));
if (marshal)
gtk_container_set_focus_child (GtkContainer *container,
GtkWidget *widget)
{
- g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_CONTAINER (container));
if (widget)
g_return_if_fail (GTK_IS_WIDGET (widget));
- gtk_signal_emit (GTK_OBJECT (container), container_signals[SET_FOCUS_CHILD], widget);
+ g_signal_emit (container, container_signals[SET_FOCUS_CHILD], 0, widget);
}
/**
GList*
gtk_container_get_children (GtkContainer *container)
{
- GList *children;
-
- children = NULL;
+ GList *children = NULL;
gtk_container_foreach (container,
gtk_container_children_callback,
&data);
name = g_strdup_printf ("%s-%u",
- gtk_type_name (GTK_OBJECT_TYPE (child)),
+ g_type_name (G_TYPE_FROM_INSTANCE (child)),
data.index);
return name;
_gtk_container_child_composite_name (GtkContainer *container,
GtkWidget *child)
{
- g_return_val_if_fail (container != NULL, NULL);
g_return_val_if_fail (GTK_IS_CONTAINER (container), NULL);
- g_return_val_if_fail (child != NULL, NULL);
g_return_val_if_fail (GTK_IS_WIDGET (child), NULL);
g_return_val_if_fail (child->parent == GTK_WIDGET (container), NULL);
if (!quark_composite_name)
quark_composite_name = g_quark_from_static_string ("gtk-composite-name");
- name = gtk_object_get_data_by_id (GTK_OBJECT (child), quark_composite_name);
+ name = g_object_get_qdata (G_OBJECT (child), quark_composite_name);
if (!name)
{
GtkContainerClass *class;
gtk_container_real_set_focus_child (GtkContainer *container,
GtkWidget *child)
{
- g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_CONTAINER (container));
if (child)
g_return_if_fail (GTK_IS_WIDGET (child));
if (child != container->focus_child)
{
if (container->focus_child)
- gtk_widget_unref (container->focus_child);
+ g_object_unref (container->focus_child);
container->focus_child = child;
if (container->focus_child)
- gtk_widget_ref (container->focus_child);
+ g_object_ref (container->focus_child);
}
{
GtkAdjustment *adjustment;
- adjustment = gtk_object_get_data_by_id (GTK_OBJECT (container), vadjustment_key_id);
+ adjustment = g_object_get_qdata (G_OBJECT (container), vadjustment_key_id);
if (adjustment)
gtk_adjustment_clamp_page (adjustment,
container->focus_child->allocation.y,
(container->focus_child->allocation.y +
container->focus_child->allocation.height));
- adjustment = gtk_object_get_data_by_id (GTK_OBJECT (container), hadjustment_key_id);
+ adjustment = g_object_get_qdata (G_OBJECT (container), hadjustment_key_id);
if (adjustment)
gtk_adjustment_clamp_page (adjustment,
container->focus_child->allocation.x,
return g_object_get_data (G_OBJECT (container), "gtk-container-focus-chain");
}
+/* same as gtk_container_get_children, except it includes internals
+ */
+static GList *
+gtk_container_get_all_children (GtkContainer *container)
+{
+ GList *children = NULL;
+
+ gtk_container_forall (container,
+ gtk_container_children_callback,
+ &children);
+
+ return children;
+}
+
static gboolean
gtk_container_focus (GtkWidget *widget,
GtkDirectionType direction)
if (container->has_focus_chain)
children = g_list_copy (get_focus_chain (container));
else
- children = gtk_container_get_children (container);
+ children = gtk_container_get_all_children (container);
if (container->has_focus_chain &&
(direction == GTK_DIR_TAB_FORWARD ||
sorted_children = g_list_reverse (sorted_children);
}
else
- sorted_children = gtk_container_focus_sort (container, children, direction);
+ sorted_children = _gtk_container_focus_sort (container, children, direction, NULL);
return_val = gtk_container_focus_move (container, sorted_children, direction);
static GList *
gtk_container_focus_sort_tab (GtkContainer *container,
GList *children,
- GtkDirectionType direction)
+ GtkDirectionType direction,
+ GtkWidget *old_focus)
{
children = g_list_sort (children, tab_compare);
CompareInfo *compare = data;
gint y1, y2;
- get_allocation_coords (compare->container, (GtkWidget *)a, &allocation1);
- get_allocation_coords (compare->container, (GtkWidget *)b, &allocation2);
+ if (!get_allocation_coords (compare->container, (GtkWidget *)a, &allocation1))
+ return 0;
+ if (!get_allocation_coords (compare->container, (GtkWidget *)b, &allocation2))
+ return 0;
y1 = allocation1.y + allocation1.height / 2;
y2 = allocation2.y + allocation2.height / 2;
static GList *
gtk_container_focus_sort_up_down (GtkContainer *container,
GList *children,
- GtkDirectionType direction)
+ GtkDirectionType direction,
+ GtkWidget *old_focus)
{
CompareInfo compare;
GList *tmp_list;
- GtkWidget *old_focus;
+ GdkRectangle old_allocation;
compare.container = container;
compare.reverse = (direction == GTK_DIR_UP);
- old_focus = find_old_focus (container, children);
- if (old_focus)
+ if (!old_focus)
+ old_focus = find_old_focus (container, children);
+
+ if (old_focus && get_allocation_coords (container, old_focus, &old_allocation))
{
- GdkRectangle old_allocation;
gint compare_x1;
gint compare_x2;
gint compare_y;
/* Delete widgets from list that don't match minimum criteria */
- get_allocation_coords (container, old_focus, &old_allocation);
-
compare_x1 = old_allocation.x;
compare_x2 = old_allocation.x + old_allocation.width;
if (child != old_focus)
{
- get_allocation_coords (container, child, &child_allocation);
-
- child_x1 = child_allocation.x;
- child_x2 = child_allocation.x + child_allocation.width;
-
- if ((child_x2 <= compare_x1 || child_x1 >= compare_x2) /* No horizontal overlap */ ||
- (direction == GTK_DIR_DOWN && child_allocation.y + child_allocation.height < compare_y) || /* Not below */
- (direction == GTK_DIR_UP && child_allocation.y > compare_y)) /* Not above */
+ if (get_allocation_coords (container, child, &child_allocation))
{
- children = g_list_delete_link (children, tmp_list);
+ child_x1 = child_allocation.x;
+ child_x2 = child_allocation.x + child_allocation.width;
+
+ if ((child_x2 <= compare_x1 || child_x1 >= compare_x2) /* No horizontal overlap */ ||
+ (direction == GTK_DIR_DOWN && child_allocation.y + child_allocation.height < compare_y) || /* Not below */
+ (direction == GTK_DIR_UP && child_allocation.y > compare_y)) /* Not above */
+ {
+ children = g_list_delete_link (children, tmp_list);
+ }
}
+ else
+ children = g_list_delete_link (children, tmp_list);
}
tmp_list = next;
CompareInfo *compare = data;
gint x1, x2;
- get_allocation_coords (compare->container, (GtkWidget *)a, &allocation1);
- get_allocation_coords (compare->container, (GtkWidget *)b, &allocation2);
+ if (!get_allocation_coords (compare->container, (GtkWidget *)a, &allocation1))
+ return 0;
+ if (!get_allocation_coords (compare->container, (GtkWidget *)b, &allocation2))
+ return 0;
x1 = allocation1.x + allocation1.width / 2;
x2 = allocation2.x + allocation2.width / 2;
static GList *
gtk_container_focus_sort_left_right (GtkContainer *container,
GList *children,
- GtkDirectionType direction)
+ GtkDirectionType direction,
+ GtkWidget *old_focus)
{
CompareInfo compare;
GList *tmp_list;
- GtkWidget *old_focus;
+ GdkRectangle old_allocation;
compare.container = container;
compare.reverse = (direction == GTK_DIR_LEFT);
+
+ if (!old_focus)
+ old_focus = find_old_focus (container, children);
- old_focus = find_old_focus (container, children);
- if (old_focus)
+ if (old_focus && get_allocation_coords (container, old_focus, &old_allocation))
{
- GdkRectangle old_allocation;
-
gint compare_y1;
gint compare_y2;
gint compare_x;
/* Delete widgets from list that don't match minimum criteria */
- get_allocation_coords (container, old_focus, &old_allocation);
-
compare_y1 = old_allocation.y;
compare_y2 = old_allocation.y + old_allocation.height;
if (child != old_focus)
{
- get_allocation_coords (container, child, &child_allocation);
-
- child_y1 = child_allocation.y;
- child_y2 = child_allocation.y + child_allocation.height;
-
- if ((child_y2 <= compare_y1 || child_y1 >= compare_y2) /* No vertical overlap */ ||
- (direction == GTK_DIR_RIGHT && child_allocation.x + child_allocation.width < compare_x) || /* Not to left */
- (direction == GTK_DIR_LEFT && child_allocation.x > compare_x)) /* Not to right */
+ if (get_allocation_coords (container, child, &child_allocation))
{
- children = g_list_delete_link (children, tmp_list);
+ child_y1 = child_allocation.y;
+ child_y2 = child_allocation.y + child_allocation.height;
+
+ if ((child_y2 <= compare_y1 || child_y1 >= compare_y2) /* No vertical overlap */ ||
+ (direction == GTK_DIR_RIGHT && child_allocation.x + child_allocation.width < compare_x) || /* Not to left */
+ (direction == GTK_DIR_LEFT && child_allocation.x > compare_x)) /* Not to right */
+ {
+ children = g_list_delete_link (children, tmp_list);
+ }
}
+ else
+ children = g_list_delete_link (children, tmp_list);
}
tmp_list = next;
* @children: a list of descendents of @container (they don't
* have to be direct children.
* @direction: focus direction
+ * @old_focus: widget to use for the starting position, or %NULL
+ * to determine this automatically.
+ * [ Note, this argument isn't used for GTK_DIR_TAB_*,
+ * which is the only @direction we use currently,
+ * so perhaps this argument should be removed ]
*
* Sorts @children in the correct order for focusing with
* direction type @direction.
* with children that aren't suitable for focusing in this direction
* removed.
**/
-static GList *
-gtk_container_focus_sort (GtkContainer *container,
- GList *children,
- GtkDirectionType direction)
+GList *
+_gtk_container_focus_sort (GtkContainer *container,
+ GList *children,
+ GtkDirectionType direction,
+ GtkWidget *old_focus)
{
children = g_list_copy (children);
{
case GTK_DIR_TAB_FORWARD:
case GTK_DIR_TAB_BACKWARD:
- return gtk_container_focus_sort_tab (container, children, direction);
+ return gtk_container_focus_sort_tab (container, children, direction, old_focus);
case GTK_DIR_UP:
case GTK_DIR_DOWN:
- return gtk_container_focus_sort_up_down (container, children, direction);
+ return gtk_container_focus_sort_up_down (container, children, direction, old_focus);
case GTK_DIR_LEFT:
case GTK_DIR_RIGHT:
- return gtk_container_focus_sort_left_right (container, children, direction);
+ return gtk_container_focus_sort_left_right (container, children, direction, old_focus);
}
g_assert_not_reached ();
chain = g_list_remove (chain, widget);
- g_signal_handlers_disconnect_by_func (G_OBJECT (widget),
+ g_signal_handlers_disconnect_by_func (widget,
chain_widget_destroyed,
user_data);
chain = g_list_prepend (chain, tmp_list->data);
- gtk_signal_connect (GTK_OBJECT (tmp_list->data),
- "destroy",
- GTK_SIGNAL_FUNC (chain_widget_destroyed),
- container);
+ g_signal_connect (tmp_list->data,
+ "destroy",
+ G_CALLBACK (chain_widget_destroyed),
+ container);
tmp_list = g_list_next (tmp_list);
}
tmp_list = chain;
while (tmp_list != NULL)
{
- g_signal_handlers_disconnect_by_func (G_OBJECT (tmp_list->data),
+ g_signal_handlers_disconnect_by_func (tmp_list->data,
chain_widget_destroyed,
container);
gtk_container_set_focus_vadjustment (GtkContainer *container,
GtkAdjustment *adjustment)
{
- g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_CONTAINER (container));
if (adjustment)
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
if (adjustment)
- gtk_object_ref (GTK_OBJECT(adjustment));
+ g_object_ref (adjustment);
- gtk_object_set_data_by_id_full (GTK_OBJECT (container),
- vadjustment_key_id,
- adjustment,
- (GtkDestroyNotify) gtk_object_unref);
+ g_object_set_qdata_full (G_OBJECT (container),
+ vadjustment_key_id,
+ adjustment,
+ g_object_unref);
}
/**
g_return_val_if_fail (GTK_IS_CONTAINER (container), NULL);
- vadjustment = gtk_object_get_data_by_id (GTK_OBJECT (container),
- vadjustment_key_id);
+ vadjustment = g_object_get_qdata (G_OBJECT (container), vadjustment_key_id);
return vadjustment;
}
gtk_container_set_focus_hadjustment (GtkContainer *container,
GtkAdjustment *adjustment)
{
- g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_CONTAINER (container));
if (adjustment)
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
if (adjustment)
- gtk_object_ref (GTK_OBJECT (adjustment));
+ g_object_ref (adjustment);
- gtk_object_set_data_by_id_full (GTK_OBJECT (container),
- hadjustment_key_id,
- adjustment,
- (GtkDestroyNotify) gtk_object_unref);
+ g_object_set_qdata_full (G_OBJECT (container),
+ hadjustment_key_id,
+ adjustment,
+ g_object_unref);
}
/**
g_return_val_if_fail (GTK_IS_CONTAINER (container), NULL);
- hadjustment = gtk_object_get_data_by_id (GTK_OBJECT (container),
- hadjustment_key_id);
+ hadjustment = g_object_get_qdata (G_OBJECT (container), hadjustment_key_id);
return hadjustment;
}
static void
gtk_container_show_all (GtkWidget *widget)
{
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CONTAINER (widget));
gtk_container_foreach (GTK_CONTAINER (widget),
static void
gtk_container_hide_all (GtkWidget *widget)
{
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CONTAINER (widget));
gtk_widget_hide (widget);
GdkEventExpose *event;
} data;
- g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_CONTAINER (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
GtkWidget *child,
GdkEventExpose *event)
{
- GdkEventExpose child_event;
+ GdkEvent *child_event;
g_return_if_fail (GTK_IS_CONTAINER (container));
g_return_if_fail (GTK_IS_WIDGET (child));
GTK_WIDGET_NO_WINDOW (child) &&
(child->window == event->window))
{
- child_event = *event;
+ child_event = gdk_event_new (GDK_EXPOSE);
+ child_event->expose = *event;
+ g_object_ref (child_event->expose.window);
- child_event.region = gtk_widget_region_intersect (child, event->region);
- if (!gdk_region_empty (child_event.region))
+ child_event->expose.region = gtk_widget_region_intersect (child, event->region);
+ if (!gdk_region_empty (child_event->expose.region))
{
- gdk_region_get_clipbox (child_event.region, &child_event.area);
- gtk_widget_send_expose (child, (GdkEvent *)&child_event);
+ gdk_region_get_clipbox (child_event->expose.region, &child_event->expose.area);
+ gtk_widget_send_expose (child, child_event);
}
- gdk_region_destroy (child_event.region);
+ gdk_event_free (child_event);
}
}
projects / ~andy / gtk / blobdiff