]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkcontainer.c
Make the widgets work reasonably when they don't have children -- draw the
[~andy/gtk] / gtk / gtkcontainer.c
index 4595e7fcad1f7180ad90b972e409ef3f10d7be0f..4ac681ca78ef5426b9f8c16db0e931608c0aad25 100644 (file)
  * 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
+ * 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 <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 <gobject/gobjectnotifyqueue.c>
+#include <gobject/gvaluecollector.h>
 
 
 enum {
   ADD,
   REMOVE,
-  NEED_RESIZE,
-  FOREACH,
-  FOCUS,
+  CHECK_RESIZE,
+  SET_FOCUS_CHILD,
   LAST_SIGNAL
 };
+
 enum {
-  ARG_0,
-  ARG_BORDER_WIDTH,
-  ARG_AUTO_RESIZE,
-  ARG_BLOCK_RESIZE,
-  ARG_CHILD
+  PROP_0,
+  PROP_BORDER_WIDTH,
+  PROP_RESIZE_MODE,
+  PROP_CHILD
 };
 
-
-typedef void (*GtkContainerSignal1) (GtkObject *object,
-                                    gpointer   arg1,
-                                    gpointer   data);
-typedef void (*GtkContainerSignal2) (GtkObject *object,
-                                    GtkFunction arg1,
-                                    gpointer   arg2,
-                                    gpointer   data);
-typedef gint (*GtkContainerSignal3) (GtkObject *object,
-                                    gint       arg1,
-                                    gpointer   data);
-typedef gint (*GtkContainerSignal4) (GtkObject *object,
-                                    gpointer   data);
-
-
-static void gtk_container_marshal_signal_1 (GtkObject      *object,
-                                           GtkSignalFunc   func,
-                                           gpointer        func_data,
-                                           GtkArg         *args);
-static void gtk_container_marshal_signal_2 (GtkObject      *object,
-                                           GtkSignalFunc   func,
-                                           gpointer        func_data,
-                                           GtkArg         *args);
-static void gtk_container_marshal_signal_3 (GtkObject      *object,
-                                           GtkSignalFunc   func,
-                                           gpointer        func_data,
-                                           GtkArg         *args);
-static void gtk_container_marshal_signal_4 (GtkObject      *object,
-                                           GtkSignalFunc   func,
-                                           gpointer        func_data,
-                                           GtkArg         *args);
-
-
-static void gtk_container_class_init        (GtkContainerClass *klass);
-static void gtk_container_init              (GtkContainer      *container);
-static void gtk_container_destroy           (GtkObject         *object);
-static void gtk_container_get_arg           (GtkContainer      *container,
-                                            GtkArg            *arg,
-                                            guint              arg_id);
-static void gtk_container_set_arg           (GtkContainer      *container,
-                                            GtkArg            *arg,
-                                            guint              arg_id);
-static void gtk_container_add_unimplemented (GtkContainer      *container,
-                                            GtkWidget         *widget);
-static void gtk_container_remove_unimplemented (GtkContainer   *container,
-                                               GtkWidget      *widget);
-static gint gtk_real_container_need_resize  (GtkContainer      *container);
-static gint gtk_real_container_focus        (GtkContainer      *container,
-                                            GtkDirectionType   direction);
-static gint gtk_container_focus_tab         (GtkContainer      *container,
-                                            GList             *children,
-                                            GtkDirectionType   direction);
-static gint gtk_container_focus_up_down     (GtkContainer      *container,
-                                            GList             *children,
-                                            GtkDirectionType   direction);
-static gint gtk_container_focus_left_right  (GtkContainer      *container,
-                                            GList             *children,
-                                            GtkDirectionType   direction);
-static gint gtk_container_focus_move        (GtkContainer      *container,
-                                            GList             *children,
-                                            GtkDirectionType   direction);
-static void gtk_container_children_callback (GtkWidget         *widget,
-                                             gpointer           client_data);
-static void gtk_container_show_all          (GtkWidget         *widget);
-static void gtk_container_hide_all          (GtkWidget         *widget);
-
-
-
-static guint container_signals[LAST_SIGNAL] = { 0 };
-
-static GtkWidgetClass *parent_class = NULL;
-
-static const gchar *vadjustment_key = "gtk-vadjustment";
-static guint        vadjustment_key_id = 0;
-static const gchar *hadjustment_key = "gtk-hadjustment";
-static guint        hadjustment_key_id = 0;
-
-GtkType
+#define PARAM_SPEC_PARAM_ID(pspec)              ((pspec)->param_id)
+#define PARAM_SPEC_SET_PARAM_ID(pspec, id)      ((pspec)->param_id = (id))
+
+
+/* --- prototypes --- */
+static void     gtk_container_base_class_init      (GtkContainerClass *klass);
+static void     gtk_container_base_class_finalize  (GtkContainerClass *klass);
+static void     gtk_container_class_init           (GtkContainerClass *klass);
+static void     gtk_container_init                 (GtkContainer      *container);
+static void     gtk_container_destroy              (GtkObject         *object);
+static void     gtk_container_set_property         (GObject         *object,
+                                                   guint            prop_id,
+                                                   const GValue    *value,
+                                                   GParamSpec      *pspec);
+static void     gtk_container_get_property         (GObject         *object,
+                                                   guint            prop_id,
+                                                   GValue          *value,
+                                                   GParamSpec      *pspec);
+static void     gtk_container_add_unimplemented    (GtkContainer      *container,
+                                                   GtkWidget         *widget);
+static void     gtk_container_remove_unimplemented (GtkContainer      *container,
+                                                   GtkWidget         *widget);
+static void     gtk_container_real_check_resize    (GtkContainer      *container);
+static gboolean gtk_container_focus                (GtkWidget         *widget,
+                                                   GtkDirectionType   direction);
+static void     gtk_container_real_set_focus_child (GtkContainer      *container,
+                                                   GtkWidget         *widget);
+
+static gboolean gtk_container_focus_move           (GtkContainer      *container,
+                                                   GList             *children,
+                                                   GtkDirectionType   direction);
+static void     gtk_container_children_callback    (GtkWidget         *widget,
+                                                   gpointer           client_data);
+static void     gtk_container_show_all             (GtkWidget         *widget);
+static void     gtk_container_hide_all             (GtkWidget         *widget);
+static gint     gtk_container_expose               (GtkWidget         *widget,
+                                                   GdkEventExpose    *event);
+static void     gtk_container_map                  (GtkWidget         *widget);
+static void     gtk_container_unmap                (GtkWidget         *widget);
+
+static gchar* gtk_container_child_default_composite_name (GtkContainer *container,
+                                                         GtkWidget    *child);
+
+
+/* --- variables --- */
+static const gchar          *vadjustment_key = "gtk-vadjustment";
+static guint                 vadjustment_key_id = 0;
+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 };
+static GtkWidgetClass       *parent_class = NULL;
+extern GParamSpecPool       *_gtk_widget_child_property_pool;
+extern GObjectNotifyContext *_gtk_widget_child_property_notify_context;
+
+
+/* --- functions --- */
+GType
 gtk_container_get_type (void)
 {
-  static GtkType container_type = 0;
+  static GType container_type = 0;
 
   if (!container_type)
     {
-      GtkTypeInfo container_info =
+      static const GTypeInfo container_info =
       {
-       "GtkContainer",
-       sizeof (GtkContainer),
        sizeof (GtkContainerClass),
-       (GtkClassInitFunc) gtk_container_class_init,
-       (GtkObjectInitFunc) gtk_container_init,
-       (GtkArgSetFunc) gtk_container_set_arg,
-       (GtkArgGetFunc) gtk_container_get_arg,
+       (GBaseInitFunc) gtk_container_base_class_init,
+       (GBaseFinalizeFunc) gtk_container_base_class_finalize,
+       (GClassInitFunc) gtk_container_class_init,
+       NULL        /* class_finalize */,
+       NULL        /* class_data */,
+       sizeof (GtkContainer),
+       0           /* n_preallocs */,
+       (GInstanceInitFunc) gtk_container_init,
+       NULL,       /* value_table */
       };
 
-      container_type = gtk_type_unique (gtk_widget_get_type (), &container_info);
+      container_type =
+       g_type_register_static (GTK_TYPE_WIDGET, "GtkContainer", 
+                               &container_info, G_TYPE_FLAG_ABSTRACT);
     }
 
   return container_type;
 }
 
 static void
-gtk_container_class_init (GtkContainerClass *class)
+gtk_container_base_class_init (GtkContainerClass *class)
 {
-  GtkObjectClass *object_class;
-  GtkWidgetClass *widget_class;
+  /* reset instance specifc class fields that don't get inherited */
+  class->set_child_property = NULL;
+  class->get_child_property = NULL;
+}
 
-  object_class = (GtkObjectClass*) class;
-  widget_class = (GtkWidgetClass*) class;
+static void
+gtk_container_base_class_finalize (GtkContainerClass *class)
+{
+  GList *list, *node;
 
-  parent_class = gtk_type_class (gtk_widget_get_type ());
+  list = g_param_spec_pool_list_owned (_gtk_widget_child_property_pool, G_OBJECT_CLASS_TYPE (class));
+  for (node = list; node; node = node->next)
+    {
+      GParamSpec *pspec = node->data;
 
-  vadjustment_key_id = gtk_object_data_force_id (vadjustment_key);
-  hadjustment_key_id = gtk_object_data_force_id (hadjustment_key);
-  
-  gtk_object_add_arg_type ("GtkContainer::border_width", GTK_TYPE_LONG, GTK_ARG_READWRITE, ARG_BORDER_WIDTH);
-  gtk_object_add_arg_type ("GtkContainer::auto_resize", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_AUTO_RESIZE);
-  gtk_object_add_arg_type ("GtkContainer::block_resize", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_BLOCK_RESIZE);
-  gtk_object_add_arg_type ("GtkContainer::child", GTK_TYPE_WIDGET, GTK_ARG_WRITABLE, ARG_CHILD);
+      g_param_spec_pool_remove (_gtk_widget_child_property_pool, pspec);
+      PARAM_SPEC_SET_PARAM_ID (pspec, 0);
+      g_param_spec_unref (pspec);
+    }
+  g_list_free (list);
+}
 
