* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <stdarg.h>
#include <string.h>
#include <stdlib.h>
#include "gtkcontainer.h"
#include "gtkprivate.h"
-#include "gtksignal.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
#include "gtkwindow.h"
#include "gtkintl.h"
+#include "gtktoolbar.h"
#include <gobject/gobjectnotifyqueue.c>
#include <gobject/gvaluecollector.h>
+#include "gtkalias.h"
enum {
/* --- variables --- */
-static const gchar *vadjustment_key = "gtk-vadjustment";
+static const gchar vadjustment_key[] = "gtk-vadjustment";
static guint vadjustment_key_id = 0;
-static const gchar *hadjustment_key = "gtk-hadjustment";
+static const gchar hadjustment_key[] = "gtk-hadjustment";
static guint hadjustment_key_id = 0;
static GSList *container_resize_queue = NULL;
static guint container_signals[LAST_SIGNAL] = { 0 };
/* --- 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 = {
+ 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, I_("GtkContainer"),
+ &container_info, G_TYPE_FLAG_ABSTRACT);
}
return container_type;
g_object_class_install_property (gobject_class,
PROP_RESIZE_MODE,
- g_param_spec_enum ("resize_mode",
- _("Resize mode"),
- _("Specify how resize events are handled"),
+ g_param_spec_enum ("resize-mode",
+ P_("Resize mode"),
+ P_("Specify how resize events are handled"),
GTK_TYPE_RESIZE_MODE,
GTK_RESIZE_PARENT,
- G_PARAM_READWRITE));
+ GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_BORDER_WIDTH,
- g_param_spec_uint ("border_width",
- _("Border width"),
- _("The width of the empty border outside the containers children."),
+ g_param_spec_uint ("border-width",
+ P_("Border width"),
+ P_("The width of the empty border outside the containers children"),
0,
G_MAXINT,
0,
- G_PARAM_READWRITE));
+ GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_CHILD,
g_param_spec_object ("child",
- _("Child"),
- _("Can be used to add a new child to the container."),
+ P_("Child"),
+ P_("Can be used to add a new child to the container"),
GTK_TYPE_WIDGET,
- G_PARAM_WRITABLE));
+ GTK_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 (I_("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 (I_("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 (I_("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 (I_("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_value_unset (&tmp_value);
}
+/**
+ * gtk_container_child_get_valist:
+ * @container: a #GtkContainer
+ * @child: a widget which is a child of @container
+ * @first_property_name: the name of the first property to get
+ * @var_args: a %NULL-terminated list of property names and #GValue*,
+ * starting with @first_prop_name.
+ *
+ * Gets the values of one or more child properties for @child and @container.
+ **/
void
gtk_container_child_get_valist (GtkContainer *container,
GtkWidget *child,
g_object_unref (container);
}
+/**
+ * gtk_container_child_get_property:
+ * @container: a #GtkContainer
+ * @child: a widget which is a child of @container
+ * @property_name: the name of the property to get
+ * @value: a location to return the value
+ *
+ * Gets the value of a child property for @child and @container.
+ **/
void
gtk_container_child_get_property (GtkContainer *container,
GtkWidget *child,
g_object_unref (container);
}
+/**
+ * gtk_container_child_set_valist:
+ * @container: a #GtkContainer
+ * @child: a widget which is a child of @container
+ * @first_property_name: the name of the first property to set
+ * @var_args: a %NULL-terminated list of property names and values, starting
+ * with @first_prop_name.
+ *
+ * Sets one or more child properties for @child and @container.
+ **/
void
gtk_container_child_set_valist (GtkContainer *container,
GtkWidget *child,
const gchar *first_property_name,
va_list var_args)
{
- GObject *object;
GObjectNotifyQueue *nqueue;
const gchar *name;
g_object_ref (container);
g_object_ref (child);
- object = G_OBJECT (container);
nqueue = g_object_notify_queue_freeze (G_OBJECT (child), _gtk_widget_child_property_notify_context);
name = first_property_name;
while (name)
g_object_unref (child);
}
+/**
+ * gtk_container_child_set_property:
+ * @container: a #GtkContainer
+ * @child: a widget which is a child of @container
+ * @property_name: the name of the property to set
+ * @value: the value to set the property to
+ *
+ * Sets a child property for @child and @container.
+ **/
void
gtk_container_child_set_property (GtkContainer *container,
GtkWidget *child,
const gchar *property_name,
const GValue *value)
{
- GObject *object;
GObjectNotifyQueue *nqueue;
GParamSpec *pspec;
g_object_ref (container);
g_object_ref (child);
- object = G_OBJECT (container);
nqueue = g_object_notify_queue_freeze (G_OBJECT (child), _gtk_widget_child_property_notify_context);
pspec = g_param_spec_pool_lookup (_gtk_widget_child_property_pool, property_name,
G_OBJECT_TYPE (container), TRUE);
g_object_unref (child);
}
+/**
+ * gtk_container_add_with_properties:
+ * @container: a #GtkContainer
+ * @widget: a widget to be placed inside @container
+ * @first_prop_name: the name of the first child property to set
+ * @Varargs: a %NULL-terminated list of property names and values, starting
+ * with @first_prop_name.
+ *
+ * Adds @widget to @container, setting child properties at the same time.
+ * See gtk_container_add() and gtk_container_child_set() for more details.
+ **/
void
gtk_container_add_with_properties (GtkContainer *container,
GtkWidget *widget,
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);
}
+/**
+ * gtk_container_child_set:
+ * @container: a #GtkContainer
+ * @child: a widget which is a child of @container
+ * @first_prop_name: the name of the first property to set
+ * @Varargs: a %NULL-terminated list of property names and values, starting
+ * with @first_prop_name.
+ *
+ * Sets one or more child properties for @child and @container.
+ **/
void
gtk_container_child_set (GtkContainer *container,
GtkWidget *child,
va_end (var_args);
}
+/**
+ * gtk_container_child_get:
+ * @container: a #GtkContainer
+ * @child: a widget which is a child of @container
+ * @first_prop_name: the name of the first property to get
+ * @Varargs: a %NULL-terminated list of property names and #GValue*,
+ * starting with @first_prop_name.
+ *
+ * Gets the values of one or more child properties for @child and @container.
+ **/
void
gtk_container_child_get (GtkContainer *container,
GtkWidget *child,
va_end (var_args);
}
+/**
+ * gtk_container_class_install_child_property:
+ * @cclass: a #GtkContainerClass
+ * @property_id: the id for the property
+ * @pspec: the #GParamSpec for the property
+ *
+ * Installs a child property on a container class.
+ **/
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 child property named `%s'",
- G_OBJECT_CLASS_NAME (class),
+ 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 no
+ * 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: a 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
if (container->border_width != border_width)
{
container->border_width = border_width;
- g_object_notify (G_OBJECT (container), "border_width");
+ g_object_notify (G_OBJECT (container), "border-width");
if (GTK_WIDGET_REALIZED (container))
gtk_widget_queue_resize (GTK_WIDGET (container));
return;
}
- gtk_signal_emit (GTK_OBJECT (container), container_signals[ADD], widget);
+ g_signal_emit (container, container_signals[ADD], 0, widget);
}
/**
* may be the last reference held; so removing a widget from its
* container can destroy that widget. If you want to use @widget
* again, you need to add a reference to it while it's not inside
- * a container, using g_object_ref().
+ * a container, using g_object_ref(). If you don't want to use @widget
+ * again it's usually more efficient to simply destroy it directly
+ * using gtk_widget_destroy() since this will remove it from the
+ * container and help break any circular reference count cycles.
**/
void
gtk_container_remove (GtkContainer *container,
{
g_return_if_fail (GTK_IS_CONTAINER (container));
g_return_if_fail (GTK_IS_WIDGET (widget));
- g_return_if_fail (widget->parent == GTK_WIDGET (container));
+
+ /* When using the deprecated API of the toolbar, it is possible
+ * to legitimately call this function with a widget that is not
+ * a direct child of the container.
+ */
+ g_return_if_fail (GTK_IS_TOOLBAR (container) ||
+ 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
container->resize_mode = resize_mode;
gtk_widget_queue_resize (GTK_WIDGET (container));
- g_object_notify (G_OBJECT (container), "resize_mode");
+ g_object_notify (G_OBJECT (container), "resize-mode");
}
}
static gboolean
gtk_container_idle_sizer (gpointer data)
{
- GDK_THREADS_ENTER ();
-
/* we may be invoked with a container_resize_queue of NULL, because
* queue_resize could have been adding an extra idle function while
* the queue still got processed. we better just ignore such case
gdk_window_process_all_updates ();
- GDK_THREADS_LEAVE ();
-
return FALSE;
}
widget = GTK_WIDGET (container);
resize_container = gtk_container_get_resize_container (container);
- while (!GTK_WIDGET_ALLOC_NEEDED (widget) || !GTK_WIDGET_REQUEST_NEEDED (widget))
+ while (TRUE)
{
GTK_PRIVATE_SET_FLAG (widget, GTK_ALLOC_NEEDED);
GTK_PRIVATE_SET_FLAG (widget, GTK_REQUEST_NEEDED);
{
GTK_PRIVATE_SET_FLAG (resize_container, GTK_RESIZE_PENDING);
if (container_resize_queue == NULL)
- gtk_idle_add_priority (GTK_PRIORITY_RESIZE,
- gtk_container_idle_sizer,
- NULL);
+ gdk_threads_add_idle_full (GTK_PRIORITY_RESIZE,
+ gtk_container_idle_sizer,
+ NULL, NULL);
container_resize_queue = g_slist_prepend (container_resize_queue, resize_container);
}
break;
{
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
/* 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);
}
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);
}
/**
* gtk_container_get_children:
* @container: a #GtkContainer.
*
- * Returns the the container's non-internal children. See
+ * Returns the container's non-internal children. See
* gtk_container_forall() for details on what constitutes an "internal" child.
*
* Return value: a newly-allocated list of the container's non-internal children.
&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;
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;
GtkWidget *child)
{
g_return_if_fail (GTK_IS_CONTAINER (container));
- if (child)
- g_return_if_fail (GTK_IS_WIDGET (child));
+ g_return_if_fail (child == NULL || 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);
}
*/
if (container->focus_child)
{
- GtkAdjustment *adjustment;
-
- adjustment = gtk_object_get_data_by_id (GTK_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);
- if (adjustment)
- gtk_adjustment_clamp_page (adjustment,
- container->focus_child->allocation.x,
- (container->focus_child->allocation.x +
- container->focus_child->allocation.width));
+ GtkAdjustment *hadj;
+ GtkAdjustment *vadj;
+ GtkWidget *focus_child;
+ gint x, y;
+
+ hadj = g_object_get_qdata (G_OBJECT (container), hadjustment_key_id);
+ vadj = g_object_get_qdata (G_OBJECT (container), vadjustment_key_id);
+ if (hadj || vadj)
+ {
+
+ focus_child = container->focus_child;
+ while (GTK_IS_CONTAINER (focus_child) &&
+ GTK_CONTAINER (focus_child)->focus_child)
+ {
+ focus_child = GTK_CONTAINER (focus_child)->focus_child;
+ }
+
+ gtk_widget_translate_coordinates (focus_child, container->focus_child,
+ 0, 0, &x, &y);
+
+ x += container->focus_child->allocation.x;
+ y += container->focus_child->allocation.y;
+
+ if (vadj)
+ gtk_adjustment_clamp_page (vadj, y, y + focus_child->allocation.height);
+
+ if (hadj)
+ gtk_adjustment_clamp_page (hadj, x, x + focus_child->allocation.width);
+ }
}
}
static gint
tab_compare (gconstpointer a,
- gconstpointer b)
+ gconstpointer b,
+ gpointer data)
{
const GtkWidget *child1 = a;
const GtkWidget *child2 = b;
+ GtkTextDirection text_direction = GPOINTER_TO_INT (data);
gint y1 = child1->allocation.y + child1->allocation.height / 2;
gint y2 = child2->allocation.y + child2->allocation.height / 2;
gint x1 = child1->allocation.x + child1->allocation.width / 2;
gint x2 = child2->allocation.x + child2->allocation.width / 2;
- return (x1 < x2) ? -1 : ((x1 == x2) ? 0 : 1);
+ if (text_direction == GTK_TEXT_DIR_RTL)
+ return (x1 < x2) ? 1 : ((x1 == x2) ? 0 : -1);
+ else
+ return (x1 < x2) ? -1 : ((x1 == x2) ? 0 : 1);
}
else
return (y1 < y2) ? -1 : 1;
GtkDirectionType direction,
GtkWidget *old_focus)
{
- children = g_list_sort (children, tab_compare);
+ GtkTextDirection text_direction = gtk_widget_get_direction (GTK_WIDGET (container));
+ children = g_list_sort_with_data (children, tab_compare, GINT_TO_POINTER (text_direction));
/* if we are going backwards then reverse the order
* of the children.
CompareInfo *compare = data;
gint y1, y2;
- if (!get_allocation_coords (compare->container, (GtkWidget *)a, &allocation1))
- return 0;
- if (!get_allocation_coords (compare->container, (GtkWidget *)b, &allocation2))
- return 0;
+ get_allocation_coords (compare->container, (GtkWidget *)a, &allocation1);
+ get_allocation_coords (compare->container, (GtkWidget *)b, &allocation2);
y1 = allocation1.y + allocation1.height / 2;
y2 = allocation2.y + allocation2.height / 2;
CompareInfo *compare = data;
gint x1, x2;
- if (!get_allocation_coords (compare->container, (GtkWidget *)a, &allocation1))
- return 0;
- if (!get_allocation_coords (compare->container, (GtkWidget *)b, &allocation2))
- return 0;
+ get_allocation_coords (compare->container, (GtkWidget *)a, &allocation1);
+ get_allocation_coords (compare->container, (GtkWidget *)b, &allocation2);
x1 = allocation1.x + allocation1.width / 2;
x2 = allocation2.x + allocation2.width / 2;
GtkDirectionType direction,
GtkWidget *old_focus)
{
- children = g_list_copy (children);
+ GList *visible_children = NULL;
+
+ while (children)
+ {
+ if (GTK_WIDGET_REALIZED (children->data))
+ visible_children = g_list_prepend (visible_children, children->data);
+ children = children->next;
+ }
switch (direction)
{
case GTK_DIR_TAB_FORWARD:
case GTK_DIR_TAB_BACKWARD:
- return gtk_container_focus_sort_tab (container, children, direction, old_focus);
+ return gtk_container_focus_sort_tab (container, visible_children, direction, old_focus);
case GTK_DIR_UP:
case GTK_DIR_DOWN:
- return gtk_container_focus_sort_up_down (container, children, direction, old_focus);
+ return gtk_container_focus_sort_up_down (container, visible_children, direction, old_focus);
case GTK_DIR_LEFT:
case GTK_DIR_RIGHT:
- return gtk_container_focus_sort_left_right (container, children, direction, old_focus);
+ return gtk_container_focus_sort_left_right (container, visible_children, direction, old_focus);
}
g_assert_not_reached ();
chain = g_list_remove (chain, widget);
- g_signal_handlers_disconnect_by_func (G_OBJECT (widget),
- (gpointer) chain_widget_destroyed,
+ g_signal_handlers_disconnect_by_func (widget,
+ chain_widget_destroyed,
user_data);
g_object_set_data (G_OBJECT (container),
- "gtk-container-focus-chain",
+ I_("gtk-container-focus-chain"),
chain);
}
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);
}
chain = g_list_reverse (chain);
g_object_set_data (G_OBJECT (container),
- "gtk-container-focus-chain",
+ I_("gtk-container-focus-chain"),
chain);
}
container->has_focus_chain = FALSE;
- g_object_set_data (G_OBJECT (container), "gtk-container-focus-chain",
+ g_object_set_data (G_OBJECT (container),
+ I_("gtk-container-focus-chain"),
NULL);
tmp_list = chain;
while (tmp_list != NULL)
{
- g_signal_handlers_disconnect_by_func (G_OBJECT (tmp_list->data),
- (gpointer) chain_widget_destroyed,
+ g_signal_handlers_disconnect_by_func (tmp_list->data,
+ chain_widget_destroyed,
container);
tmp_list = g_list_next (tmp_list);
}
}
+/**
+ * gtk_container_set_focus_vadjustment:
+ * @container: a #GtkContainer
+ * @adjustment: an adjustment which should be adjusted when the focus is moved among the
+ * descendents of @container
+ *
+ * Hooks up an adjustment to focus handling in a container, so when a child of the
+ * container is focused, the adjustment is scrolled to show that widget. This function
+ * sets the vertical alignment. See gtk_scrolled_window_get_vadjustment() for a typical
+ * way of obtaining the adjustment and gtk_container_set_focus_hadjustment() for setting
+ * the horizontal adjustment.
+ *
+ * The adjustments have to be in pixel units and in the same coordinate system as the
+ * allocation for immediate children of the container.
+ */
void
gtk_container_set_focus_vadjustment (GtkContainer *container,
GtkAdjustment *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:
+ * @container: a #GtkContainer
+ * @adjustment: an adjustment which should be adjusted when the focus is moved among the
+ * descendents of @container
+ *
+ * Hooks up an adjustment to focus handling in a container, so when a child of the
+ * container is focused, the adjustment is scrolled to show that widget. This function
+ * sets the horizontal alignment. See gtk_scrolled_window_get_hadjustment() for a typical
+ * way of obtaining the adjustment and gtk_container_set_focus_vadjustment() for setting
+ * the vertical adjustment.
+ *
+ * The adjustments have to be in pixel units and in the same coordinate system as the
+ * allocation for immediate children of the container.
+ */
void
gtk_container_set_focus_hadjustment (GtkContainer *container,
GtkAdjustment *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;
}
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);
}
}
+
+#define __GTK_CONTAINER_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff