]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkcontainer.c
Document expose event->region change and that gtk_widget_event doesn't
[~andy/gtk] / gtk / gtkcontainer.c
index d2e2dbf6aaa067e7db471eeb588806b3c720b7d8..760e152966a1bf4828d58c5c0728c15ec8f481e2 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
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
+#include <stdarg.h>
 #include <string.h>
+#include <stdlib.h>
+
 #include "gtkcontainer.h"
 #include "gtkprivate.h"
 #include "gtksignal.h"
-
+#include "gtkmain.h"
+#include "gtkwindow.h"
 
 enum {
   ADD,
   REMOVE,
-  NEED_RESIZE,
-  FOREACH,
+  CHECK_RESIZE,
   FOCUS,
+  SET_FOCUS_CHILD,
   LAST_SIGNAL
 };
 enum {
   ARG_0,
   ARG_BORDER_WIDTH,
-  ARG_AUTO_RESIZE,
-  ARG_BLOCK_RESIZE,
-  ARG_CHILD
+  ARG_RESIZE_MODE,
+  ARG_CHILD,
+  ARG_REALLOCATE_REDRAWS
 };
 
+typedef struct _GtkChildArgInfo        GtkChildArgInfo;
+struct _GtkChildArgInfo
+{
+  gchar *name;
+  GtkType type;
+  GtkType class_type;
+  guint arg_flags;
+  guint arg_id;
+  guint seq_id;
+};
 
-typedef void (*GtkContainerSignal1) (GtkObject *object,
-                                    gpointer   arg1,
-                                    gpointer   data);
-typedef void (*GtkContainerSignal2) (GtkObject *object,
-                                    gpointer   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 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 gint container_signals[LAST_SIGNAL] = { 0 };
+static void     gtk_container_base_class_init      (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_get_arg              (GtkObject         *object,
+                                                   GtkArg            *arg,
+                                                   guint              arg_id);
+static void     gtk_container_set_arg              (GtkObject         *object,
+                                                   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 void     gtk_container_real_check_resize    (GtkContainer      *container);
+static gboolean gtk_container_real_focus           (GtkContainer      *container,
+                                                   GtkDirectionType   direction);
+static void     gtk_container_real_set_focus_child (GtkContainer      *container,
+                                                   GtkWidget         *widget);
+static gboolean gtk_container_focus_tab            (GtkContainer      *container,
+                                                   GList             *children,
+                                                   GtkDirectionType   direction);
+static gboolean gtk_container_focus_up_down        (GtkContainer      *container,
+                                                   GList            **children,
+                                                   GtkDirectionType   direction);
+static gboolean gtk_container_focus_left_right     (GtkContainer      *container,
+                                                   GList            **children,
+                                                   GtkDirectionType   direction);
+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 gchar* gtk_container_child_default_composite_name (GtkContainer *container,
+                                                         GtkWidget    *child);
+
+
+
+static guint container_signals[LAST_SIGNAL] = { 0 };
+static GHashTable *container_child_arg_info_ht = NULL;
 
 static GtkWidgetClass *parent_class = NULL;
 
-guint
-gtk_container_get_type ()
+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;
+
+GtkType
+gtk_container_get_type (void)
 {
-  static guint container_type = 0;
+  static GtkType container_type = 0;
 
   if (!container_type)
     {
-      GtkTypeInfo container_info =
+      static const GtkTypeInfo 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,
+       /* reserved_1 */ NULL,
+       /* reserved_2 */ NULL,
+       (GtkClassInitFunc) gtk_container_base_class_init,
       };
 
       container_type = gtk_type_unique (gtk_widget_get_type (), &container_info);
@@ -129,6 +141,15 @@ gtk_container_get_type ()
   return container_type;
 }
 
+static void
+gtk_container_base_class_init (GtkContainerClass *class)
+{
+  /* reset instance specifc class fields that don't get inherited */
+  class->n_child_args = 0;
+  class->set_child_arg = NULL;
+  class->get_child_arg = NULL;
+}
+
 static void
 gtk_container_class_init (GtkContainerClass *class)
 {
@@ -137,67 +158,447 @@ gtk_container_class_init (GtkContainerClass *class)
 
   object_class = (GtkObjectClass*) class;
   widget_class = (GtkWidgetClass*) class;
+
   parent_class = gtk_type_class (gtk_widget_get_type ());
+
+  container_child_arg_info_ht = g_hash_table_new (gtk_arg_info_hash,
+                                                 gtk_arg_info_equal);
+
+  vadjustment_key_id = g_quark_from_static_string (vadjustment_key);
+  hadjustment_key_id = g_quark_from_static_string (hadjustment_key);
+  
+
+  object_class->get_arg = gtk_container_get_arg;
+  object_class->set_arg = gtk_container_set_arg;
+  object_class->destroy = gtk_container_destroy;
+
+  widget_class->show_all = gtk_container_show_all;
+  widget_class->hide_all = gtk_container_hide_all;
+  widget_class->expose_event = gtk_container_expose;
   
-  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);
+  class->add = gtk_container_add_unimplemented;
+  class->remove = gtk_container_remove_unimplemented;
+  class->check_resize = gtk_container_real_check_resize;
+  class->forall = NULL;
+  class->focus = gtk_container_real_focus;
+  class->set_focus_child = gtk_container_real_set_focus_child;
+  class->child_type = NULL;
+  class->composite_name = gtk_container_child_default_composite_name;
+
+  gtk_object_add_arg_type ("GtkContainer::border_width", GTK_TYPE_UINT, GTK_ARG_READWRITE, ARG_BORDER_WIDTH);
+  gtk_object_add_arg_type ("GtkContainer::resize_mode", GTK_TYPE_RESIZE_MODE, GTK_ARG_READWRITE, ARG_RESIZE_MODE);
   gtk_object_add_arg_type ("GtkContainer::child", GTK_TYPE_WIDGET, GTK_ARG_WRITABLE, ARG_CHILD);
+  gtk_object_add_arg_type ("GtkContainer::reallocate_redraws", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_REALLOCATE_REDRAWS);
 
   container_signals[ADD] =
     gtk_signal_new ("add",
                     GTK_RUN_FIRST,
-                    object_class->type,
+                    GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkContainerClass, add),
-                    gtk_container_marshal_signal_1,
+                    gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                     GTK_TYPE_WIDGET);
   container_signals[REMOVE] =
     gtk_signal_new ("remove",
                     GTK_RUN_FIRST,
-                    object_class->type,
+                    GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkContainerClass, remove),
-                    gtk_container_marshal_signal_1,
+                    gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                     GTK_TYPE_WIDGET);
-  container_signals[NEED_RESIZE] =
-    gtk_signal_new ("need_resize",
-                    GTK_RUN_FIRST,
-                    object_class->type,
-                    GTK_SIGNAL_OFFSET (GtkContainerClass, need_resize),
-                    gtk_container_marshal_signal_4,
-                   GTK_TYPE_BOOL, 0,
-                    GTK_TYPE_WIDGET);
-  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[CHECK_RESIZE] =
+    gtk_signal_new ("check_resize",
+                    GTK_RUN_LAST,
+                    GTK_CLASS_TYPE (object_class),
+                    GTK_SIGNAL_OFFSET (GtkContainerClass, check_resize),
+                   gtk_marshal_VOID__VOID,
+                   GTK_TYPE_NONE, 0);
   container_signals[FOCUS] =
     gtk_signal_new ("focus",
-                    GTK_RUN_FIRST,
-                    object_class->type,
+                    GTK_RUN_LAST,
+                    GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkContainerClass, focus),
-                    gtk_container_marshal_signal_3,
+                    gtk_marshal_ENUM__ENUM,
                    GTK_TYPE_DIRECTION_TYPE, 1,
                     GTK_TYPE_DIRECTION_TYPE);