-  container_signals[ADD] =
-    gtk_signal_new ("add",
-                    GTK_RUN_FIRST,
-                    object_class->type,
-                    GTK_SIGNAL_OFFSET (GtkContainerClass, add),
-                    gtk_container_marshal_signal_1,
-                   GTK_TYPE_NONE, 1,
-                    GTK_TYPE_WIDGET);
-  container_signals[REMOVE] =
-    gtk_signal_new ("remove",
-                    GTK_RUN_FIRST,
-                    object_class->type,
-                    GTK_SIGNAL_OFFSET (GtkContainerClass, remove),
-                    gtk_container_marshal_signal_1,
-                   GTK_TYPE_NONE, 1,
-                    GTK_TYPE_WIDGET);
-  container_signals[NEED_RESIZE] =
-    gtk_signal_new ("need_resize",
-                    GTK_RUN_LAST,
-                    object_class->type,
-                    GTK_SIGNAL_OFFSET (GtkContainerClass, need_resize),
-                    gtk_container_marshal_signal_4,
-                   GTK_TYPE_BOOL, 0);
-  container_signals[FOREACH] =
-    gtk_signal_new ("foreach",
-                    GTK_RUN_FIRST,
-                    object_class->type,
-                    GTK_SIGNAL_OFFSET (GtkContainerClass, foreach),
-                    gtk_container_marshal_signal_2,
-                   GTK_TYPE_NONE, 1,
-                    GTK_TYPE_C_CALLBACK);
-  container_signals[FOCUS] =
-    gtk_signal_new ("focus",
-                    GTK_RUN_LAST,
-                    object_class->type,
-                    GTK_SIGNAL_OFFSET (GtkContainerClass, focus),
-                    gtk_container_marshal_signal_3,
-                   GTK_TYPE_DIRECTION_TYPE, 1,
-                    GTK_TYPE_DIRECTION_TYPE);
-
-  gtk_object_class_add_signals (object_class, container_signals, LAST_SIGNAL);
+static void
+gtk_container_class_init (GtkContainerClass *class)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+  GtkObjectClass *object_class = GTK_OBJECT_CLASS (class);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+
+  parent_class = g_type_class_peek_parent (class);
+
+  vadjustment_key_id = g_quark_from_static_string (vadjustment_key);
+  hadjustment_key_id = g_quark_from_static_string (hadjustment_key);
   
+  gobject_class->set_property = gtk_container_set_property;
+  gobject_class->get_property = gtk_container_get_property;
+
   object_class->destroy = gtk_container_destroy;
-  
-  /* Other container classes should overwrite show_all and hide_all,
-   * for the purpose of showing internal children also, which are not
-   * accessable through gtk_container_foreach.
-  */
+
   widget_class->show_all = gtk_container_show_all;
   widget_class->hide_all = gtk_container_hide_all;
-
+  widget_class->expose_event = gtk_container_expose;
+  widget_class->map = gtk_container_map;
+  widget_class->unmap = gtk_container_unmap;
+  widget_class->focus = gtk_container_focus;
+  
   class->add = gtk_container_add_unimplemented;
   class->remove = gtk_container_remove_unimplemented;
-  class->need_resize = gtk_real_container_need_resize;
-  class->foreach = NULL;
-  class->focus = gtk_real_container_focus;
+  class->check_resize = gtk_container_real_check_resize;
+  class->forall = NULL;
+  class->set_focus_child = gtk_container_real_set_focus_child;
+  class->child_type = NULL;
+  class->composite_name = gtk_container_child_default_composite_name;
+
+  g_object_class_install_property (gobject_class,
+                                   PROP_RESIZE_MODE,
+                                   g_param_spec_enum ("resize_mode",
+                                                      _("Resize mode"),
+                                                      _("Specify how resize events are handled"),
+                                                      GTK_TYPE_RESIZE_MODE,
+                                                      GTK_RESIZE_PARENT,
+                                                      G_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"),
+                                                     0,
+                                                     G_MAXINT,
+                                                     0,
+                                                      G_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"),
+                                                      GTK_TYPE_WIDGET,
+                                                     G_PARAM_WRITABLE));
+  container_signals[ADD] =
+    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] =
+    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] =
+    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] =
+    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);
+}
+
+/**
+ * gtk_container_child_type: 
+ * @container: a #GtkContainer.
+ *
+ * Returns the type of the children supported by the container.
+ *
+ * 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 #GType.
+ **/
+GType
+gtk_container_child_type (GtkContainer *container)
+{
+  GType slot;
+  GtkContainerClass *class;
+
+  g_return_val_if_fail (GTK_IS_CONTAINER (container), 0);
+
+  class = GTK_CONTAINER_GET_CLASS (container);
+  if (class->child_type)
+    slot = class->child_type (container);
+  else
+    slot = G_TYPE_NONE;
+
+  return slot;
+}
+
+/* --- GtkContainer child property mechanism --- */
+static inline void
+container_get_child_property (GtkContainer *container,
+                             GtkWidget    *child,
+                             GParamSpec   *pspec,
+                             GValue       *value)
+{
+  GtkContainerClass *class = g_type_class_peek (pspec->owner_type);
+  
+  class->get_child_property (container, child, PARAM_SPEC_PARAM_ID (pspec), value, pspec);
+}
+
+static inline void
+container_set_child_property (GtkContainer       *container,
+                             GtkWidget          *child,
+                             GParamSpec         *pspec,
+                             const GValue       *value,
+                             GObjectNotifyQueue *nqueue)
+{
+  GValue tmp_value = { 0, };
+  GtkContainerClass *class = g_type_class_peek (pspec->owner_type);
+
+  /* provide a copy to work from, convert (if necessary) and validate */
+  g_value_init (&tmp_value, G_PARAM_SPEC_VALUE_TYPE (pspec));
+  if (!g_value_transform (value, &tmp_value))
+    g_warning ("unable to set child property `%s' of type `%s' from value of type `%s'",
+              pspec->name,
+              g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec)),
+              G_VALUE_TYPE_NAME (value));
+  else if (g_param_value_validate (pspec, &tmp_value) && !(pspec->flags & G_PARAM_LAX_VALIDATION))
+    {
+      gchar *contents = g_strdup_value_contents (value);
+
+      g_warning ("value \"%s\" of type `%s' is invalid for property `%s' of type `%s'",
+                contents,
+                G_VALUE_TYPE_NAME (value),
+                pspec->name,
+                g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec)));
+      g_free (contents);
+    }
+  else
+    {
+      class->set_child_property (container, child, PARAM_SPEC_PARAM_ID (pspec), &tmp_value, pspec);
+      g_object_notify_queue_add (G_OBJECT (child), nqueue, pspec);
+    }
+  g_value_unset (&tmp_value);
+}
+
+void
+gtk_container_child_get_valist (GtkContainer *container,
+                               GtkWidget    *child,
+                               const gchar  *first_property_name,
+                               va_list       var_args)
+{
+  const gchar *name;
+
+  g_return_if_fail (GTK_IS_CONTAINER (container));
+  g_return_if_fail (GTK_IS_WIDGET (child));
+  g_return_if_fail (child->parent == GTK_WIDGET (container));
+
+  g_object_ref (container);
+  g_object_ref (child);
+
+  name = first_property_name;
+  while (name)
+    {
+      GValue value = { 0, };
+      GParamSpec *pspec;
+      gchar *error;
+
+      pspec = g_param_spec_pool_lookup (_gtk_widget_child_property_pool,
+                                       name,
+                                       G_OBJECT_TYPE (container),
+                                       TRUE);
+      if (!pspec)
+       {
+         g_warning ("%s: container class `%s' has no child property named `%s'",
+                    G_STRLOC,
+                    G_OBJECT_TYPE_NAME (container),
+                    name);
+         break;
+       }
+      if (!(pspec->flags & G_PARAM_READABLE))
+       {
+         g_warning ("%s: child property `%s' of container class `%s' is not readable",
+                    G_STRLOC,
+                    pspec->name,
+                    G_OBJECT_TYPE_NAME (container));
+         break;
+       }
+      g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (pspec));
+      container_get_child_property (container, child, pspec, &value);
+      G_VALUE_LCOPY (&value, var_args, 0, &error);
+      if (error)
+       {
+         g_warning ("%s: %s", G_STRLOC, error);
+         g_free (error);
+         g_value_unset (&value);
+         break;
+       }
+      g_value_unset (&value);
+      name = va_arg (var_args, gchar*);
+    }
+
+  g_object_unref (child);
+  g_object_unref (container);
+}
+
+void
+gtk_container_child_get_property (GtkContainer *container,
+                                 GtkWidget    *child,
+                                 const gchar  *property_name,
+                                 GValue       *value)
+{
+  GParamSpec *pspec;
+
+  g_return_if_fail (GTK_IS_CONTAINER (container));
+  g_return_if_fail (GTK_IS_WIDGET (child));
+  g_return_if_fail (child->parent == GTK_WIDGET (container));
+  g_return_if_fail (property_name != NULL);
+  g_return_if_fail (G_IS_VALUE (value));
+  
+  g_object_ref (container);
+  g_object_ref (child);
+  pspec = g_param_spec_pool_lookup (_gtk_widget_child_property_pool, property_name,
+                                   G_OBJECT_TYPE (container), TRUE);
+  if (!pspec)
+    g_warning ("%s: container class `%s' has no child property named `%s'",
+              G_STRLOC,
+              G_OBJECT_TYPE_NAME (container),
+              property_name);
+  else if (!(pspec->flags & G_PARAM_READABLE))
+    g_warning ("%s: child property `%s' of container class `%s' is not readable",
+              G_STRLOC,
+              pspec->name,
+              G_OBJECT_TYPE_NAME (container));
+  else
+    {
+      GValue *prop_value, tmp_value = { 0, };
+
+      /* auto-conversion of the callers value type
+       */
+      if (G_VALUE_TYPE (value) == G_PARAM_SPEC_VALUE_TYPE (pspec))
+       {
+         g_value_reset (value);
+         prop_value = value;
+       }
+      else if (!g_value_type_transformable (G_PARAM_SPEC_VALUE_TYPE (pspec), G_VALUE_TYPE (value)))
+       {
+         g_warning ("can't retrieve child property `%s' of type `%s' as value of type `%s'",
+                    pspec->name,
+                    g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec)),
+                    G_VALUE_TYPE_NAME (value));
+         g_object_unref (child);
+         g_object_unref (container);
+         return;
+       }
+      else
+       {
+         g_value_init (&tmp_value, G_PARAM_SPEC_VALUE_TYPE (pspec));
+         prop_value = &tmp_value;
+       }
+      container_get_child_property (container, child, pspec, prop_value);
+      if (prop_value != value)
+       {
+         g_value_transform (prop_value, value);
+         g_value_unset (&tmp_value);
+       }
+    }
+  g_object_unref (child);
+  g_object_unref (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_return_if_fail (GTK_IS_CONTAINER (container));
+  g_return_if_fail (GTK_IS_WIDGET (child));
+  g_return_if_fail (child->parent == GTK_WIDGET (container));
+
+  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)
+    {
+      GValue value = { 0, };
+      gchar *error = NULL;
+      GParamSpec *pspec = g_param_spec_pool_lookup (_gtk_widget_child_property_pool,
+                                                   name,
+                                                   G_OBJECT_TYPE (container),
+                                                   TRUE);
+      if (!pspec)
+       {
+         g_warning ("%s: container class `%s' has no child property named `%s'",
+                    G_STRLOC,
+                    G_OBJECT_TYPE_NAME (container),
+                    name);
+         break;
+       }
+      if (!(pspec->flags & G_PARAM_WRITABLE))
+       {
+         g_warning ("%s: child property `%s' of container class `%s' is not writable",
+                    G_STRLOC,
+                    pspec->name,
+                    G_OBJECT_TYPE_NAME (container));
+         break;
+       }
+      g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (pspec));
+      G_VALUE_COLLECT (&value, var_args, 0, &error);
+      if (error)
+       {
+         g_warning ("%s: %s", G_STRLOC, error);
+         g_free (error);
+
+         /* we purposely leak the value here, it might not be
+          * in a sane state if an error condition occoured
+          */
+         break;
+       }
+      container_set_child_property (container, child, pspec, &value, nqueue);
+      g_value_unset (&value);
+      name = va_arg (var_args, gchar*);
+    }
+  g_object_notify_queue_thaw (G_OBJECT (child), nqueue);
+
+  g_object_unref (container);
+  g_object_unref (child);
+}
+
+void
+gtk_container_child_set_property (GtkContainer *container,
+                                 GtkWidget    *child,
+                                 const gchar  *property_name,
+                                 const GValue *value)
+{
+  GObject *object;
+  GObjectNotifyQueue *nqueue;
+  GParamSpec *pspec;
+
+  g_return_if_fail (GTK_IS_CONTAINER (container));
+  g_return_if_fail (GTK_IS_WIDGET (child));
+  g_return_if_fail (child->parent == GTK_WIDGET (container));
+  g_return_if_fail (property_name != NULL);
+  g_return_if_fail (G_IS_VALUE (value));
+  
+  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);
+  if (!pspec)
+    g_warning ("%s: container class `%s' has no child property named `%s'",
+              G_STRLOC,
+              G_OBJECT_TYPE_NAME (container),
+              property_name);
+  else if (!(pspec->flags & G_PARAM_WRITABLE))
+    g_warning ("%s: child property `%s' of container class `%s' is not writable",
+              G_STRLOC,
+              pspec->name,
+              G_OBJECT_TYPE_NAME (container));
+  else
+    {
+      container_set_child_property (container, child, pspec, value, nqueue);
+    }
+  g_object_notify_queue_thaw (G_OBJECT (child), nqueue);
+  g_object_unref (container);
+  g_object_unref (child);
+}
+
+void
+gtk_container_add_with_properties (GtkContainer *container,
+                                  GtkWidget    *widget,
+                                  const gchar  *first_prop_name,
+                                  ...)
+{
+  g_return_if_fail (GTK_IS_CONTAINER (container));
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+  g_return_if_fail (widget->parent == NULL);
+
+  g_object_ref (container);
+  g_object_ref (widget);
+  gtk_widget_freeze_child_notify (widget);
+
+  g_signal_emit (container, container_signals[ADD], 0, widget);
+  if (widget->parent)
+    {
+      va_list var_args;
+
+      va_start (var_args, first_prop_name);
+      gtk_container_child_set_valist (container, widget, first_prop_name, var_args);
+      va_end (var_args);
+    }
+
+  gtk_widget_thaw_child_notify (widget);
+  g_object_unref (widget);
+  g_object_unref (container);
+}
+
+void
+gtk_container_child_set (GtkContainer      *container,
+                        GtkWidget         *child,
+                        const gchar       *first_prop_name,
+                        ...)
+{
+  va_list var_args;
+  
+  g_return_if_fail (GTK_IS_CONTAINER (container));
+  g_return_if_fail (GTK_IS_WIDGET (child));
+  g_return_if_fail (child->parent == GTK_WIDGET (container));
+
+  va_start (var_args, first_prop_name);
+  gtk_container_child_set_valist (container, child, first_prop_name, var_args);
+  va_end (var_args);
+}
+
+void
+gtk_container_child_get (GtkContainer      *container,
+                        GtkWidget         *child,
+                        const gchar       *first_prop_name,
+                        ...)
+{
+  va_list var_args;
+  
+  g_return_if_fail (GTK_IS_CONTAINER (container));
+  g_return_if_fail (GTK_IS_WIDGET (child));
+  g_return_if_fail (child->parent == GTK_WIDGET (container));
+
+  va_start (var_args, first_prop_name);
+  gtk_container_child_get_valist (container, child, first_prop_name, var_args);
+  va_end (var_args);
+}
+
+void
+gtk_container_class_install_child_property (GtkContainerClass *cclass,
+                                           guint              property_id,
+                                           GParamSpec        *pspec)
+{
+  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 (cclass->set_child_property != NULL);
+  if (pspec->flags & G_PARAM_READABLE)
+    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 (cclass), FALSE))
+    {
+      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 (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 *cclass,
+                                        const gchar  *property_name)
+{
+  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 (cclass),
+                                  TRUE);
+}
+
+/**
+ * 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 (cclass), NULL);
+
+  pspecs = g_param_spec_pool_list (_gtk_widget_child_property_pool,
+                                  G_OBJECT_CLASS_TYPE (cclass),
+                                  &n);
+  if (n_properties)
+    *n_properties = n;
+
+  return pspecs;
 }
 
 static void
 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
@@ -235,252 +726,520 @@ gtk_container_init (GtkContainer *container)
 {
   container->focus_child = NULL;
   container->border_width = 0;
-  container->auto_resize = TRUE;
   container->need_resize = FALSE;
-  container->block_resize = FALSE;
-  container->resize_widgets = NULL;
+  container->resize_mode = GTK_RESIZE_PARENT;
+  container->reallocate_redraws = FALSE;
 }
 
 static void
 gtk_container_destroy (GtkObject *object)
 {
-  GSList *node;
+  GtkContainer *container = GTK_CONTAINER (object);
   
-  g_return_if_fail (object != NULL);
-  g_return_if_fail (GTK_IS_CONTAINER (object));
+  if (GTK_CONTAINER_RESIZE_PENDING (container))
+    _gtk_container_dequeue_resize_handler (container);
 
-  for (node = GTK_CONTAINER (object)->resize_widgets; node; node = node->next)
-    {
-      GtkWidget *child;
-      
-      child = (GtkWidget*) node->data;
-      GTK_PRIVATE_UNSET_FLAG (child, GTK_RESIZE_NEEDED);
-    }
-  g_slist_free (GTK_CONTAINER (object)->resize_widgets);
-  GTK_CONTAINER (object)->resize_widgets = NULL;
+  /* do this before walking child widgets, to avoid
+   * removing children from focus chain one by one.
+   */
+  if (container->has_focus_chain)
+    gtk_container_unset_focus_chain (container);
   
-  gtk_container_foreach (GTK_CONTAINER (object),
-                        (GtkCallback) gtk_widget_destroy, NULL);
+  gtk_container_foreach (container, (GtkCallback) gtk_widget_destroy, NULL);
   
   if (GTK_OBJECT_CLASS (parent_class)->destroy)
     (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 }
 
 static void
-gtk_container_set_arg (GtkContainer *container,
-                      GtkArg       *arg,
-                      guint         arg_id)
+gtk_container_set_property (GObject         *object,
+                           guint            prop_id,
+                           const GValue    *value,
+                           GParamSpec      *pspec)
 {
-  switch (arg_id)
+  GtkContainer *container = GTK_CONTAINER (object);
+
+  switch (prop_id)
     {
-    case ARG_BORDER_WIDTH:
-      gtk_container_border_width (container, GTK_VALUE_LONG (*arg));
-      break;
-    case ARG_AUTO_RESIZE:
-      if (GTK_VALUE_BOOL (*arg))
-       gtk_container_enable_resize (container);
-      else
-       gtk_container_disable_resize (container);
+    case PROP_BORDER_WIDTH:
+      gtk_container_set_border_width (container, g_value_get_uint (value));
       break;
-    case ARG_BLOCK_RESIZE:
-      if (GTK_VALUE_BOOL (*arg))
-       gtk_container_block_resize (container);
-      else
-       gtk_container_unblock_resize (container);
+    case PROP_RESIZE_MODE:
+      gtk_container_set_resize_mode (container, g_value_get_enum (value));
       break;
-    case ARG_CHILD:
-      gtk_container_add (container, GTK_WIDGET (GTK_VALUE_OBJECT (*arg)));
+    case PROP_CHILD:
+      gtk_container_add (container, GTK_WIDGET (g_value_get_object (value)));
       break;
     default:
-      arg->type = GTK_TYPE_INVALID;
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
     }
 }
 
 static void
-gtk_container_get_arg (GtkContainer *container,
-                      GtkArg       *arg,
-                      guint         arg_id)
+gtk_container_get_property (GObject         *object,
+                           guint            prop_id,
+                           GValue          *value,
+                           GParamSpec      *pspec)
 {
-  switch (arg_id)
+  GtkContainer *container = GTK_CONTAINER (object);
+  
+  switch (prop_id)
     {
-    case ARG_BORDER_WIDTH:
-      GTK_VALUE_LONG (*arg) = container->border_width;
-      break;
-    case ARG_AUTO_RESIZE:
-      GTK_VALUE_BOOL (*arg) = container->auto_resize;
+    case PROP_BORDER_WIDTH:
+      g_value_set_uint (value, container->border_width);
       break;
-    case ARG_BLOCK_RESIZE:
-      GTK_VALUE_BOOL (*arg) = container->block_resize;
+    case PROP_RESIZE_MODE:
+      g_value_set_enum (value, container->resize_mode);
       break;
     default:
-      arg->type = GTK_TYPE_INVALID;
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
     }
 }
 
+/**
+ * gtk_container_set_border_width:
+ * @container: a #GtkContainer
+ * @border_width: amount of blank space to leave <emphasis>outside</emphasis> the container.
+ *   Valid values are in the range 0-65535 pixels.
+ *
+ * Sets the border width of the container.
+ *
+ * The border width of a container is the amount of space to leave
+ * around the outside of the container. The only exception to this is
+ * #GtkWindow; because toplevel windows can't leave space outside,
+ * they leave the space inside. The border is added on all sides of
+ * the container. To add space to only one side, one approach is to
+ * create a #GtkAlignment widget, call gtk_widget_set_usize() to give
+ * it a size, and place it on the side of the container as a spacer.
+ **/
 void
-gtk_container_border_width (GtkContainer *container,
-                           gint          border_width)
+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)
     {
       container->border_width = border_width;
-
+      g_object_notify (G_OBJECT (container), "border_width");
+      
       if (GTK_WIDGET_REALIZED (container))
        gtk_widget_queue_resize (GTK_WIDGET (container));
     }
 }
 
+/**
+ * gtk_container_get_border_width:
+ * @container: a #GtkContainer
+ * 
+ * Retrieves the border width of the container. See
+ * gtk_container_set_border_width().
+ *
+ * Return value: the current border width
+ **/
+guint
+gtk_container_get_border_width (GtkContainer *container)
+{
+  g_return_val_if_fail (GTK_IS_CONTAINER (container), 0);
+
+  return container->border_width;
+}
+
+/**
+ * gtk_container_add:
+ * @container: a #GtkContainer
+ * @widget: a widget to be placed inside @container
+ * 
+ * Adds @widget to @container. Typically used for simple containers
+ * such as #GtkWindow, #GtkFrame, or #GtkButton; for more complicated
+ * layout containers such as #GtkBox or #GtkTable, this function will
+ * pick default packing parameters that may not be correct.  So
+ * consider functions such as gtk_box_pack_start() and
+ * gtk_table_attach() as an alternative to gtk_container_add() in
+ * those cases. A widget may be added to only one container at a time;
+ * you can't place the same widget inside two different containers.
+ **/
 void
 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));