+  container_signals[SET_FOCUS_CHILD] =
+    gtk_signal_new ("set-focus-child",
+                    GTK_RUN_FIRST,
+                    GTK_CLASS_TYPE (object_class),
+                    GTK_SIGNAL_OFFSET (GtkContainerClass, set_focus_child),
+                    gtk_marshal_VOID__OBJECT,
+                   GTK_TYPE_NONE, 1,
+                    GTK_TYPE_WIDGET);
+}
+
+GtkType
+gtk_container_child_type (GtkContainer      *container)
+{
+  GtkType slot;
+  GtkContainerClass *class;
+
+  g_return_val_if_fail (container != NULL, 0);
+  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 = GTK_TYPE_NONE;
+
+  return slot;
+}
 
-  gtk_object_class_add_signals (object_class, container_signals, LAST_SIGNAL);
+/****************************************************
+ * GtkContainer child argument mechanism
+ *
+ ****************************************************/
+
+void
+gtk_container_add_with_args (GtkContainer      *container,
+                            GtkWidget         *widget,
+                            const gchar       *first_arg_name,
+                            ...)
+{
+  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_widget_ref (GTK_WIDGET (container));
+  gtk_widget_ref (widget);
+
+  gtk_signal_emit (GTK_OBJECT (container), container_signals[ADD], widget);
   
-  object_class->destroy = gtk_container_destroy;
+  if (widget->parent)
+    {
+      va_list var_args;
+      GSList *arg_list = NULL;
+      GSList *info_list = NULL;
+      gchar *error;
+      
+      va_start (var_args, first_arg_name);
+      error = gtk_container_child_args_collect (GTK_OBJECT_TYPE (container),
+                                               &arg_list,
+                                               &info_list,
+                                               first_arg_name,
+                                               var_args);
+      va_end (var_args);
+
+      if (error)
+       {
+         g_warning ("gtk_container_add_with_args(): %s", error);
+         g_free (error);
+       }
+      else
+       {
+         GSList *slist_arg;
+         GSList *slist_info;
+
+         slist_arg = arg_list;
+         slist_info = info_list;
+         while (slist_arg)
+           {
+             gtk_container_arg_set (container, widget, slist_arg->data, slist_info->data);
+             slist_arg = slist_arg->next;
+             slist_info = slist_info->next;
+           }
+         gtk_args_collect_cleanup (arg_list, info_list);
+       }
+    }
+
+  gtk_widget_unref (widget);
+  gtk_widget_unref (GTK_WIDGET (container));
+}
+
+void
+gtk_container_addv (GtkContainer      *container,
+                   GtkWidget         *widget,
+                   guint              n_args,
+                   GtkArg            *args)
+{
+  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_widget_ref (GTK_WIDGET (container));
+  gtk_widget_ref (widget);
+
+  gtk_signal_emit (GTK_OBJECT (container), container_signals[ADD], widget);
   
-  /* 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;  
+  if (widget->parent)
+    {
+      GtkArg *max_args;
+
+      for (max_args = args + n_args; args < max_args; args++)
+       gtk_container_arg_set (container, widget, args, NULL);
+    }
+
+  gtk_widget_unref (widget);
+  gtk_widget_unref (GTK_WIDGET (container));
+}
+
+void
+gtk_container_child_setv (GtkContainer      *container,
+                         GtkWidget         *child,
+                         guint              n_args,
+                         GtkArg            *args)
+{
+  GtkArg *max_args;
+
+  g_return_if_fail (container != NULL);
+  g_return_if_fail (GTK_IS_CONTAINER (container));
+  g_return_if_fail (child != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (child));
+  g_return_if_fail (child->parent != NULL);
+  if (n_args)
+    g_return_if_fail (args != NULL);
+
+  for (max_args = args + n_args; args < max_args; args++)
+    gtk_container_arg_set (container, child, args, NULL);
+}
+
+void
+gtk_container_child_getv (GtkContainer      *container,
+                         GtkWidget         *child,
+                         guint              n_args,
+                         GtkArg            *args)
+{
+  GtkArg *max_args;
+
+  g_return_if_fail (container != NULL);
+  g_return_if_fail (GTK_IS_CONTAINER (container));
+  g_return_if_fail (child != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (child));
+  g_return_if_fail (child->parent != NULL);
+  if (n_args)
+    g_return_if_fail (args != NULL);
+
+  for (max_args = args + n_args; args < max_args; args++)
+    gtk_container_arg_get (container, child, args, NULL);
+}
+
+void
+gtk_container_child_set (GtkContainer      *container,
+                        GtkWidget         *child,
+                        const gchar       *first_arg_name,
+                        ...)
+{
+  va_list var_args;
+  GSList *arg_list = NULL;
+  GSList *info_list = NULL;
+  gchar *error;
+  
+  g_return_if_fail (container != NULL);
+  g_return_if_fail (GTK_IS_CONTAINER (container));
+  g_return_if_fail (child != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (child));
+  g_return_if_fail (child->parent != NULL);
+
+  va_start (var_args, first_arg_name);
+  error = gtk_container_child_args_collect (GTK_OBJECT_TYPE (container),
+                                           &arg_list,
+                                           &info_list,
+                                           first_arg_name,
+                                           var_args);
+  va_end (var_args);
+
+  if (error)
+    {
+      g_warning ("gtk_container_child_set(): %s", error);
+      g_free (error);
+    }
+  else
+    {
+      GSList *slist_arg;
+      GSList *slist_info;
+
+      slist_arg = arg_list;
+      slist_info = info_list;
+      while (slist_arg)
+       {
+         gtk_container_arg_set (container, child, slist_arg->data, slist_info->data);
+         slist_arg = slist_arg->next;
+         slist_info = slist_info->next;
+       }
+      gtk_args_collect_cleanup (arg_list, info_list);
+    }
+}
+
+void
+gtk_container_arg_set (GtkContainer *container,
+                      GtkWidget    *child,
+                      GtkArg       *arg,
+                      GtkArgInfo   *info)
+{
+  GtkContainerClass *class;
+  
+  g_return_if_fail (container != NULL);
+  g_return_if_fail (GTK_IS_CONTAINER (container));
+  g_return_if_fail (child != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (child));
+  g_return_if_fail (arg != NULL);
+  
+  if (!info)
+    {
+      gchar *error;
+      
+      error = gtk_arg_get_info (GTK_OBJECT_TYPE (container),
+                               container_child_arg_info_ht,
+                               arg->name,
+                               &info);
+      if (error)
+       {
+         g_warning ("gtk_container_arg_set(): %s", error);
+         g_free (error);
+         return;
+       }
+    }
+  g_return_if_fail (info->arg_flags & GTK_ARG_CHILD_ARG);
+  
+  if (! (info->arg_flags & GTK_ARG_WRITABLE))
+    {
+      g_warning ("gtk_container_arg_set(): argument \"%s\" is not writable",
+                info->full_name);
+      return;
+    }
+  if (info->type != arg->type)
+    {
+      g_warning ("gtk_container_arg_set(): argument \"%s\" has invalid type `%s'",
+                info->full_name,
+                gtk_type_name (arg->type));
+      return;
+    }
   
-  class->need_resize = gtk_real_container_need_resize;
-  class->focus = gtk_real_container_focus;
+  class = gtk_type_class (info->class_type);
+  g_assert (class->set_child_arg != NULL);
+  class->set_child_arg (container, child, arg, info->arg_id);
+}
+
+void
+gtk_container_arg_get (GtkContainer *container,
+                      GtkWidget    *child,
+                      GtkArg       *arg,
+                      GtkArgInfo   *info)
+{
+  GtkContainerClass *class;
+  
+  g_return_if_fail (container != NULL);
+  g_return_if_fail (GTK_IS_CONTAINER (container));
+  g_return_if_fail (child != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (child));
+  g_return_if_fail (arg != NULL);
+  
+  if (!info)
+    {
+      gchar *error;
+      
+      error = gtk_arg_get_info (GTK_OBJECT_TYPE (container),
+                               container_child_arg_info_ht,
+                               arg->name,
+                               &info);
+      if (error)
+       {
+         g_warning ("gtk_container_arg_get(): %s", error);
+         g_free (error);
+         arg->type = GTK_TYPE_INVALID;
+         return;
+       }
+    }
+  g_return_if_fail (info->arg_flags & GTK_ARG_CHILD_ARG);
+  
+  if (! (info->arg_flags & GTK_ARG_READABLE))
+    {
+      g_warning ("gtk_container_arg_get(): argument \"%s\" is not readable",
+                info->full_name);
+      arg->type = GTK_TYPE_INVALID;
+      return;
+    }
+  
+  class = gtk_type_class (info->class_type);
+  g_assert (class->get_child_arg != NULL);
+  arg->type = info->type;
+  class->get_child_arg (container, child, arg, info->arg_id);
+}
+
+void
+gtk_container_add_child_arg_type (const gchar       *arg_name,
+                                 GtkType            arg_type,
+                                 guint              arg_flags,
+                                 guint              arg_id)
+{
+  g_return_if_fail (arg_name != NULL);
+  g_return_if_fail (arg_type > GTK_TYPE_NONE);
+  g_return_if_fail (arg_id > 0);
+  g_return_if_fail ((arg_flags & GTK_ARG_READWRITE) == GTK_ARG_READWRITE);
+  /* g_return_if_fail ((arg_flags & GTK_ARG_CHILD_ARG) != 0); */
+
+  arg_flags |= GTK_ARG_CHILD_ARG;
+  arg_flags &= GTK_ARG_MASK;
+
+  gtk_arg_type_new_static (GTK_TYPE_CONTAINER,
+                          arg_name,
+                          GTK_STRUCT_OFFSET (GtkContainerClass, n_child_args),
+                          container_child_arg_info_ht,
+                          arg_type,
+                          arg_flags,
+                          arg_id);
+}
+
+gchar*
+gtk_container_child_args_collect (GtkType       object_type,
+                                 GSList      **arg_list_p,
+                                 GSList      **info_list_p,
+                                 const gchar  *first_arg_name,
+                                 va_list       var_args)
+{
+  return gtk_args_collect (object_type,
+                          container_child_arg_info_ht,
+                          arg_list_p,
+                          info_list_p,
+                          first_arg_name,
+                          var_args);
+}
+
+gchar*
+gtk_container_child_arg_get_info (GtkType       object_type,
+                                 const gchar  *arg_name,
+                                 GtkArgInfo  **info_p)
+{
+  return gtk_arg_get_info (object_type,
+                          container_child_arg_info_ht,
+                          arg_name,
+                          info_p);
+}
+
+GtkArg*
+gtk_container_query_child_args (GtkType                   class_type,
+                               guint32          **arg_flags,
+                               guint             *n_args)
+{
+  g_return_val_if_fail (n_args != NULL, NULL);
+  *n_args = 0;
+  g_return_val_if_fail (gtk_type_is_a (class_type, GTK_TYPE_CONTAINER), NULL);
+
+  return gtk_args_query (class_type, container_child_arg_info_ht, arg_flags, n_args);
+}
+
+
+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)));
+}
+
+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)));
 }
 
 static void