-  g_return_if_fail (widget->parent == NULL);
 
-  gtk_signal_emit (GTK_OBJECT (container), container_signals[ADD], widget);
+  if (widget->parent != NULL)
+    {
+      g_warning ("Attempting to add a widget with type %s to a container of "
+                 "type %s, but the widget is already inside a container of type %s, "
+                 "the GTK+ FAQ at http://www.gtk.org/faq/ explains how to reparent a widget.",
+                 g_type_name (G_OBJECT_TYPE (widget)),
+                 g_type_name (G_OBJECT_TYPE (container)),
+                 g_type_name (G_OBJECT_TYPE (widget->parent)));
+      return;
+    }
+
+  g_signal_emit (container, container_signals[ADD], 0, widget);
 }
 
+/**
+ * gtk_container_remove:
+ * @container: a #GtkContainer
+ * @widget: a current child of @container
+ * 
+ * Removes @widget from @container. @widget must be inside @container.
+ * Note that @container will own a reference to @widget, and that this
+ * 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().
+ **/
 void
 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_disable_resize (GtkContainer *container)
+_gtk_container_dequeue_resize_handler (GtkContainer *container)
 {
-  g_return_if_fail (container != NULL);
   g_return_if_fail (GTK_IS_CONTAINER (container));
+  g_return_if_fail (GTK_CONTAINER_RESIZE_PENDING (container));
 
-  container->auto_resize = FALSE;
+  container_resize_queue = g_slist_remove (container_resize_queue, container);
+  GTK_PRIVATE_UNSET_FLAG (container, GTK_RESIZE_PENDING);
 }
 
+/**
+ * gtk_container_set_resize_mode:
+ * @container: a #GtkContainer.
+ * @resize_mode: the new resize mode.
+ * 
+ * Sets the resize mode for the container.
+ *
+ * The resize mode of a container determines whether a resize request 
+ * will be passed to the container's parent, queued for later execution
+ * or executed immediately.
+ **/
 void
-gtk_container_enable_resize (GtkContainer *container)
+gtk_container_set_resize_mode (GtkContainer  *container,
+                              GtkResizeMode  resize_mode)
 {
-  g_return_if_fail (container != NULL);
   g_return_if_fail (GTK_IS_CONTAINER (container));
-
-  container->auto_resize = TRUE;
-  if (container->need_resize)
+  g_return_if_fail (resize_mode <= GTK_RESIZE_IMMEDIATE);
+  
+  if (GTK_WIDGET_TOPLEVEL (container) &&
+      resize_mode == GTK_RESIZE_PARENT)
     {
-      container->need_resize = FALSE;
+      resize_mode = GTK_RESIZE_QUEUE;
+    }
+  
+  if (container->resize_mode != resize_mode)
+    {
+      container->resize_mode = resize_mode;
+      
       gtk_widget_queue_resize (GTK_WIDGET (container));
+      g_object_notify (G_OBJECT (container), "resize_mode");
     }
 }
 
-void
-gtk_container_block_resize (GtkContainer *container)
+/**
+ * gtk_container_get_resize_mode:
+ * @container: a #GtkContainer
+ * 
+ * Returns the resize mode for the container. See
+ * gtk_container_set_resize_mode ().
+ *
+ * Return value: the current resize mode
+ **/
+GtkResizeMode
+gtk_container_get_resize_mode (GtkContainer *container)
 {
-  g_return_if_fail (container != NULL);
-  g_return_if_fail (GTK_IS_CONTAINER (container));
+  g_return_val_if_fail (GTK_IS_CONTAINER (container), GTK_RESIZE_PARENT);
 
-  container->block_resize = TRUE;
+  return container->resize_mode;
 }
 
+/**
+ * gtk_container_set_reallocate_redraws:
+ * @container: a #GtkContainer.
+ * @needs_redraws: the new value for the container's @reallocate_redraws flag.
+ *
+ * Sets the @reallocate_redraws flag of the container to the given value.
+ * 
+ * Containers requesting reallocation redraws get automatically
+ * redrawn if any of their children changed allocation. 
+ **/ 
 void
-gtk_container_unblock_resize (GtkContainer *container)
+gtk_container_set_reallocate_redraws (GtkContainer *container,
+                                     gboolean      needs_redraws)
 {
-  g_return_if_fail (container != NULL);
   g_return_if_fail (GTK_IS_CONTAINER (container));
-  
-  container->block_resize = FALSE;
+
+  container->reallocate_redraws = needs_redraws ? TRUE : FALSE;
 }
 
-gint
-gtk_container_need_resize (GtkContainer *container)
+static GtkContainer*
+gtk_container_get_resize_container (GtkContainer *container)
 {
-  gint return_val;
-  
-  g_return_val_if_fail (container != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_CONTAINER (container), FALSE);
-  
-  return_val = FALSE;
-  
-  if (!container->block_resize)
+  GtkWidget *widget = GTK_WIDGET (container);
+
+  while (widget->parent)
     {
-      if (container->auto_resize)
-       gtk_signal_emit (GTK_OBJECT (container),
-                         container_signals[NEED_RESIZE],
-                         &return_val);
-      else
-       container->need_resize = TRUE;
+      widget = widget->parent;
+      if (GTK_IS_RESIZE_CONTAINER (widget))
+       break;
     }
-  
-  return return_val;
-}
 
-void
-gtk_container_foreach (GtkContainer *container,
-                      GtkCallback   callback,
-                      gpointer      callback_data)
-{
-  gtk_signal_emit (GTK_OBJECT (container),
-                   container_signals[FOREACH],
-                   callback, callback_data);
+  return GTK_IS_RESIZE_CONTAINER (widget) ? (GtkContainer*) widget : NULL;
 }
 
-typedef struct _GtkForeachData GtkForeachData;
-struct _GtkForeachData
+static gboolean
+gtk_container_idle_sizer (gpointer data)
 {
-  GtkObject         *container;
-  GtkCallbackMarshal callback;
-  gpointer           callback_data;
-};
+  GDK_THREADS_ENTER ();
 
-static void
-gtk_container_foreach_unmarshal (GtkWidget *child,
-                                gpointer data)
-{
-  GtkForeachData *fdata = (GtkForeachData*) data;
-  GtkArg args[2];
-  
-  /* first argument */
-  args[0].name = NULL;
-  args[0].type = GTK_OBJECT(child)->klass->type;
-  GTK_VALUE_OBJECT(args[0]) = GTK_OBJECT (child);
-  
-  /* location for return value */
-  args[1].name = NULL;
-  args[1].type = GTK_TYPE_NONE;
-  
-  fdata->callback (fdata->container, fdata->callback_data, 1, args);
-}
+  /* 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
+   * than trying to explicitely work around them with some extra flags,
+   * since it doesn't cause any actual harm.
+   */
+  while (container_resize_queue)
+    {
+      GSList *slist;
+      GtkWidget *widget;
 
-void
-gtk_container_foreach_interp (GtkContainer       *container,
-                             GtkCallbackMarshal  marshal,
-                             gpointer            callback_data,
-                             GtkDestroyNotify    notify)
-{
-  gtk_container_foreach_full (container, NULL, marshal, 
-                             callback_data, notify);
+      slist = container_resize_queue;
+      container_resize_queue = slist->next;
+      widget = slist->data;
+      g_slist_free_1 (slist);
+
+      GTK_PRIVATE_UNSET_FLAG (widget, GTK_RESIZE_PENDING);
+      gtk_container_check_resize (GTK_CONTAINER (widget));
+    }
+
+  gdk_window_process_all_updates ();
+
+  GDK_THREADS_LEAVE ();
+
+  return FALSE;
 }
 
 void
-gtk_container_foreach_full (GtkContainer       *container,
-                           GtkCallback         callback,
-                           GtkCallbackMarshal  marshal,
-                           gpointer            callback_data,
-                           GtkDestroyNotify    notify)
+_gtk_container_queue_resize (GtkContainer *container)
 {
-  if (marshal)
-    {
+  GtkContainer *resize_container;
+  GtkWidget *widget;
+  
+  g_return_if_fail (GTK_IS_CONTAINER (container));
+
+  widget = GTK_WIDGET (container);
+  resize_container = gtk_container_get_resize_container (container);
+  
+  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 ((resize_container && widget == GTK_WIDGET (resize_container)) ||
+         !widget->parent)
+       break;
+      
+      widget = widget->parent;
+    }
+      
+  if (resize_container)
+    {
+      if (GTK_WIDGET_VISIBLE (resize_container) &&
+         (GTK_WIDGET_TOPLEVEL (resize_container) || GTK_WIDGET_REALIZED (resize_container)))
+       {
+         switch (resize_container->resize_mode)
+           {
+           case GTK_RESIZE_QUEUE:
+             if (!GTK_CONTAINER_RESIZE_PENDING (resize_container))
+               {
+                 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);
+                 container_resize_queue = g_slist_prepend (container_resize_queue, resize_container);
+               }
+             break;
+
+           case GTK_RESIZE_IMMEDIATE:
+             gtk_container_check_resize (resize_container);
+             break;
+
+           case GTK_RESIZE_PARENT:
+             g_assert_not_reached ();
+             break;
+           }
+       }
+      else
+       {
+         /* we need to let hidden resize containers know that something
+          * changed while they where hidden (currently only evaluated by
+          * toplevels).
+          */
+         resize_container->need_resize = TRUE;
+       }
+    }
+}
+
+void
+gtk_container_check_resize (GtkContainer *container)
+{
+  g_return_if_fail (GTK_IS_CONTAINER (container));
+  
+  g_signal_emit (container, container_signals[CHECK_RESIZE], 0);
+}
+
+static void
+gtk_container_real_check_resize (GtkContainer *container)
+{
+  GtkWidget *widget = GTK_WIDGET (container);
+  GtkRequisition requisition;
+  
+  gtk_widget_size_request (widget, &requisition);
+  
+  if (requisition.width > widget->allocation.width ||
+      requisition.height > widget->allocation.height)
+    {
+      if (GTK_IS_RESIZE_CONTAINER (container))
+       gtk_widget_size_allocate (GTK_WIDGET (container),
+                                 &GTK_WIDGET (container)->allocation);
+      else
+       gtk_widget_queue_resize (widget);
+    }
+  else
+    {
+      gtk_container_resize_children (container);
+    }
+}
+
+/* The container hasn't changed size but one of its children
+ *  queued a resize request. Which means that the allocation
+ *  is not sufficient for the requisition of some child.
+ *  We've already performed a size request at this point,
+ *  so we simply need to reallocate and let the allocation
+ *  trickle down via GTK_WIDGET_ALLOC_NEEDED flags. 
+ */
+void
+gtk_container_resize_children (GtkContainer *container)
+{
+  GtkWidget *widget;
+  
+  /* resizing invariants:
+   * toplevels have *always* resize_mode != GTK_RESIZE_PARENT set.
+   * containers that have an idle sizer pending must be flagged with
+   * RESIZE_PENDING.
+   */
+  g_return_if_fail (GTK_IS_CONTAINER (container));
+
+  widget = GTK_WIDGET (container);
+  gtk_widget_size_allocate (widget, &widget->allocation);
+}
+
+/**
+ * gtk_container_forall:
+ * @container: a #GtkContainer
+ * @callback: a callback
+ * @callback_data: callback user data
+ * 
+ * Invokes @callback on each child of @container, including children
+ * that are considered "internal" (implementation details of the
+ * container). "Internal" children generally weren't added by the user
+ * of the container, but were added by the container implementation
+ * itself.  Most applications should use gtk_container_foreach(),
+ * rather than gtk_container_forall().
+ **/
+void
+gtk_container_forall (GtkContainer *container,
+                     GtkCallback   callback,
+                     gpointer      callback_data)
+{
+  GtkContainerClass *class;
+
+  g_return_if_fail (GTK_IS_CONTAINER (container));
+  g_return_if_fail (callback != NULL);
+
+  class = GTK_CONTAINER_GET_CLASS (container);
+
+  if (class->forall)
+    class->forall (container, TRUE, callback, callback_data);
+}
+
+/**
+ * gtk_container_foreach:
+ * @container: a #GtkContainer
+ * @callback: a callback
+ * @callback_data: callback user data
+ * 
+ * Invokes @callback on each non-internal child of @container.  See
+ * gtk_container_forall() for details on what constitutes an
+ * "internal" child.  Most applications should use
+ * gtk_container_foreach(), rather than gtk_container_forall().
+ **/
+void
+gtk_container_foreach (GtkContainer *container,
+                      GtkCallback   callback,
+                      gpointer      callback_data)
+{
+  GtkContainerClass *class;
+  
+  g_return_if_fail (GTK_IS_CONTAINER (container));
+  g_return_if_fail (callback != NULL);
+
+  class = GTK_CONTAINER_GET_CLASS (container);
+
+  if (class->forall)
+    class->forall (container, FALSE, callback, callback_data);
+}
+
+typedef struct _GtkForeachData GtkForeachData;
+struct _GtkForeachData
+{
+  GtkObject         *container;
+  GtkCallbackMarshal callback;
+  gpointer           callback_data;
+};
+
+static void
+gtk_container_foreach_unmarshal (GtkWidget *child,
+                                gpointer data)
+{
+  GtkForeachData *fdata = (GtkForeachData*) data;
+  GtkArg args[2];
+  
+  /* first argument */
+  args[0].name = NULL;
+  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 = G_TYPE_NONE;
+  
+  fdata->callback (fdata->container, fdata->callback_data, 1, args);
+}
+
+void
+gtk_container_foreach_full (GtkContainer       *container,
+                           GtkCallback         callback,
+                           GtkCallbackMarshal  marshal,
+                           gpointer            callback_data,
+                           GtkDestroyNotify    notify)
+{
+  g_return_if_fail (GTK_IS_CONTAINER (container));
+
+  if (marshal)
+    {
       GtkForeachData fdata;
   
       fdata.container     = GTK_OBJECT (container);
@@ -490,30 +1249,40 @@ gtk_container_foreach_full (GtkContainer       *container,
       gtk_container_foreach (container, gtk_container_foreach_unmarshal, &fdata);
     }
   else
-    gtk_container_foreach (container, callback, &callback_data);
-  
-  notify (callback_data);
+    {
+      g_return_if_fail (callback != NULL);
+
+      gtk_container_foreach (container, callback, &callback_data);
+    }
+
+  if (notify)
+    notify (callback_data);
 }
 
-gint
-gtk_container_focus (GtkContainer     *container,
-                    GtkDirectionType  direction)
+void
+gtk_container_set_focus_child (GtkContainer *container,
+                              GtkWidget    *widget)
 {
-  gint return_val;
-  
-  gtk_signal_emit (GTK_OBJECT (container),
-                   container_signals[FOCUS],
-                   direction, &return_val);
+  g_return_if_fail (GTK_IS_CONTAINER (container));
+  if (widget)
+    g_return_if_fail (GTK_IS_WIDGET (widget));
 
-  return return_val;
+  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
+ * gtk_container_forall() for details on what constitutes an "internal" child. 
+ *
+ * Return value: a newly-allocated list of the container's non-internal children.
+ **/
 GList*
-gtk_container_children (GtkContainer *container)
+gtk_container_get_children (GtkContainer *container)
 {
-  GList *children;
-
-  children = NULL;
+  GList *children = NULL;
 
   gtk_container_foreach (container,
                         gtk_container_children_callback,
@@ -522,24 +1291,85 @@ gtk_container_children (GtkContainer *container)
   return g_list_reverse (children);
 }
 
-void
-gtk_container_register_toplevel (GtkContainer *container)
+static void
+gtk_container_child_position_callback (GtkWidget *widget,
+                                      gpointer   client_data)
 {
-  gtk_widget_ref (GTK_WIDGET (container));
-  gtk_object_sink (GTK_OBJECT (container));
+  struct {
+    GtkWidget *child;
+    guint i;
+    guint index;
+  } *data = client_data;
+
+  data->i++;
+  if (data->child == widget)
+    data->index = data->i;
 }
 
-void
-gtk_container_unregister_toplevel (GtkContainer *container)
+static gchar*
+gtk_container_child_default_composite_name (GtkContainer *container,
+                                           GtkWidget    *child)
 {
-  gtk_widget_unref (GTK_WIDGET (container));
+  struct {
+    GtkWidget *child;
+    guint i;
+    guint index;
+  } data;
+  gchar *name;
+
+  /* fallback implementation */
+  data.child = child;
+  data.i = 0;
+  data.index = 0;
+  gtk_container_forall (container,
+                       gtk_container_child_position_callback,
+                       &data);
+  
+  name = g_strdup_printf ("%s-%u",
+                         g_type_name (G_TYPE_FROM_INSTANCE (child)),
+                         data.index);
+
+  return name;
 }
 
-void
-gtk_container_set_focus_child (GtkContainer     *container,
-                              GtkWidget        *child)
+gchar*
+_gtk_container_child_composite_name (GtkContainer *container,
+                                   GtkWidget    *child)
+{
+  g_return_val_if_fail (GTK_IS_CONTAINER (container), NULL);
+  g_return_val_if_fail (GTK_IS_WIDGET (child), NULL);
+  g_return_val_if_fail (child->parent == GTK_WIDGET (container), NULL);
+
+  if (GTK_WIDGET_COMPOSITE_CHILD (child))
+    {
+      static GQuark quark_composite_name = 0;
+      gchar *name;
+
+      if (!quark_composite_name)
+       quark_composite_name = g_quark_from_static_string ("gtk-composite-name");
+
+      name = g_object_get_qdata (G_OBJECT (child), quark_composite_name);
+      if (!name)
+       {
+         GtkContainerClass *class;
+
+         class = GTK_CONTAINER_GET_CLASS (container);
+         if (class->composite_name)
+           name = class->composite_name (container, child);
+       }
+      else
+       name = g_strdup (name);
+
+      return name;
+    }
+  
+  return NULL;
+}
+
+static void
+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));
@@ -547,10 +1377,10 @@ gtk_container_set_focus_child (GtkContainer     *container,
   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);
     }
 
 
@@ -560,14 +1390,14 @@ gtk_container_set_focus_child (GtkContainer     *container,
     {
       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,
@@ -576,210 +1406,108 @@ gtk_container_set_focus_child (GtkContainer     *container,
     }
 }
 
-static void
-gtk_container_marshal_signal_1 (GtkObject      *object,
-                               GtkSignalFunc   func,
-                               gpointer        func_data,
-                               GtkArg         *args)
-{
-  GtkContainerSignal1 rfunc;
-
-  rfunc = (GtkContainerSignal1) func;
-
-  (* rfunc) (object, GTK_VALUE_OBJECT (args[0]), func_data);
-}
-
-static void
-gtk_container_marshal_signal_2 (GtkObject      *object,
-                               GtkSignalFunc   func,
-                               gpointer        func_data,
-                               GtkArg         *args)
-{
-  GtkContainerSignal2 rfunc;
-
-  rfunc = (GtkContainerSignal2) func;
-
-  (* rfunc) (object,
-            GTK_VALUE_C_CALLBACK(args[0]).func,
-            GTK_VALUE_C_CALLBACK(args[0]).func_data,
-            func_data);
-}
-
-static void
-gtk_container_marshal_signal_3 (GtkObject      *object,
-                               GtkSignalFunc   func,
-                               gpointer        func_data,
-                               GtkArg         *args)
+static GList*
+get_focus_chain (GtkContainer *container)
 {
-  GtkContainerSignal3 rfunc;
-  gint *return_val;
-
-  rfunc = (GtkContainerSignal3) func;
-  return_val = GTK_RETLOC_ENUM (args[1]);
-
-  *return_val = (* rfunc) (object, GTK_VALUE_ENUM(args[0]), func_data);
+  return g_object_get_data (G_OBJECT (container), "gtk-container-focus-chain");
 }
 
-static void
-gtk_container_marshal_signal_4 (GtkObject      *object,
-                               GtkSignalFunc   func,
-                               gpointer        func_data,
-                               GtkArg         *args)
-{
-  GtkContainerSignal4 rfunc;
-  gint *return_val;
-
-  rfunc = (GtkContainerSignal4) func;
-  return_val = GTK_RETLOC_BOOL (args[0]);
-
-  *return_val = (* rfunc) (object, func_data);
-}
-
-static gint
-gtk_real_container_need_resize (GtkContainer *container)
+/* same as gtk_container_get_children, except it includes internals
+ */
+static GList *
+gtk_container_get_all_children (GtkContainer *container)
 {
-  g_return_val_if_fail (container != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_CONTAINER (container), FALSE);
+  GList *children = NULL;
 
-  if (GTK_WIDGET_VISIBLE (container) && container->widget.parent)
-    return gtk_container_need_resize (GTK_CONTAINER (container->widget.parent));
+  gtk_container_forall (container,
+                        gtk_container_children_callback,
+                        &children);
 
-  return FALSE;
+  return children;
 }
 
-static gint
-gtk_real_container_focus (GtkContainer     *container,
-                         GtkDirectionType  direction)
+static gboolean
+gtk_container_focus (GtkWidget        *widget,
+                     GtkDirectionType  direction)
 {
   GList *children;
-  GList *tmp_list;
-  GList *tmp_list2;
+  GList *sorted_children;
   gint return_val;
+  GtkContainer *container;
 
-  g_return_val_if_fail (container != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_CONTAINER (container), FALSE);
+  g_return_val_if_fail (GTK_IS_CONTAINER (widget), FALSE);
 
-  /* Fail if the container is insensitive
-   */
-  if (!GTK_WIDGET_SENSITIVE (container))
-    return FALSE;
+  container = GTK_CONTAINER (widget);
 
   return_val = FALSE;
 
   if (GTK_WIDGET_CAN_FOCUS (container))
     {
-      gtk_widget_grab_focus (GTK_WIDGET (container));
-      return_val = TRUE;
+      if (!GTK_WIDGET_HAS_FOCUS (container))
+       {
+         gtk_widget_grab_focus (GTK_WIDGET (container));
+         return_val = TRUE;
+       }
     }
   else
     {
-      /* Get a list of the containers children
+      /* Get a list of the containers children, allowing focus
+       * chain to override.
        */
-      children = gtk_container_children (container);
+      if (container->has_focus_chain)
+       children = g_list_copy (get_focus_chain (container));
+      else
+       children = gtk_container_get_all_children (container);
 
-      if (children)
+      if (container->has_focus_chain &&
+         (direction == GTK_DIR_TAB_FORWARD ||
+          direction == GTK_DIR_TAB_BACKWARD))
        {
-         /* Remove any children which are insensitive
-          */
-         tmp_list = children;
-         while (tmp_list)
-           {
-             if (!GTK_WIDGET_SENSITIVE (tmp_list->data))
-               {
-                 tmp_list2 = tmp_list;
-                 tmp_list = tmp_list->next;
-
-                 children = g_list_remove_link (children, tmp_list2);
-                 g_list_free_1 (tmp_list2);
-               }
-             else
-               tmp_list = tmp_list->next;
-           }
-
-         switch (direction)
-           {
-           case GTK_DIR_TAB_FORWARD:
-           case GTK_DIR_TAB_BACKWARD:
-             return_val = gtk_container_focus_tab (container, children, direction);
-             break;
-           case GTK_DIR_UP:
-           case GTK_DIR_DOWN:
-             return_val = gtk_container_focus_up_down (container, children, direction);
-             break;
-           case GTK_DIR_LEFT:
-           case GTK_DIR_RIGHT:
-             return_val = gtk_container_focus_left_right (container, children, direction);
-             break;
-           }
-
-         g_list_free (children);
+         sorted_children = g_list_copy (children);
+         
+         if (direction == GTK_DIR_TAB_BACKWARD)
+           sorted_children = g_list_reverse (sorted_children);
        }
+      else
+       sorted_children = _gtk_container_focus_sort (container, children, direction, NULL);
+      
+      return_val = gtk_container_focus_move (container, sorted_children, direction);
+
+      g_list_free (sorted_children);
+      g_list_free (children);
     }
 
   return return_val;
 }
 
 static gint
-gtk_container_focus_tab (GtkContainer     *container,
-                        GList            *children,
-                        GtkDirectionType  direction)
+tab_compare (gconstpointer a,
+            gconstpointer b)
 {
-  GtkWidget *child;
-  GtkWidget *child2;
-  GList *tmp_list;
-  guint length;
-  guint i, j;
+  const GtkWidget *child1 = a;
+  const GtkWidget *child2 = b;
 
-  length = g_list_length (children);
+  gint y1 = child1->allocation.y + child1->allocation.height / 2;
+  gint y2 = child2->allocation.y + child2->allocation.height / 2;
 
-  /* sort the children in the y direction */
-  for (i = 1; i < length; i++)
+  if (y1 == y2)
     {
-      j = i;
-      tmp_list = g_list_nth (children, j);
-      child = tmp_list->data;
-
-      while (j > 0)
-       {
-         child2 = tmp_list->prev->data;
-         if (child->allocation.y < child2->allocation.y)
-           {
-             tmp_list->data = tmp_list->prev->data;
-             tmp_list = tmp_list->prev;
-             j--;
-           }
-         else
-           break;
-       }
-
-      tmp_list->data = child;
+      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);
     }
+  else
+    return (y1 < y2) ? -1 : 1;
+}
 