@@ -205,83 +606,80 @@ 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_mode = GTK_RESIZE_PARENT;
+  container->reallocate_redraws = FALSE;
   container->resize_widgets = NULL;
 }
 
 static void
 gtk_container_destroy (GtkObject *object)
 {
-  GSList *node;
-  
+  GtkContainer *container;
+
   g_return_if_fail (object != NULL);
   g_return_if_fail (GTK_IS_CONTAINER (object));
 
-  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;
+  container = GTK_CONTAINER (object);
+  
+  if (GTK_CONTAINER_RESIZE_PENDING (container))
+    gtk_container_dequeue_resize_handler (container);
+  if (container->resize_widgets)
+    gtk_container_clear_resize_widgets (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,
+gtk_container_set_arg (GtkObject    *object,
                       GtkArg       *arg,
                       guint         arg_id)
 {
+  GtkContainer *container;
+
+  container = GTK_CONTAINER (object);
+
   switch (arg_id)
     {
     case ARG_BORDER_WIDTH:
-      gtk_container_border_width (container, GTK_VALUE_LONG (*arg));
+      gtk_container_set_border_width (container, GTK_VALUE_UINT (*arg));
       break;
-    case ARG_AUTO_RESIZE:
-      if (GTK_VALUE_BOOL (*arg))
-       gtk_container_enable_resize (container);
-      else
-       gtk_container_disable_resize (container);
+    case ARG_RESIZE_MODE:
+      gtk_container_set_resize_mode (container, GTK_VALUE_ENUM (*arg));
       break;
-    case ARG_BLOCK_RESIZE:
-      if (GTK_VALUE_BOOL (*arg))
-       gtk_container_block_resize (container);
-      else
-       gtk_container_unblock_resize (container);
+    case ARG_REALLOCATE_REDRAWS:
+      gtk_container_set_reallocate_redraws (container, GTK_VALUE_BOOL (*arg));
       break;
     case ARG_CHILD:
       gtk_container_add (container, GTK_WIDGET (GTK_VALUE_OBJECT (*arg)));
       break;
     default:
-      arg->type = GTK_TYPE_INVALID;
       break;
     }
 }
 
 static void
-gtk_container_get_arg (GtkContainer *container,
+gtk_container_get_arg (GtkObject    *object,
                       GtkArg       *arg,
                       guint         arg_id)
 {
+  GtkContainer *container;
+
+  container = GTK_CONTAINER (object);
+  
   switch (arg_id)
     {
     case ARG_BORDER_WIDTH:
-      GTK_VALUE_LONG (*arg) = container->border_width;
+      GTK_VALUE_UINT (*arg) = container->border_width;
       break;
-    case ARG_AUTO_RESIZE:
-      GTK_VALUE_BOOL (*arg) = container->auto_resize;
+    case ARG_RESIZE_MODE:
+      GTK_VALUE_ENUM (*arg) = container->resize_mode;
       break;
-    case ARG_BLOCK_RESIZE:
-      GTK_VALUE_BOOL (*arg) = container->block_resize;
+    case ARG_REALLOCATE_REDRAWS:
+      GTK_VALUE_BOOL (*arg) = container->reallocate_redraws;
       break;
     default:
       arg->type = GTK_TYPE_INVALID;
@@ -289,9 +687,23 @@ gtk_container_get_arg (GtkContainer *container,
     }
 }
 
+/**
+ * gtk_container_set_border_width:
+ * @container: a #GtkContainer
+ * @border_width: amount of blank space to leave <emphasis>outside</emphasis> 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));
@@ -300,103 +712,489 @@ gtk_container_border_width (GtkContainer *container,
     {
       container->border_width = border_width;
 
-      if (container->widget.parent && GTK_WIDGET_VISIBLE (container))
-       gtk_container_need_resize (GTK_CONTAINER (container->widget.parent));
+      if (GTK_WIDGET_REALIZED (container))
+       gtk_widget_queue_resize (GTK_WIDGET (container));
     }
 }
 
+/**
+ * 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));
+
+  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",
+                 g_type_name (G_OBJECT_TYPE (widget)),
+                 g_type_name (G_OBJECT_TYPE (container)),
+                 g_type_name (G_OBJECT_TYPE (widget->parent)));
+      return;
+    }
+
   gtk_signal_emit (GTK_OBJECT (container), container_signals[ADD], 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);
+}
 
-  if (container->focus_child == widget)
-    container->focus_child = NULL;
+void
+gtk_container_dequeue_resize_handler (GtkContainer *container)
+{
+  g_return_if_fail (GTK_IS_CONTAINER (container));
+  g_return_if_fail (GTK_CONTAINER_RESIZE_PENDING (container));
 
-  gtk_signal_emit (GTK_OBJECT (container), container_signals[REMOVE], widget);
+  container_resize_queue = g_slist_remove (container_resize_queue, container);
+  GTK_PRIVATE_UNSET_FLAG (container, GTK_RESIZE_PENDING);
 }
 
 void
-gtk_container_disable_resize (GtkContainer *container)
+gtk_container_clear_resize_widgets (GtkContainer *container)
 {
+  GSList *node;
+
   g_return_if_fail (container != NULL);
   g_return_if_fail (GTK_IS_CONTAINER (container));
 
-  container->auto_resize = FALSE;
+  node = container->resize_widgets;
+
+  while (node)
+    {
+      GtkWidget *widget = node->data;
+
+      GTK_PRIVATE_UNSET_FLAG (widget, GTK_RESIZE_NEEDED);
+      node = node->next;
+    }
+  
+  g_slist_free (container->resize_widgets);
+  container->resize_widgets = NULL;
 }
 
 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));
+  g_return_if_fail (resize_mode <= GTK_RESIZE_IMMEDIATE);
+  
+  if (GTK_WIDGET_TOPLEVEL (container) &&
+      resize_mode == GTK_RESIZE_PARENT)
+    resize_mode = GTK_RESIZE_QUEUE;
+  
+  if (container->resize_mode != resize_mode)
+    {
+      container->resize_mode = resize_mode;
+      
+      if (resize_mode == GTK_RESIZE_IMMEDIATE)
+       gtk_container_check_resize (container);
+      else
+       {
+         gtk_container_clear_resize_widgets (container);
+         gtk_widget_queue_resize (GTK_WIDGET (container));
+       }
+    }
+}
+
+void
+gtk_container_set_reallocate_redraws (GtkContainer *container,
+                                     gboolean      needs_redraws)
+{
+  g_return_if_fail (GTK_IS_CONTAINER (container));
+
+  needs_redraws = needs_redraws ? TRUE : FALSE;
+  if (needs_redraws != container->reallocate_redraws)
+    {
+      container->reallocate_redraws = needs_redraws;
+      if (container->reallocate_redraws)
+       gtk_widget_queue_draw (GTK_WIDGET (container));
+    }
+}
 
-  container->auto_resize = TRUE;
-  if (container->need_resize)
+static GtkContainer*
+gtk_container_get_resize_container (GtkContainer *container)
+{
+  GtkWidget *widget;
+
+  widget = GTK_WIDGET (container);
+
+  while (widget->parent)
     {
-      container->need_resize = FALSE;
-      gtk_widget_queue_resize (GTK_WIDGET (container));
+      widget = widget->parent;
+      if (GTK_IS_RESIZE_CONTAINER (widget) && !GTK_WIDGET_RESIZE_NEEDED (widget))
+       break;
     }
+
+  return GTK_IS_RESIZE_CONTAINER (widget) ? (GtkContainer*) widget : NULL;
+}
+
+static gboolean
+gtk_container_idle_sizer (gpointer data)
+{
+  GDK_THREADS_ENTER ();
+
+  /* we may be invoked with a container_resize_queue of NULL, because
+   * queue_resize could have been adding an extra idle function while
+   * the queue still got processed. we better just ignore such case
+   * 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;
+
+      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_block_resize (GtkContainer *container)
+gtk_container_queue_resize (GtkContainer *container)
 {
+  GtkContainer *resize_container;
+  
   g_return_if_fail (container != NULL);
   g_return_if_fail (GTK_IS_CONTAINER (container));
 
-  container->block_resize = TRUE;
+  /* clear resize widgets for resize containers
+   * before aborting prematurely. this is especially
+   * important for toplevels which may need imemdiate
+   * processing or their resize handler to be queued.
+   */
+  if (GTK_IS_RESIZE_CONTAINER (container))
+    gtk_container_clear_resize_widgets (container);
+  if (GTK_OBJECT_DESTROYED (container) ||
+      GTK_WIDGET_RESIZE_NEEDED (container))
+    return;
+  
+  resize_container = gtk_container_get_resize_container (container);
+  
+  if (resize_container)
+    {
+      if (GTK_WIDGET_VISIBLE (resize_container) &&
+         (GTK_WIDGET_TOPLEVEL (resize_container) || GTK_WIDGET_DRAWABLE (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);
+               }
+             
+             GTK_PRIVATE_SET_FLAG (container, GTK_RESIZE_NEEDED);
+             resize_container->resize_widgets =
+               g_slist_prepend (resize_container->resize_widgets, container);
+             break;
+
+           case GTK_RESIZE_IMMEDIATE:
+             GTK_PRIVATE_SET_FLAG (container, GTK_RESIZE_NEEDED);
+             resize_container->resize_widgets =
+               g_slist_prepend (resize_container->resize_widgets, container);
+             gtk_container_check_resize (resize_container);
+             break;
+
+           case GTK_RESIZE_PARENT:
+             /* Ignore, should not be 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_unblock_resize (GtkContainer *container)
+gtk_container_check_resize (GtkContainer *container)
 {
   g_return_if_fail (container != NULL);
   g_return_if_fail (GTK_IS_CONTAINER (container));
   
-  container->block_resize = FALSE;
+  gtk_signal_emit (GTK_OBJECT (container), container_signals[CHECK_RESIZE]);
 }
 
-gint
-gtk_container_need_resize (GtkContainer *container)
+static void
+gtk_container_real_check_resize (GtkContainer *container)
 {
-  gint return_val;
+  GtkWidget *widget;
+  GtkRequisition requisition;
   
-  g_return_val_if_fail (container != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_CONTAINER (container), FALSE);
+  g_return_if_fail (container != NULL);
+  g_return_if_fail (GTK_IS_CONTAINER (container));
   
-  return_val = FALSE;
+  widget = GTK_WIDGET (container);
   
-  if (!container->block_resize)
+  gtk_widget_size_request (widget, &requisition);
+  
+  if (requisition.width > widget->allocation.width ||
+      requisition.height > widget->allocation.height)
     {
-      if (container->auto_resize)
-       gtk_signal_emit (GTK_OBJECT (container),
-                         container_signals[NEED_RESIZE],
-                         &return_val);
+      if (GTK_IS_RESIZE_CONTAINER (container))
+       gtk_widget_size_allocate (GTK_WIDGET (container),
+                                 &GTK_WIDGET (container)->allocation);
       else
-       container->need_resize = TRUE;
+       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 run through the list of resize
+ *  widgets and reallocate their sizes appropriately. We
+ *  make the optimization of not performing reallocation
+ *  for a widget who also has a parent in the resize widgets
+ *  list. GTK_RESIZE_NEEDED is used for flagging those
+ *  parents inside this function.
+ */
+void
+gtk_container_resize_children (GtkContainer *container)
+{
+  GtkWidget *widget;
+  GtkWidget *resize_container;
+  GSList *resize_widgets;
+  GSList *resize_containers;
+  GSList *node;
   
-  return return_val;
+  /* resizing invariants:
+   * toplevels have *always* resize_mode != GTK_RESIZE_PARENT set.
+   * containers with resize_mode==GTK_RESIZE_PARENT have to have resize_widgets
+   * set to NULL.
+   * containers that are flagged RESIZE_NEEDED must have resize_widgets set to
+   * NULL, or are toplevels (thus have ->parent set to NULL).
+   * widgets that are in some container->resize_widgets list must be flagged with
+   * RESIZE_NEEDED.
+   * widgets that have RESIZE_NEEDED set must be referenced in some
+   * GTK_IS_RESIZE_CONTAINER (container)->resize_widgets list.
+   * containers that have an idle sizer pending must be flagged with
+   * RESIZE_PENDING.
+   */
+  
+  g_return_if_fail (container != NULL);
+  g_return_if_fail (GTK_IS_CONTAINER (container));
+
+  /* we first check out if we actually need to perform a resize,
+   * which is not the case if we got another container queued for
+   * a resize in our anchestry. also we can skip the whole
+   * resize_widgets checks if we are a toplevel and NEED_RESIZE.
+   * this code assumes that our allocation is sufficient for our
+   * requisition, since otherwise we would NEED_RESIZE.
+   */
+  resize_container = GTK_WIDGET (container);
+  while (resize_container)
+    {
+      if (GTK_WIDGET_RESIZE_NEEDED (resize_container))
+       break;
+      resize_container = resize_container->parent;
+    }
+  if (resize_container)
+    {
+      /* queue_resize and size_allocate both clear our
+       * resize_widgets list.
+       */
+      if (resize_container->parent)
+       gtk_container_queue_resize (container);
+      else
+       gtk_widget_size_allocate (GTK_WIDGET (container),
+                                 &GTK_WIDGET (container)->allocation);
+      return;
+    }
+
+  resize_container = GTK_WIDGET (container);
+
+  /* we now walk the anchestry for all resize widgets as long
+   * as they are our children and as long as their allocation
+   * is insufficient, since we don't need to reallocate below that.
+   */
+  resize_widgets = container->resize_widgets;
+  container->resize_widgets = NULL;
+  for (node = resize_widgets; node; node = node->next)
+    {
+      widget = node->data;
+
+      GTK_PRIVATE_UNSET_FLAG (widget, GTK_RESIZE_NEEDED);
+
+      while (widget->parent != resize_container &&
+            ((widget->allocation.width < widget->requisition.width) ||
+             (widget->allocation.height < widget->requisition.height)))
+       widget = widget->parent;
+      
+      GTK_PRIVATE_SET_FLAG (widget, GTK_RESIZE_NEEDED);
+      node->data = widget;
+    }
+
+  /* for the newly setup resize_widgets list, we now walk each widget's
+   * anchestry to sort those widgets out that have RESIZE_NEEDED parents.
+   * we can safely stop the walk if we are the parent, since we checked
+   * our own anchestry already.
+   */
+  resize_containers = NULL;
+  for (node = resize_widgets; node; node = node->next)
+    {
+      GtkWidget *parent;
+
+      widget = node->data;
+      
+      if (!GTK_WIDGET_RESIZE_NEEDED (widget))
+       continue;
+      
+      parent = widget->parent;
+      
+      while (parent != resize_container)
+       {
+         if (GTK_WIDGET_RESIZE_NEEDED (parent))
+           {
+             GTK_PRIVATE_UNSET_FLAG (widget, GTK_RESIZE_NEEDED);
+             widget = parent;
+           }
+         parent = parent->parent;
+       }
+      
+      if (!g_slist_find (resize_containers, widget))
+       {
+         resize_containers = g_slist_prepend (resize_containers, widget);
+         gtk_widget_ref (widget);
+       }
+    }
+  g_slist_free (resize_widgets);
+  
+  for (node = resize_containers; node; node = node->next)
+    {
+      widget = node->data;
+      
+      GTK_PRIVATE_UNSET_FLAG (widget, GTK_RESIZE_NEEDED);
+
+      gtk_widget_size_allocate (widget, &widget->allocation);
+
+      gtk_widget_unref (widget);
+    }
+  g_slist_free (resize_containers);
 }
 
+/**
+ * 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 (container != NULL);
+  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)
 {
-  gtk_signal_emit (GTK_OBJECT (container),
-                   container_signals[FOREACH],
-                   callback, callback_data);
+  GtkContainerClass *class;
+  
+  g_return_if_fail (container != NULL);
+  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;
@@ -416,8 +1214,8 @@ gtk_container_foreach_unmarshal (GtkWidget *child,
   
   /* first argument */
   args[0].name = NULL;
-  args[0].type = GTK_OBJECT(child)->klass->type;
-  GTK_VALUE_OBJECT(args[0]) = GTK_OBJECT (child);
+  args[0].type = GTK_OBJECT_TYPE (child);
+  GTK_VALUE_OBJECT (args[0]) = GTK_OBJECT (child);
   
   /* location for return value */
   args[1].name = NULL;
@@ -426,16 +1224,6 @@ gtk_container_foreach_unmarshal (GtkWidget *child,
   fdata->callback (fdata->container, fdata->callback_data, 1, args);
 }
 
-void
-gtk_container_foreach_interp (GtkContainer       *container,
-                             GtkCallbackMarshal  marshal,
-                             gpointer            callback_data,
-                             GtkDestroyNotify    notify)
-{
-  gtk_container_foreach_full (container, NULL, marshal, 
-                             callback_data, notify);
-}
-
 void
 gtk_container_foreach_full (GtkContainer       *container,
                            GtkCallback         callback,
@@ -443,6 +1231,9 @@ gtk_container_foreach_full (GtkContainer       *container,
                            gpointer            callback_data,
                            GtkDestroyNotify    notify)
 {
+  g_return_if_fail (container != NULL);
+  g_return_if_fail (GTK_IS_CONTAINER (container));
+
   if (marshal)
     {
       GtkForeachData fdata;
@@ -454,16 +1245,24 @@ 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
+gboolean
 gtk_container_focus (GtkContainer     *container,
                     GtkDirectionType  direction)
 {
   gint return_val;
+
+  g_return_val_if_fail (container != NULL, FALSE);
+  g_return_val_if_fail (GTK_IS_CONTAINER (container), FALSE);
   
   gtk_signal_emit (GTK_OBJECT (container),
                    container_signals[FOCUS],
@@ -472,6 +1271,18 @@ gtk_container_focus (GtkContainer     *container,
   return return_val;
 }
 
+void
+gtk_container_set_focus_child (GtkContainer *container,
+                              GtkWidget    *widget)
+{
+  g_return_if_fail (container != NULL);
+  g_return_if_fail (GTK_IS_CONTAINER (container));
+  if (widget)
+    g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  gtk_signal_emit (GTK_OBJECT (container), container_signals[SET_FOCUS_CHILD], widget);
+}
+
 GList*
 gtk_container_children (GtkContainer *container)
 {
@@ -486,92 +1297,126 @@ gtk_container_children (GtkContainer *container)
   return g_list_reverse (children);
 }
 
-void
-gtk_container_register_toplevel (GtkContainer *container)
-{
-  gtk_widget_ref (GTK_WIDGET (container));
-  gtk_object_sink (GTK_OBJECT (container));
-}
-
-void
-gtk_container_unregister_toplevel (GtkContainer *container)
-{
-  gtk_widget_unref (GTK_WIDGET (container));
-}
-
 static void
-gtk_container_marshal_signal_1 (GtkObject      *object,
-                               GtkSignalFunc   func,
-                               gpointer        func_data,
-                               GtkArg         *args)
+gtk_container_child_position_callback (GtkWidget *widget,
+                                      gpointer   client_data)
 {
-  GtkContainerSignal1 rfunc;
-
-  rfunc = (GtkContainerSignal1) func;
-
-  (* rfunc) (object, GTK_VALUE_OBJECT (args[0]), func_data);
+  struct {
+    GtkWidget *child;
+    guint i;
+    guint index;
+  } *data = client_data;
+
+  data->i++;
+  if (data->child == widget)
+    data->index = data->i;
 }
 
-static void
-gtk_container_marshal_signal_2 (GtkObject      *object,
-                               GtkSignalFunc   func,
-                               gpointer        func_data,
-                               GtkArg         *args)
+static gchar*
+gtk_container_child_default_composite_name (GtkContainer *container,
+                                           GtkWidget    *child)
 {
-  GtkContainerSignal2 rfunc;
-
-  rfunc = (GtkContainerSignal2) func;
+  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",
+                         gtk_type_name (GTK_OBJECT_TYPE (child)),
+                         data.index);
 
-  (* rfunc) (object,
-            GTK_VALUE_C_CALLBACK(args[0]).func,
-            GTK_VALUE_C_CALLBACK(args[0]).func_data,
-            func_data);
+  return name;
 }
 
-static void
-gtk_container_marshal_signal_3 (GtkObject      *object,
-                               GtkSignalFunc   func,
-                               gpointer        func_data,
-                               GtkArg         *args)
+gchar*
+gtk_container_child_composite_name (GtkContainer *container,
+                                   GtkWidget    *child)
 {
-  GtkContainerSignal3 rfunc;
-  gint *return_val;
+  g_return_val_if_fail (container != NULL, NULL);
+  g_return_val_if_fail (GTK_IS_CONTAINER (container), NULL);
+  g_return_val_if_fail (child != NULL, NULL);
+  g_return_val_if_fail (GTK_IS_WIDGET (child), NULL);
+  g_return_val_if_fail (child->parent == GTK_WIDGET (container), NULL);
 
-  rfunc = (GtkContainerSignal3) func;
-  return_val = GTK_RETLOC_ENUM (args[1]);
+  if (GTK_WIDGET_COMPOSITE_CHILD (child))
+    {
+      static GQuark quark_composite_name = 0;
+      gchar *name;
 
-  *return_val = (* rfunc) (object, GTK_VALUE_ENUM(args[0]), func_data);
-}
+      if (!quark_composite_name)
+       quark_composite_name = g_quark_from_static_string ("gtk-composite-name");
 
-static void
-gtk_container_marshal_signal_4 (GtkObject      *object,
-                               GtkSignalFunc   func,
-                               gpointer        func_data,
-                               GtkArg         *args)
-{
-  GtkContainerSignal4 rfunc;
-  gint *return_val;
+      name = gtk_object_get_data_by_id (GTK_OBJECT (child), quark_composite_name);
+      if (!name)
+       {
+         GtkContainerClass *class;
 
-  rfunc = (GtkContainerSignal4) func;
-  return_val = GTK_RETLOC_BOOL (args[0]);
+         class = GTK_CONTAINER_GET_CLASS (container);
+         if (class->composite_name)
+           name = class->composite_name (container, child);
+       }
+      else
+       name = g_strdup (name);
 
-  *return_val = (* rfunc) (object, func_data);
+      return name;
+    }
+  
+  return NULL;
 }
 
-static gint
-gtk_real_container_need_resize (GtkContainer *container)
+void
+gtk_container_real_set_focus_child (GtkContainer     *container,
+                                   GtkWidget        *child)
 {
-  g_return_val_if_fail (container != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_CONTAINER (container), FALSE);
+  g_return_if_fail (container != NULL);
+  g_return_if_fail (GTK_IS_CONTAINER (container));
+  if (child)
+    g_return_if_fail (GTK_IS_WIDGET (child));
 
-  if (GTK_WIDGET_VISIBLE (container) && container->widget.parent)
-    return gtk_container_need_resize (GTK_CONTAINER (container->widget.parent));
+  if (child != container->focus_child)
+    {
+      if (container->focus_child)
+       gtk_widget_unref (container->focus_child);
+      container->focus_child = child;
+      if (container->focus_child)
+       gtk_widget_ref (container->focus_child);
+    }
 
-  return FALSE;
+
+  /* check for h/v adjustments
+   */
+  if (container->focus_child)
+    {
+      GtkAdjustment *adjustment;
+      
+      adjustment = gtk_object_get_data_by_id (GTK_OBJECT (container), vadjustment_key_id);
+      if (adjustment)
+       gtk_adjustment_clamp_page (adjustment,
+                                  container->focus_child->allocation.y,
+                                  (container->focus_child->allocation.y +
+                                   container->focus_child->allocation.height));
+
+      adjustment = gtk_object_get_data_by_id (GTK_OBJECT (container), hadjustment_key_id);
+      if (adjustment)
+       gtk_adjustment_clamp_page (adjustment,
+                                  container->focus_child->allocation.x,
+                                  (container->focus_child->allocation.x +
+                                   container->focus_child->allocation.width));
+    }
 }
 
-static gint
-gtk_real_container_focus (GtkContainer     *container,
+static gboolean
+gtk_container_real_focus (GtkContainer     *container,
                          GtkDirectionType  direction)
 {
   GList *children;
@@ -582,41 +1427,52 @@ gtk_real_container_focus (GtkContainer     *container,
   g_return_val_if_fail (container != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_CONTAINER (container), FALSE);
 
-  /* Fail if the container is insensitive
+  /* Fail if the container is inappropriate for focus movement
    */
-  if (!GTK_WIDGET_SENSITIVE (container))
+  if (!GTK_WIDGET_DRAWABLE (container) ||
+      !GTK_WIDGET_IS_SENSITIVE (container))
     return FALSE;
 
   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
        */
-      children = gtk_container_children (container);
+      children = NULL;
+      gtk_container_forall (container,
+                           gtk_container_children_callback,
+                           &children);
+      children = g_list_reverse (children);
+      /* children = gtk_container_children (container); */
 
       if (children)
        {
-         /* Remove any children which are insensitive
+         /* Remove any children which are inappropriate for focus movement
           */
          tmp_list = children;
          while (tmp_list)
            {
-             if (!GTK_WIDGET_SENSITIVE (tmp_list->data))
+             if (GTK_WIDGET_IS_SENSITIVE (tmp_list->data) &&
+                 GTK_WIDGET_DRAWABLE (tmp_list->data) &&
+                 (GTK_IS_CONTAINER (tmp_list->data) || GTK_WIDGET_CAN_FOCUS (tmp_list->data)))
+               tmp_list = tmp_list->next;
+             else
                {
                  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)
@@ -627,11 +1483,11 @@ gtk_real_container_focus (GtkContainer     *container,
              break;
            case GTK_DIR_UP:
            case GTK_DIR_DOWN:
-             return_val = gtk_container_focus_up_down (container, children, direction);
+             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);
+             return_val = gtk_container_focus_left_right (container, &children, direction);
              break;
            }
 
@@ -642,7 +1498,7 @@ gtk_real_container_focus (GtkContainer     *container,
   return return_val;
 }
 
-static gint
+static gboolean
 gtk_container_focus_tab (GtkContainer     *container,
                         GList            *children,
                         GtkDirectionType  direction)
@@ -650,8 +1506,8 @@ gtk_container_focus_tab (GtkContainer     *container,
   GtkWidget *child;
   GtkWidget *child2;
   GList *tmp_list;
-  gint length;
-  gint i, j;
+  guint length;
+  guint i, j;
 
   length = g_list_length (children);
 
@@ -691,7 +1547,7 @@ gtk_container_focus_tab (GtkContainer     *container,
        {
          child2 = tmp_list->prev->data;
          if ((child->allocation.x < child2->allocation.x) &&
-             (child->allocation.y >= child2->allocation.y))
+             (child->allocation.y == child2->allocation.y))
            {
              tmp_list->data = tmp_list->prev->data;
              tmp_list = tmp_list->prev;
@@ -713,227 +1569,285 @@ gtk_container_focus_tab (GtkContainer     *container,
   return gtk_container_focus_move (container, children, direction);
 }
 
-static gint
-gtk_container_focus_up_down (GtkContainer     *container,
-                            GList            *children,
-                            GtkDirectionType  direction)
+static gboolean
+old_focus_coords (GtkContainer *container, GdkRectangle *old_focus_rect)
 {
-  GtkWidget *child;
-  GtkWidget *child2;
-  GList *tmp_list;
-  gint dist1, dist2;
-  gint focus_x;
-  gint focus_width;
-  gint length;
-  gint i, j;
-
-  /* return failure if there isn't a focus child */
-  if (container->focus_child)
+  GtkWidget *widget = GTK_WIDGET (container);
+  GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
+  
+  if (toplevel &&
+      GTK_IS_WINDOW (toplevel) && GTK_WINDOW (toplevel)->focus_widget &&
+      GTK_WIDGET_REALIZED (container) &&
+      GTK_WIDGET_REALIZED (GTK_WINDOW (toplevel)->focus_widget))
     {
-      focus_width = container->focus_child->allocation.width / 2;
-      focus_x = container->focus_child->allocation.x + focus_width;
+      GtkWidget *old_focus = GTK_WINDOW (toplevel)->focus_widget;
+      GdkWindow *old_parent_window = old_focus->parent ? old_focus->parent->window : old_focus->window;
+      GdkWindow *new_parent_window = widget->window;
+      GdkWindow *toplevel_window = toplevel->window;
+      
+      *old_focus_rect = old_focus->allocation;
+      
+      /* Translate coordinates to the toplevel */
+      
+      while (old_parent_window != toplevel_window)
+       {
+         gint dx, dy;
+         
+         gdk_window_get_position (old_parent_window, &dx, &dy);
+         
+         old_focus_rect->x += dx;
+         old_focus_rect->y += dy;
+         
+         old_parent_window = gdk_window_get_parent (old_parent_window);
+       }
+      
+      /* Translate coordinates back to the new container */
+      
+      while (new_parent_window != toplevel_window)
+       {
+         gint dx, dy;
+         
+         gdk_window_get_position (new_parent_window, &dx, &dy);
+         
+         old_focus_rect->x -= dx;
+         old_focus_rect->y -= dy;
+         
+         new_parent_window = gdk_window_get_parent (new_parent_window);
+       }
+
+      return TRUE;
     }
-  else
+
+  return FALSE;
+}
+
+typedef struct _CompareInfo CompareInfo;
+
+struct _CompareInfo
+{
+  gint x;
+  gint y;
+};
+
+static gint
+up_down_compare (gconstpointer a,
+                gconstpointer b,
+                gpointer      data)
+{
+  const GtkWidget *child1 = a;
+  const GtkWidget *child2 = b;
+  CompareInfo *compare = data;
+
+  gint y1 = child1->allocation.y + child1->allocation.height / 2;
+  gint y2 = child2->allocation.y + child2->allocation.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 (child1->allocation.x + child1->allocation.width / 2 - compare->x);
+      gint x2 = abs (child2->allocation.x + child2->allocation.width / 2 - compare->x);
+
+      if (compare->y < y1)
+       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 gboolean
+gtk_container_focus_up_down (GtkContainer     *container,
+                            GList           **children,
+                            GtkDirectionType  direction)
+{
+  CompareInfo compare;
+  GList *tmp_list;
 
-  /* sort the children in the y direction */
-  for (i = 1; i < length; i++)
+  if (container->focus_child)
     {
-      j = i;
-      tmp_list = g_list_nth (children, j);
-      child = tmp_list->data;
+      gint compare_x1;
+      gint compare_x2;
+      gint compare_y;
+      
+      /* Delete widgets from list that don't match minimum criteria */
 
-      while (j > 0)
+      compare_x1 = container->focus_child->allocation.x;
+      compare_x2 = container->focus_child->allocation.x + container->focus_child->allocation.width;
+
+      if (direction == GTK_DIR_UP)
+       compare_y = container->focus_child->allocation.y;
+      else
+       compare_y = container->focus_child->allocation.y + container->focus_child->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;
+         
+         if (child != container->focus_child)
            {
-             tmp_list->data = tmp_list->prev->data;
-             tmp_list = tmp_list->prev;
-             j--;
+             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
-           break;
+         
+         tmp_list = next;
        }
 
-      tmp_list->data = child;
+      compare.x = (compare_x1 + compare_x2) / 2;
+      compare.y = container->focus_child->allocation.y + container->focus_child->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;
+  *children = g_list_sort_with_data (*children, up_down_compare, &compare);
 
-  tmp_list = children;
-  while (tmp_list)
-    {
-      child = tmp_list->data;
+  if (direction == GTK_DIR_UP)
+    *children = g_list_reverse (*children);
 
-      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;
+  return gtk_container_focus_move (container, *children, direction);
+}
 
-      tmp_list = tmp_list->next;
-    }
+static gint
+left_right_compare (gconstpointer a,
+                   gconstpointer b,
+                   gpointer      data)
+{
+  const GtkWidget *child1 = a;
+  const GtkWidget *child2 = b;
+  CompareInfo *compare = data;
 
-  if (direction == GTK_DIR_UP)
-    children = g_list_reverse (children);
+  gint x1 = child1->allocation.x + child1->allocation.width / 2;
+  gint x2 = child2->allocation.x + child2->allocation.width / 2;
 
-  return gtk_container_focus_move (container, children, direction);
+  if (x1 == x2)
+    {
+      gint y1 = abs (child1->allocation.y + child1->allocation.height / 2 - compare->y);
+      gint y2 = abs (child2->allocation.y + child2->allocation.height / 2 - compare->y);
+
+      if (compare->x < x1)
+       return (y1 < y2) ? -1 : ((y1 == y2) ? 0 : 1);
+      else
+       return (y1 < y2) ? 1 : ((y1 == y2) ? 0 : -1);
+    }
+  else
+    return (x1 < x2) ? -1 : 1;
 }
 
-static gint
+static gboolean
 gtk_container_focus_left_right (GtkContainer     *container,
-                               GList            *children,
+                               GList           **children,
                                GtkDirectionType  direction)
 {
-  GtkWidget *child;
-  GtkWidget *child2;
+  CompareInfo compare;
   GList *tmp_list;
-  gint dist1, dist2;
-  gint focus_y;
-  gint focus_height;
-  gint length;
-  gint i, j;
 
-  /* 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
-    {
-      focus_height = GTK_WIDGET (container)->allocation.height;
-      if (GTK_WIDGET_NO_WINDOW (container))
-       focus_y = GTK_WIDGET (container)->allocation.y;
-      else
-       focus_y = 0;
-    }
-
-  length = g_list_length (children);
+      gint compare_y1;
+      gint compare_y2;
+      gint compare_x;
+      
+      /* Delete widgets from list that don't match minimum criteria */
 
-  /* sort the children in the x direction */
-  for (i = 1; i < length; i++)
-    {
-      j = i;
-      tmp_list = g_list_nth (children, j);
-      child = tmp_list->data;
+      compare_y1 = container->focus_child->allocation.y;
+      compare_y2 = container->focus_child->allocation.y + container->focus_child->allocation.height;
 
-      while (j > 0)
+      if (direction == GTK_DIR_LEFT)
+       compare_x = container->focus_child->allocation.x;
+      else
+       compare_x = container->focus_child->allocation.x + container->focus_child->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;
+         
+         if (child != container->focus_child)
            {
-             tmp_list->data = tmp_list->prev->data;
-             tmp_list = tmp_list->prev;
-             j--;
+             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
-           break;
+         
+         tmp_list = next;
        }
 
-      tmp_list->data = child;
+      compare.y = (compare_y1 + compare_y2) / 2;
+      compare.x = container->focus_child->allocation.x + container->focus_child->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;
-
-  tmp_list = children;
-  while (tmp_list)
-    {
-      child = tmp_list->data;
-
-      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;
-
-      tmp_list = tmp_list->next;
-    }
+  *children = g_list_sort_with_data (*children, left_right_compare, &compare);
 
   if (direction == GTK_DIR_LEFT)
-    children = g_list_reverse (children);
+    *children = g_list_reverse (*children);
 
-  return gtk_container_focus_move (container, children, direction);
+  return gtk_container_focus_move (container, *children, direction);
 }
 
-static gint
+static gboolean
 gtk_container_focus_move (GtkContainer     *container,
                          GList            *children,
                          GtkDirectionType  direction)
@@ -942,7 +1856,6 @@ gtk_container_focus_move (GtkContainer     *container,
   GtkWidget *child;
 
   focus_child = container->focus_child;
-  container->focus_child = NULL;
 
   while (children)
     {
@@ -958,25 +1871,24 @@ gtk_container_focus_move (GtkContainer     *container,
             {
               focus_child = NULL;
 
-              if (GTK_WIDGET_VISIBLE (child) &&
-                 GTK_IS_CONTAINER (child) &&
-                 !GTK_WIDGET_HAS_FOCUS (child))
+              if (GTK_WIDGET_DRAWABLE (child) &&
+                 GTK_IS_CONTAINER (child))
                if (gtk_container_focus (GTK_CONTAINER (child), direction))
                  return TRUE;
             }
         }
-      else if (GTK_WIDGET_VISIBLE (child))
+      else if (GTK_WIDGET_DRAWABLE (child))
         {
-          if (GTK_WIDGET_CAN_FOCUS (child))
-            {
-              gtk_widget_grab_focus (child);
-              return TRUE;
-            }
-          else if (GTK_IS_CONTAINER (child))
+         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;
+            }
         }
     }
 
@@ -994,38 +1906,155 @@ gtk_container_children_callback (GtkWidget *widget,
   *children = g_list_prepend (*children, widget);
 }
 
+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));
+
+  gtk_object_set_data_by_id_full (GTK_OBJECT (container),
+                                 vadjustment_key_id,
+                                 adjustment,
+                                 (GtkDestroyNotify) gtk_object_unref);
+}
+
+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));
+
+  gtk_object_set_data_by_id_full (GTK_OBJECT (container),
+                                 hadjustment_key_id,
+                                 adjustment,
+                                 (GtkDestroyNotify) gtk_object_unref);
+}
+
+
 static void
 gtk_container_show_all (GtkWidget *widget)
 {
-  GtkContainer *container;
-
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_CONTAINER (widget));
-  container = GTK_CONTAINER (widget);
-
-  /* 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_container_foreach (GTK_CONTAINER (widget),
+                        (GtkCallback) gtk_widget_show_all,
+                        NULL);
   gtk_widget_show (widget);
 }
 
-
 static void
 gtk_container_hide_all (GtkWidget *widget)
 {
-  GtkContainer *container;
-
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_CONTAINER (widget));
-  container = GTK_CONTAINER (widget);
 
-  /* 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);
+  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 (widget != NULL, FALSE);
+  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_foreach (GTK_CONTAINER (widget),
+                            gtk_container_expose_child,
+                            &data);
+    }   
+  
+  return TRUE;
 }
 
+
+/**
+ * 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, 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)
+{
+  GdkEventExpose 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 = *event;
+
+      child_event.region = gtk_widget_region_intersect (child, event->region);
+      if (!gdk_region_empty (child_event.region))
+       {
+         gdk_region_get_clipbox (child_event.region, &child_event.area);
+         gtk_widget_send_expose (child, (GdkEvent *)&child_event);
+       }
+      gdk_region_destroy (child_event.region);
+    }
+}