-  /* sort the children in the x direction while
-   *  maintaining the y direction sort.
-   */
-  for (i = 1; i < length; i++)
-    {
-      j = i;
-      tmp_list = g_list_nth (children, j);
-      child = tmp_list->data;
-
-      while (j > 0)
-       {
-         child2 = tmp_list->prev->data;
-         if ((child->allocation.x < child2->allocation.x) &&
-             (child->allocation.y == child2->allocation.y))
-           {
-             tmp_list->data = tmp_list->prev->data;
-             tmp_list = tmp_list->prev;
-             j--;
-           }
-         else
-           break;
-       }
-
-      tmp_list->data = child;
-    }
+static GList *
+gtk_container_focus_sort_tab (GtkContainer     *container,
+                             GList            *children,
+                             GtkDirectionType  direction,
+                             GtkWidget        *old_focus)
+{
+  children = g_list_sort (children, tab_compare);
 
   /* if we are going backwards then reverse the order
    *  of the children.
@@ -787,230 +1515,386 @@ gtk_container_focus_tab (GtkContainer     *container,
   if (direction == GTK_DIR_TAB_BACKWARD)
     children = g_list_reverse (children);
 
-  return gtk_container_focus_move (container, children, direction);
+  return children;
 }
 
-static gint
-gtk_container_focus_up_down (GtkContainer     *container,
-                            GList            *children,
-                            GtkDirectionType  direction)
+/* Get coordinates of @widget's allocation with respect to
+ * allocation of @container.
+ */
+static gboolean
+get_allocation_coords (GtkContainer  *container,
+                      GtkWidget     *widget,
+                      GdkRectangle  *allocation)
 {
-  GtkWidget *child;
-  GtkWidget *child2;
-  GList *tmp_list;
-  gint dist1, dist2;
-  gint focus_x;
-  gint focus_width;
-  guint length;
-  guint i, j;
+  *allocation = widget->allocation;
 
-  /* return failure if there isn't a focus child */
-  if (container->focus_child)
+  return gtk_widget_translate_coordinates (widget, GTK_WIDGET (container),
+                                          0, 0, &allocation->x, &allocation->y);
+}
+
+/* Look for a child in @children that is intermediate between
+ * the focus widget and container. This widget, if it exists,
+ * acts as the starting widget for focus navigation.
+ */
+static GtkWidget *
+find_old_focus (GtkContainer *container,
+               GList        *children)
+{
+  GList *tmp_list = children;
+  while (tmp_list)
     {
-      focus_width = container->focus_child->allocation.width / 2;
-      focus_x = container->focus_child->allocation.x + focus_width;
+      GtkWidget *child = tmp_list->data;
+      GtkWidget *widget = child;
+
+      while (widget && widget != (GtkWidget *)container)
+       {
+         GtkWidget *parent = widget->parent;
+         if (parent && ((GtkContainer *)parent)->focus_child != widget)
+           goto next;
+
+         widget = parent;
+       }
+
+      return child;
+
+    next:
+      tmp_list = tmp_list->next;
+    }
+
+  return NULL;
+}
+
+static gboolean
+old_focus_coords (GtkContainer *container,
+                 GdkRectangle *old_focus_rect)
+{
+  GtkWidget *widget = GTK_WIDGET (container);
+  GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
+  
+  if (toplevel && GTK_IS_WINDOW (toplevel) && GTK_WINDOW (toplevel)->focus_widget)
+    {
+      GtkWidget *old_focus = GTK_WINDOW (toplevel)->focus_widget;
+      
+      return get_allocation_coords (container, old_focus, old_focus_rect);
     }
   else
+    return FALSE;
+}
+
+typedef struct _CompareInfo CompareInfo;
+
+struct _CompareInfo
+{
+  GtkContainer *container;
+  gint x;
+  gint y;
+  gboolean reverse;
+};
+
+static gint
+up_down_compare (gconstpointer a,
+                gconstpointer b,
+                gpointer      data)
+{
+  GdkRectangle allocation1;
+  GdkRectangle allocation2;
+  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;
+
+  y1 = allocation1.y + allocation1.height / 2;
+  y2 = allocation2.y + allocation2.height / 2;
+
+  if (y1 == y2)
     {
-      focus_width = GTK_WIDGET (container)->allocation.width;
-      if (GTK_WIDGET_NO_WINDOW (container))
-       focus_x = GTK_WIDGET (container)->allocation.x;
+      gint x1 = abs (allocation1.x + allocation1.width / 2 - compare->x);
+      gint x2 = abs (allocation2.x + allocation2.width / 2 - compare->x);
+
+      if (compare->reverse)
+       return (x1 < x2) ? 1 : ((x1 == x2) ? 0 : -1);
       else
-       focus_x = 0;
+       return (x1 < x2) ? -1 : ((x1 == x2) ? 0 : 1);
     }
+  else
+    return (y1 < y2) ? -1 : 1;
+}
 
-  length = g_list_length (children);
+static GList *
+gtk_container_focus_sort_up_down (GtkContainer     *container,
+                                 GList            *children,
+                                 GtkDirectionType  direction,
+                                 GtkWidget        *old_focus)
+{
+  CompareInfo compare;
+  GList *tmp_list;
+  GdkRectangle old_allocation;
 
-  /* sort the children in the y direction */
-  for (i = 1; i < length; i++)
+  compare.container = container;
+  compare.reverse = (direction == GTK_DIR_UP);
+
+  if (!old_focus)
+      old_focus = find_old_focus (container, children);
+  
+  if (old_focus && get_allocation_coords (container, old_focus, &old_allocation))
     {
-      j = i;
-      tmp_list = g_list_nth (children, j);
-      child = tmp_list->data;
+      gint compare_x1;
+      gint compare_x2;
+      gint compare_y;
 
-      while (j > 0)
+      /* Delete widgets from list that don't match minimum criteria */
+
+      compare_x1 = old_allocation.x;
+      compare_x2 = old_allocation.x + old_allocation.width;
+
+      if (direction == GTK_DIR_UP)
+       compare_y = old_allocation.y;
+      else
+       compare_y = old_allocation.y + old_allocation.height;
+      
+      tmp_list = children;
+      while (tmp_list)
        {
-         child2 = tmp_list->prev->data;
-         if (child->allocation.y < child2->allocation.y)
+         GtkWidget *child = tmp_list->data;
+         GList *next = tmp_list->next;
+         gint child_x1, child_x2;
+         GdkRectangle child_allocation;
+         
+         if (child != old_focus)
            {
-             tmp_list->data = tmp_list->prev->data;
-             tmp_list = tmp_list->prev;
-             j--;
+             if (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 */
+                   {
+                     children = g_list_delete_link (children, tmp_list);
+                   }
+               }
+             else
+               children = g_list_delete_link (children, tmp_list);
            }
-         else
-           break;
+         
+         tmp_list = next;
        }
 
-      tmp_list->data = child;
+      compare.x = (compare_x1 + compare_x2) / 2;
+      compare.y = old_allocation.y + old_allocation.height / 2;
     }
-
-  /* sort the children in distance in the x direction
-   *  in distance from the current focus child while maintaining the
-   *  sort in the y direction
-   */
-  for (i = 1; i < length; i++)
+  else
     {
-      j = i;
-      tmp_list = g_list_nth (children, j);
-      child = tmp_list->data;
-      dist1 = (child->allocation.x + child->allocation.width / 2) - focus_x;
+      /* No old focus widget, need to figure out starting x,y some other way
+       */
+      GtkWidget *widget = GTK_WIDGET (container);
+      GdkRectangle old_focus_rect;
 
-      while (j > 0)
+      if (old_focus_coords (container, &old_focus_rect))
        {
-         child2 = tmp_list->prev->data;
-         dist2 = (child2->allocation.x + child2->allocation.width / 2) - focus_x;
-
-         if ((dist1 < dist2) &&
-             (child->allocation.y >= child2->allocation.y))
-           {
-             tmp_list->data = tmp_list->prev->data;
-             tmp_list = tmp_list->prev;
-             j--;
-           }
+         compare.x = old_focus_rect.x + old_focus_rect.width / 2;
+       }
+      else
+       {
+         if (GTK_WIDGET_NO_WINDOW (widget))
+           compare.x = widget->allocation.x + widget->allocation.width / 2;
          else
-           break;
+           compare.x = widget->allocation.width / 2;
        }
-
-      tmp_list->data = child;
+      
+      if (GTK_WIDGET_NO_WINDOW (widget))
+       compare.y = (direction == GTK_DIR_DOWN) ? widget->allocation.y : widget->allocation.y + widget->allocation.height;
+      else
+       compare.y = (direction == GTK_DIR_DOWN) ? 0 : + widget->allocation.height;
     }
 
-  /* go and invalidate any widget which is too
-   *  far from the focus widget.
-   */
-  if (!container->focus_child &&
-      (direction == GTK_DIR_UP))
-    focus_x += focus_width;
-
-  tmp_list = children;
-  while (tmp_list)
-    {
-      child = tmp_list->data;
-
-      dist1 = (child->allocation.x + child->allocation.width / 2) - focus_x;
-      if (((direction == GTK_DIR_DOWN) && (dist1 < 0)) ||
-         ((direction == GTK_DIR_UP) && (dist1 > 0)))
-       tmp_list->data = NULL;
+  children = g_list_sort_with_data (children, up_down_compare, &compare);
 
-      tmp_list = tmp_list->next;
-    }
-
-  if (direction == GTK_DIR_UP)
+  if (compare.reverse)
     children = g_list_reverse (children);
 
-  return gtk_container_focus_move (container, children, direction);
+  return children;
 }
 
 static gint
-gtk_container_focus_left_right (GtkContainer     *container,
-                               GList            *children,
-                               GtkDirectionType  direction)
+left_right_compare (gconstpointer a,
+                   gconstpointer b,
+                   gpointer      data)
 {
-  GtkWidget *child;
-  GtkWidget *child2;
-  GList *tmp_list;
-  gint dist1, dist2;
-  gint focus_y;
-  gint focus_height;
-  guint length;
-  guint i, j;
+  GdkRectangle allocation1;
+  GdkRectangle allocation2;
+  CompareInfo *compare = data;
+  gint x1, x2;
 
-  /* return failure if there isn't a focus child */
-  if (container->focus_child)
-    {
-      focus_height = container->focus_child->allocation.height / 2;
-      focus_y = container->focus_child->allocation.y + focus_height;
-    }
-  else
+  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;
+
+  if (x1 == x2)
     {
-      focus_height = GTK_WIDGET (container)->allocation.height;
-      if (GTK_WIDGET_NO_WINDOW (container))
-       focus_y = GTK_WIDGET (container)->allocation.y;
+      gint y1 = abs (allocation1.y + allocation1.height / 2 - compare->y);
+      gint y2 = abs (allocation2.y + allocation2.height / 2 - compare->y);
+
+      if (compare->reverse)
+       return (y1 < y2) ? 1 : ((y1 == y2) ? 0 : -1);
       else
-       focus_y = 0;
+       return (y1 < y2) ? -1 : ((y1 == y2) ? 0 : 1);
     }
+  else
+    return (x1 < x2) ? -1 : 1;
+}
 
-  length = g_list_length (children);
+static GList *
+gtk_container_focus_sort_left_right (GtkContainer     *container,
+                                    GList            *children,
+                                    GtkDirectionType  direction,
+                                    GtkWidget        *old_focus)
+{
+  CompareInfo compare;
+  GList *tmp_list;
+  GdkRectangle old_allocation;
+
+  compare.container = container;
+  compare.reverse = (direction == GTK_DIR_LEFT);
 
-  /* sort the children in the x direction */
-  for (i = 1; i < length; i++)
+  if (!old_focus)
+    old_focus = find_old_focus (container, children);
+  
+  if (old_focus && get_allocation_coords (container, old_focus, &old_allocation))
     {
-      j = i;
-      tmp_list = g_list_nth (children, j);
-      child = tmp_list->data;
+      gint compare_y1;
+      gint compare_y2;
+      gint compare_x;
+      
+      /* Delete widgets from list that don't match minimum criteria */
 
-      while (j > 0)
+      compare_y1 = old_allocation.y;
+      compare_y2 = old_allocation.y + old_allocation.height;
+
+      if (direction == GTK_DIR_LEFT)
+       compare_x = old_allocation.x;
+      else
+       compare_x = old_allocation.x + old_allocation.width;
+      
+      tmp_list = children;
+      while (tmp_list)
        {
-         child2 = tmp_list->prev->data;
-         if (child->allocation.x < child2->allocation.x)
+         GtkWidget *child = tmp_list->data;
+         GList *next = tmp_list->next;
+         gint child_y1, child_y2;
+         GdkRectangle child_allocation;
+         
+         if (child != old_focus)
            {
-             tmp_list->data = tmp_list->prev->data;
-             tmp_list = tmp_list->prev;
-             j--;
+             if (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 */
+                   {
+                     children = g_list_delete_link (children, tmp_list);
+                   }
+               }
+             else
+               children = g_list_delete_link (children, tmp_list);
            }
-         else
-           break;
+         
+         tmp_list = next;
        }
 
-      tmp_list->data = child;
+      compare.y = (compare_y1 + compare_y2) / 2;
+      compare.x = old_allocation.x + old_allocation.width / 2;
     }
-
-  /* sort the children in distance in the y direction
-   *  in distance from the current focus child while maintaining the
-   *  sort in the x direction
-   */
-  for (i = 1; i < length; i++)
+  else
     {
-      j = i;
-      tmp_list = g_list_nth (children, j);
-      child = tmp_list->data;
-      dist1 = (child->allocation.y + child->allocation.height / 2) - focus_y;
+      /* No old focus widget, need to figure out starting x,y some other way
+       */
+      GtkWidget *widget = GTK_WIDGET (container);
+      GdkRectangle old_focus_rect;
 
-      while (j > 0)
+      if (old_focus_coords (container, &old_focus_rect))
        {
-         child2 = tmp_list->prev->data;
-         dist2 = (child2->allocation.y + child2->allocation.height / 2) - focus_y;
-
-         if ((dist1 < dist2) &&
-             (child->allocation.x >= child2->allocation.x))
-           {
-             tmp_list->data = tmp_list->prev->data;
-             tmp_list = tmp_list->prev;
-             j--;
-           }
+         compare.y = old_focus_rect.y + old_focus_rect.height / 2;
+       }
+      else
+       {
+         if (GTK_WIDGET_NO_WINDOW (widget))
+           compare.y = widget->allocation.y + widget->allocation.height / 2;
          else
-           break;
+           compare.y = widget->allocation.height / 2;
        }
-
-      tmp_list->data = child;
+      
+      if (GTK_WIDGET_NO_WINDOW (widget))
+       compare.x = (direction == GTK_DIR_RIGHT) ? widget->allocation.x : widget->allocation.x + widget->allocation.width;
+      else
+       compare.x = (direction == GTK_DIR_RIGHT) ? 0 : widget->allocation.width;
     }
 
-  /* go and invalidate any widget which is too
-   *  far from the focus widget.
-   */
-  if (!container->focus_child &&
-      (direction == GTK_DIR_LEFT))
-    focus_y += focus_height;
+  children = g_list_sort_with_data (children, left_right_compare, &compare);
 
-  tmp_list = children;
-  while (tmp_list)
-    {
-      child = tmp_list->data;
+  if (compare.reverse)
+    children = g_list_reverse (children);
 
-      dist1 = (child->allocation.y + child->allocation.height / 2) - focus_y;
-      if (((direction == GTK_DIR_RIGHT) && (dist1 < 0)) ||
-         ((direction == GTK_DIR_LEFT) && (dist1 > 0)))
-       tmp_list->data = NULL;
+  return children;
+}
 
-      tmp_list = tmp_list->next;
+/**
+ * gtk_container_focus_sort:
+ * @container: a #GtkContainer
+ * @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.
+ * 
+ * Return value: a copy of @children, sorted in correct focusing order,
+ *   with children that aren't suitable for focusing in this direction
+ *   removed.
+ **/
+GList *
+_gtk_container_focus_sort (GtkContainer     *container,
+                          GList            *children,
+                          GtkDirectionType  direction,
+                          GtkWidget        *old_focus)
+{
+  children = g_list_copy (children);
+  
+  switch (direction)
+    {
+    case GTK_DIR_TAB_FORWARD:
+    case GTK_DIR_TAB_BACKWARD:
+      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, old_focus);
+    case GTK_DIR_LEFT:
+    case GTK_DIR_RIGHT:
+      return gtk_container_focus_sort_left_right (container, children, direction, old_focus);
     }
 
-  if (direction == GTK_DIR_LEFT)
-    children = g_list_reverse (children);
+  g_assert_not_reached ();
 
-  return gtk_container_focus_move (container, children, direction);
+  return NULL;
 }
 
-static gint
+static gboolean
 gtk_container_focus_move (GtkContainer     *container,
                          GList            *children,
                          GtkDirectionType  direction)
@@ -1019,7 +1903,6 @@ gtk_container_focus_move (GtkContainer     *container,
   GtkWidget *child;
 
   focus_child = container->focus_child;
-  gtk_container_set_focus_child (container, NULL);
 
   while (children)
     {
@@ -1028,32 +1911,22 @@ gtk_container_focus_move (GtkContainer     *container,
 
       if (!child)
        continue;
-
+      
       if (focus_child)
         {
           if (focus_child == child)
             {
               focus_child = NULL;
 
-              if (GTK_WIDGET_VISIBLE (child) &&
-                 GTK_IS_CONTAINER (child) &&
-                 !GTK_WIDGET_HAS_FOCUS (child))
-               if (gtk_container_focus (GTK_CONTAINER (child), direction))
+               if (gtk_widget_child_focus (child, direction))
                  return TRUE;
             }
         }
-      else if (GTK_WIDGET_VISIBLE (child))
+      else if (GTK_WIDGET_DRAWABLE (child) &&
+               gtk_widget_is_ancestor (child, GTK_WIDGET (container)))
         {
-         if (GTK_IS_CONTAINER (child))
-            {
-              if (gtk_container_focus (GTK_CONTAINER (child), direction))
-                return TRUE;
-            }
-          else if (GTK_WIDGET_CAN_FOCUS (child))
-            {
-              gtk_widget_grab_focus (child);
-              return TRUE;
-            }
+          if (gtk_widget_child_focus (child, direction))
+            return TRUE;
         }
     }
 
@@ -1072,72 +1945,382 @@ gtk_container_children_callback (GtkWidget *widget,
 }
 
 static void
-gtk_container_show_all (GtkWidget *widget)
+chain_widget_destroyed (GtkWidget *widget,
+                        gpointer   user_data)
 {
   GtkContainer *container;
+  GList *chain;
+  
+  container = GTK_CONTAINER (user_data);
 
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_CONTAINER (widget));
-  container = GTK_CONTAINER (widget);
+  chain = g_object_get_data (G_OBJECT (container),
+                             "gtk-container-focus-chain");
 
-  /* First show children, then self.
-     This makes sure that toplevel windows get shown as last widget.
-     Otherwise the user would see the widgets get
-     visible one after another.
-  */
-  gtk_container_foreach (container, (GtkCallback) gtk_widget_show_all, NULL);
-  gtk_widget_show (widget);
+  chain = g_list_remove (chain, widget);
+
+  g_signal_handlers_disconnect_by_func (widget,
+                                        chain_widget_destroyed,
+                                        user_data);
+  
+  g_object_set_data (G_OBJECT (container),
+                     "gtk-container-focus-chain",
+                     chain);  
 }
 
+/**
+ * gtk_container_set_focus_chain: 
+ * @container: a #GtkContainer.
+ * @focusable_widgets: the new focus chain.
+ *
+ * Sets a focus chain, overriding the one computed automatically by GTK+.
+ * 
+ * In principle each widget in the chain should be a descendant of the 
+ * container, but this is not enforced by this method, since it's allowed 
+ * to set the focus chain before you pack the widgets, or have a widget 
+ * in the chain that isn't always packed. The necessary checks are done 
+ * when the focus chain is actually traversed.
+ **/
+void
+gtk_container_set_focus_chain (GtkContainer *container,
+                               GList        *focusable_widgets)
+{
+  GList *chain;
+  GList *tmp_list;
+  
+  g_return_if_fail (GTK_IS_CONTAINER (container));
+  
+  if (container->has_focus_chain)
+    gtk_container_unset_focus_chain (container);
 
-static void
-gtk_container_hide_all (GtkWidget *widget)
+  container->has_focus_chain = TRUE;
+  
+  chain = NULL;
+  tmp_list = focusable_widgets;
+  while (tmp_list != NULL)
+    {
+      g_return_if_fail (GTK_IS_WIDGET (tmp_list->data));
+      
+      /* In principle each widget in the chain should be a descendant
+       * of the container, but we don't want to check that here, it's
+       * expensive and also it's allowed to set the focus chain before
+       * you pack the widgets, or have a widget in the chain that isn't
+       * always packed. So we check for ancestor during actual traversal.
+       */
+
+      chain = g_list_prepend (chain, tmp_list->data);
+
+      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",
+                     chain);
+}
+
+/**
+ * gtk_container_get_focus_chain:
+ * @container:         a #GtkContainer
+ * @focusable_widgets: location to store the focus chain of the
+ *                     container, or %NULL. You should free this list
+ *                     using g_list_free() when you are done with it, however
+ *                     no additional reference count is added to the
+ *                     individual widgets in the focus chain.
+ * 
+ * Retrieves the focus chain of the container, if one has been
+ * set explicitly. If no focus chain has been explicitly
+ * set, GTK+ computes the focus chain based on the positions
+ * of the children. In that case, GTK+ stores %NULL in
+ * @focusable_widgets and returns %FALSE.
+ *
+ * Return value: %TRUE if the focus chain of the container 
+ * has been set explicitly.
+ **/
+gboolean
+gtk_container_get_focus_chain (GtkContainer *container,
+                              GList       **focus_chain)
 {
-  GtkContainer *container;
+  g_return_val_if_fail (GTK_IS_CONTAINER (container), FALSE);
 
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_CONTAINER (widget));
-  container = GTK_CONTAINER (widget);
+  if (focus_chain)
+    {
+      if (container->has_focus_chain)
+       *focus_chain = g_list_copy (get_focus_chain (container));
+      else
+       *focus_chain = NULL;
+    }
 
-  /* First hide self, then children.
-     This is the reverse order of gtk_container_show_all.
-  */
-  gtk_widget_hide (widget);  
-  gtk_container_foreach (container, (GtkCallback) gtk_widget_hide_all, NULL);
+  return container->has_focus_chain;
+}
+
+/**
+ * gtk_container_unset_focus_chain:
+ * @container: a #GtkContainer.
+ * 
+ * Removes a focus chain explicitly set with gtk_container_set_focus_chain().
+ **/
+void
+gtk_container_unset_focus_chain (GtkContainer  *container)
+{  
+  g_return_if_fail (GTK_IS_CONTAINER (container));
+
+  if (container->has_focus_chain)
+    {
+      GList *chain;
+      GList *tmp_list;
+      
+      chain = get_focus_chain (container);
+      
+      container->has_focus_chain = FALSE;
+      
+      g_object_set_data (G_OBJECT (container), "gtk-container-focus-chain",
+                         NULL);
+
+      tmp_list = chain;
+      while (tmp_list != NULL)
+        {
+          g_signal_handlers_disconnect_by_func (tmp_list->data,
+                                                chain_widget_destroyed,
+                                                container);
+          
+          tmp_list = g_list_next (tmp_list);
+        }
+
+      g_list_free (chain);
+    }
 }
 
 void
 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);
+}
+
+/**
+ * gtk_container_get_focus_vadjustment:
+ * @container: a #GtkContainer
+ *
+ * Retrieves the vertical focus adjustment for the container. See
+ * gtk_container_set_focus_vadjustment ().
+ *
+ * Return value: the vertical focus adjustment, or %NULL if
+ *   none has been set.
+ **/
+GtkAdjustment *
+gtk_container_get_focus_vadjustment (GtkContainer *container)
+{
+  GtkAdjustment *vadjustment;
+    
+  g_return_val_if_fail (GTK_IS_CONTAINER (container), NULL);
+
+  vadjustment = g_object_get_qdata (G_OBJECT (container), vadjustment_key_id);
+
+  return vadjustment;
 }
 
 void
 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);
+
+  g_object_set_qdata_full (G_OBJECT (container),
+                          hadjustment_key_id,
+                          adjustment,
+                          g_object_unref);
+}
+
+/**
+ * gtk_container_get_focus_hadjustment:
+ * @container: a #GtkContainer
+ *
+ * Retrieves the horizontal focus adjustment for the container. See
+ * gtk_container_set_focus_hadjustment ().
+ *
+ * Return value: the horizontal focus adjustment, or %NULL if
+ *   none has been set.
+ **/
+GtkAdjustment *
+gtk_container_get_focus_hadjustment (GtkContainer *container)
+{
+  GtkAdjustment *hadjustment;
+
+  g_return_val_if_fail (GTK_IS_CONTAINER (container), NULL);
+
+  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 (GTK_IS_CONTAINER (widget));
+
+  gtk_container_foreach (GTK_CONTAINER (widget),
+                        (GtkCallback) gtk_widget_show_all,
+                        NULL);
+  gtk_widget_show (widget);
+}
+
+static void
+gtk_container_hide_all (GtkWidget *widget)
+{
+  g_return_if_fail (GTK_IS_CONTAINER (widget));
+
+  gtk_widget_hide (widget);
+  gtk_container_foreach (GTK_CONTAINER (widget),
+                        (GtkCallback) gtk_widget_hide_all,
+                        NULL);
+}
+
+
+static void
+gtk_container_expose_child (GtkWidget *child,
+                           gpointer   client_data)
+{
+  struct {
+    GtkWidget *container;
+    GdkEventExpose *event;
+  } *data = client_data;
+  
+  gtk_container_propagate_expose (GTK_CONTAINER (data->container),
+                                 child,
+                                 data->event);
+}
+
+static gint 
+gtk_container_expose (GtkWidget      *widget,
+                     GdkEventExpose *event)
+{
+  struct {
+    GtkWidget *container;
+    GdkEventExpose *event;
+  } data;
+
+  g_return_val_if_fail (GTK_IS_CONTAINER (widget), FALSE);
+  g_return_val_if_fail (event != NULL, FALSE);
+
+  
+  if (GTK_WIDGET_DRAWABLE (widget)) 
+    {
+      data.container = widget;
+      data.event = event;
+      
+      gtk_container_forall (GTK_CONTAINER (widget),
+                           gtk_container_expose_child,
+                           &data);
+    }   
+  
+  return FALSE;
+}
 
-  gtk_object_set_data_by_id_full (GTK_OBJECT (container),
-                                 hadjustment_key_id,
-                                 adjustment,
-                                 (GtkDestroyNotify) gtk_object_unref);
+static void
+gtk_container_map_child (GtkWidget *child,
+                        gpointer   client_data)
+{
+  if (GTK_WIDGET_VISIBLE (child) &&
+      GTK_WIDGET_CHILD_VISIBLE (child) &&
+      !GTK_WIDGET_MAPPED (child))
+    gtk_widget_map (child);
+}
+
+static void
+gtk_container_map (GtkWidget *widget)
+{
+  GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
+
+  gtk_container_forall (GTK_CONTAINER (widget),
+                       gtk_container_map_child,
+                       NULL);
+
+  if (!GTK_WIDGET_NO_WINDOW (widget))
+    gdk_window_show (widget->window);
+}
+
+static void
+gtk_container_unmap (GtkWidget *widget)
+{
+  GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
+
+  if (!GTK_WIDGET_NO_WINDOW (widget))
+    gdk_window_hide (widget->window);
+  else
+    gtk_container_forall (GTK_CONTAINER (widget),
+                         (GtkCallback)gtk_widget_unmap,
+                         NULL);
+}
+
+/**
+ * gtk_container_propagate_expose:
+ * @container: a #GtkContainer
+ * @child: a child of @container
+ * @event: a expose event sent to container
+ *
+ * When a container receives an expose event, it must send synthetic
+ * expose events to all children that don't have their own #GdkWindows.
+ * This function provides a convenient way of doing this. A container,
+ * when it receives an expose event, calls gtk_container_propagate_expose() 
+ * once for each child, passing in the event the container received.
+ *
+ * gtk_container_propagate_expose() takes care of deciding whether
+ * an expose event needs to be sent to the child, intersecting
+ * the event's area with the child area, and sending the event.
+ * 
+ * In most cases, a container can simply either simply inherit the
+ * ::expose implementation from #GtkContainer, or, do some drawing 
+ * and then chain to the ::expose implementation from #GtkContainer.
+ **/
+void
+gtk_container_propagate_expose (GtkContainer   *container,
+                               GtkWidget      *child,
+                               GdkEventExpose *event)
+{
+  GdkEvent *child_event;
+
+  g_return_if_fail (GTK_IS_CONTAINER (container));
+  g_return_if_fail (GTK_IS_WIDGET (child));
+  g_return_if_fail (event != NULL);
+
+  g_assert (child->parent == GTK_WIDGET (container));
+  
+  if (GTK_WIDGET_DRAWABLE (child) &&
+      GTK_WIDGET_NO_WINDOW (child) &&
+      (child->window == event->window))
+    {
+      child_event = gdk_event_new (GDK_EXPOSE);
+      child_event->expose = *event;
+      g_object_ref (child_event->expose.window);
+
+      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->expose.region, &child_event->expose.area);
+         gtk_widget_send_expose (child, child_event);
+       }
+      gdk_event_free (child_event);
+    }
 }