]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkwidget.c
[ Merges from gtk-1-2 ]
[~andy/gtk] / gtk / gtkwidget.c
index 1cdf74546dae8fe63c176d31f57174dc30d1f700..7900e2ae6e3e3f341ffa42696f8afcdf822dbd37 100644 (file)
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
+/*
+ * Modified by the GTK+ Team and others 1997-1999.  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 "gtkcontainer.h"
@@ -28,7 +36,7 @@
 #include "gtkbindings.h"
 #include "gtkprivate.h"
 #include "gdk/gdk.h"
-#include "gdk/gdkx.h"
+#include "gdkx.h"
 
 
 #define WIDGET_CLASS(w)         GTK_WIDGET_CLASS (GTK_OBJECT (w)->klass)
@@ -52,6 +60,7 @@ enum {
   STYLE_SET,
   ADD_ACCELERATOR,
   REMOVE_ACCELERATOR,
+  GRAB_FOCUS,
   EVENT,
   BUTTON_PRESS_EVENT,
   BUTTON_RELEASE_EVENT,
@@ -72,19 +81,22 @@ enum {
   SELECTION_CLEAR_EVENT,
   SELECTION_REQUEST_EVENT,
   SELECTION_NOTIFY_EVENT,
+  SELECTION_GET,
   SELECTION_RECEIVED,
   PROXIMITY_IN_EVENT,
   PROXIMITY_OUT_EVENT,
-  DRAG_BEGIN_EVENT,
-  DRAG_REQUEST_EVENT,
-  DRAG_END_EVENT,
-  DROP_ENTER_EVENT,
-  DROP_LEAVE_EVENT,
-  DROP_DATA_AVAILABLE_EVENT,
-  OTHER_EVENT,
+  DRAG_BEGIN,
+  DRAG_END,
+  DRAG_DATA_DELETE,
+  DRAG_LEAVE,
+  DRAG_MOTION,
+  DRAG_DROP,
+  DRAG_DATA_GET,
+  DRAG_DATA_RECEIVED,
   CLIENT_EVENT,
   NO_EXPOSE_EVENT,
   VISIBILITY_NOTIFY_EVENT,
+  DEBUG_MSG,
   LAST_SIGNAL
 };
 
@@ -98,77 +110,34 @@ enum {
   ARG_HEIGHT,
   ARG_VISIBLE,
   ARG_SENSITIVE,
+  ARG_APP_PAINTABLE,
   ARG_CAN_FOCUS,
   ARG_HAS_FOCUS,
   ARG_CAN_DEFAULT,
   ARG_HAS_DEFAULT,
+  ARG_RECEIVES_DEFAULT,
+  ARG_COMPOSITE_CHILD,
   ARG_STYLE,
   ARG_EVENTS,
   ARG_EXTENSION_EVENTS
 };
 
-
-typedef void (*GtkWidgetSignal1) (GtkObject *object,
-                                 gpointer   arg1,
-                                 gpointer   data);
-typedef gint (*GtkWidgetSignal2) (GtkObject *object,
-                                 gpointer   arg1,
-                                 gchar      arg2,
-                                 gchar      arg3,
-                                 gpointer   data);
-typedef void (*GtkWidgetSignal3) (GtkObject *object,
-                                 gpointer   arg1,
-                                 gpointer   data);
-typedef gint (*GtkWidgetSignal4) (GtkObject *object,
-                                 gpointer   arg1,
-                                 gpointer   data);
-typedef void (*GtkWidgetSignal5) (GtkObject *object,
-                                 guint      arg1,
-                                 gpointer   data);
-typedef void (*GtkWidgetSignal6) (GtkObject *object,
-                                 GtkObject *arg1,
-                                 gpointer   data);
-typedef void (*GtkWidgetSignal7) (GtkObject *object,
-                                 gpointer   arg1,
-                                 gpointer   data);
-
 typedef        struct  _GtkStateData    GtkStateData;
 
 struct _GtkStateData
 {
   GtkStateType  state;
-  guint                state_restauration : 1;
+  guint                state_restoration : 1;
   guint         parent_sensitive : 1;
+  guint                use_forall : 1;
 };
 
-
-static void gtk_widget_marshal_signal_1 (GtkObject     *object,
-                                        GtkSignalFunc   func,
-                                        gpointer        func_data,
-                                        GtkArg         *args);
-static void gtk_widget_marshal_signal_4 (GtkObject     *object,
-                                        GtkSignalFunc   func,
-                                        gpointer        func_data,
-                                        GtkArg         *args);
-static void gtk_widget_marshal_signal_5 (GtkObject     *object,
-                                        GtkSignalFunc   func,
-                                        gpointer        func_data,
-                                        GtkArg         *args);
-static void gtk_widget_marshal_signal_6 (GtkObject     *object,
-                                        GtkSignalFunc   func,
-                                        gpointer        func_data,
-                                        GtkArg         *args);
-static void gtk_widget_marshal_signal_7 (GtkObject     *object,
-                                        GtkSignalFunc   func,
-                                        gpointer        func_data,
-                                        GtkArg         *args);
-
 static void gtk_widget_class_init               (GtkWidgetClass    *klass);
 static void gtk_widget_init                     (GtkWidget         *widget);
-static void gtk_widget_set_arg                  (GtkWidget         *widget,
+static void gtk_widget_set_arg                  (GtkObject         *object,
                                                  GtkArg            *arg,
                                                  guint              arg_id);
-static void gtk_widget_get_arg                  (GtkWidget         *widget,
+static void gtk_widget_get_arg                  (GtkObject         *object,
                                                  GtkArg            *arg,
                                                  guint              arg_id);
 static void gtk_widget_shutdown                         (GtkObject         *object);
@@ -182,12 +151,20 @@ static void gtk_widget_real_realize                (GtkWidget         *widget);
 static void gtk_widget_real_unrealize           (GtkWidget         *widget);
 static void gtk_widget_real_draw                (GtkWidget         *widget,
                                                  GdkRectangle      *area);
+static void gtk_widget_real_size_request        (GtkWidget         *widget,
+                                                 GtkRequisition    *requisition);
 static void gtk_widget_real_size_allocate       (GtkWidget         *widget,
                                                  GtkAllocation     *allocation);
 static gint gtk_widget_real_key_press_event      (GtkWidget         *widget,
                                                  GdkEventKey       *event);
+static gint gtk_widget_real_key_release_event    (GtkWidget         *widget,
+                                                 GdkEventKey       *event);
 static void gtk_widget_style_set                (GtkWidget         *widget,
                                                  GtkStyle          *previous_style);
+static void gtk_widget_real_grab_focus           (GtkWidget         *focus_widget);
+
+static void  gtk_widget_redraw_queue_remove       (GtkWidget         *widget);
+
      
 static GdkColormap* gtk_widget_peek_colormap (void);
 static GdkVisual*   gtk_widget_peek_visual   (void);
@@ -197,18 +174,13 @@ static void gtk_widget_reparent_container_child  (GtkWidget     *widget,
                                                  gpointer       client_data);
 static void gtk_widget_propagate_state          (GtkWidget     *widget,
                                                  GtkStateData  *data);
-static void gtk_widget_draw_children_recurse    (GtkWidget     *widget,
-                                                 gpointer       client_data);
 static void gtk_widget_set_style_internal       (GtkWidget     *widget,
                                                  GtkStyle      *style,
                                                  gboolean       initial_emission);
 static void gtk_widget_set_style_recurse        (GtkWidget     *widget,
                                                  gpointer       client_data);
 
-extern GtkArg* gtk_object_collect_args (guint  *nargs,
-                                       GtkType (*) (const gchar*),
-                                       va_list  args1,
-                                       va_list  args2);
+static gboolean gtk_widget_is_offscreen           (GtkWidget     *widget);
 
 static GtkWidgetAuxInfo* gtk_widget_aux_info_new     (void);
 static void             gtk_widget_aux_info_destroy (GtkWidgetAuxInfo *aux_info);
@@ -220,12 +192,12 @@ static GMemChunk *aux_info_mem_chunk = NULL;
 
 static GdkColormap *default_colormap = NULL;
 static GdkVisual *default_visual = NULL;
-static GtkStyle *default_style = NULL;
+static GtkStyle *gtk_default_style = NULL;
 
 static GSList *colormap_stack = NULL;
 static GSList *visual_stack = NULL;
 static GSList *style_stack = NULL;
-
+static guint   composite_child_stack = 0;
 static GSList *gtk_widget_redraw_queue = NULL;
 
 static const gchar *aux_info_key = "gtk-aux-info";
@@ -242,7 +214,8 @@ static const gchar *shape_info_key = "gtk-shape-info";
 static const gchar *colormap_key = "gtk-colormap";
 static const gchar *visual_key = "gtk-visual";
 
-
+static const gchar *rc_style_key = "gtk-rc-style";
+static guint        rc_style_key_id = 0;
 
 /*****************************************
  * gtk_widget_get_type:
@@ -259,15 +232,16 @@ gtk_widget_get_type (void)
   
   if (!widget_type)
     {
-      GtkTypeInfo widget_info =
+      static const GtkTypeInfo widget_info =
       {
        "GtkWidget",
        sizeof (GtkWidget),
        sizeof (GtkWidgetClass),
        (GtkClassInitFunc) gtk_widget_class_init,
        (GtkObjectInitFunc) gtk_widget_init,
-       (GtkArgSetFunc) gtk_widget_set_arg,
-       (GtkArgGetFunc) gtk_widget_get_arg,
+        /* reserved_1 */ NULL,
+       /* reserved_2 */ NULL,
+       (GtkClassInitFunc) NULL,
       };
       
       widget_type = gtk_type_unique (gtk_object_get_type (), &widget_info);
@@ -283,6 +257,13 @@ gtk_widget_get_type (void)
  *
  *   results:
  *****************************************/
+#include "stdio.h"
+static void
+gtk_widget_debug_msg (GtkWidget          *widget,
+                     const gchar        *string)
+{
+  fprintf (stderr, "Gtk-DEBUG: %s\n", string);
+}
 
 static void
 gtk_widget_class_init (GtkWidgetClass *klass)
@@ -301,10 +282,13 @@ gtk_widget_class_init (GtkWidgetClass *klass)
   gtk_object_add_arg_type ("GtkWidget::height", GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_HEIGHT);
   gtk_object_add_arg_type ("GtkWidget::visible", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_VISIBLE);
   gtk_object_add_arg_type ("GtkWidget::sensitive", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_SENSITIVE);
+  gtk_object_add_arg_type ("GtkWidget::app_paintable", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_APP_PAINTABLE);
   gtk_object_add_arg_type ("GtkWidget::can_focus", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_CAN_FOCUS);
   gtk_object_add_arg_type ("GtkWidget::has_focus", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_HAS_FOCUS);
   gtk_object_add_arg_type ("GtkWidget::can_default", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_CAN_DEFAULT);
   gtk_object_add_arg_type ("GtkWidget::has_default", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_HAS_DEFAULT);
+  gtk_object_add_arg_type ("GtkWidget::receives_default", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_RECEIVES_DEFAULT);
+  gtk_object_add_arg_type ("GtkWidget::composite_child", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_COMPOSITE_CHILD);
   gtk_object_add_arg_type ("GtkWidget::style", GTK_TYPE_STYLE, GTK_ARG_READWRITE, ARG_STYLE);
   gtk_object_add_arg_type ("GtkWidget::events", GTK_TYPE_GDK_EVENT_MASK, GTK_ARG_READWRITE, ARG_EVENTS);
   gtk_object_add_arg_type ("GtkWidget::extension_events", GTK_TYPE_GDK_EVENT_MASK, GTK_ARG_READWRITE, ARG_EXTENSION_EVENTS);
@@ -314,49 +298,49 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_FIRST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, show),
-                   gtk_signal_default_marshaller,
+                   gtk_marshal_NONE__NONE,
                    GTK_TYPE_NONE, 0);
   widget_signals[HIDE] =
     gtk_signal_new ("hide",
                    GTK_RUN_FIRST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, hide),
-                   gtk_signal_default_marshaller,
+                   gtk_marshal_NONE__NONE,
                    GTK_TYPE_NONE, 0);
   widget_signals[MAP] =
     gtk_signal_new ("map",
                    GTK_RUN_FIRST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, map),
-                   gtk_signal_default_marshaller,
+                   gtk_marshal_NONE__NONE,
                    GTK_TYPE_NONE, 0);
   widget_signals[UNMAP] =
     gtk_signal_new ("unmap",
                    GTK_RUN_FIRST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, unmap),
-                   gtk_signal_default_marshaller,
+                   gtk_marshal_NONE__NONE,
                    GTK_TYPE_NONE, 0);
   widget_signals[REALIZE] =
     gtk_signal_new ("realize",
                    GTK_RUN_FIRST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, realize),
-                   gtk_signal_default_marshaller,
+                   gtk_marshal_NONE__NONE,
                    GTK_TYPE_NONE, 0);
   widget_signals[UNREALIZE] =
     gtk_signal_new ("unrealize",
                    GTK_RUN_FIRST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, unrealize),
-                   gtk_signal_default_marshaller,
+                   gtk_marshal_NONE__NONE,
                    GTK_TYPE_NONE, 0);
   widget_signals[DRAW] =
     gtk_signal_new ("draw",
                    GTK_RUN_FIRST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, draw),
-                   gtk_widget_marshal_signal_1,
+                   gtk_marshal_NONE__POINTER,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_POINTER);
   widget_signals[DRAW_FOCUS] =
@@ -364,21 +348,21 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_FIRST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, draw_focus),
-                   gtk_signal_default_marshaller,
+                   gtk_marshal_NONE__NONE,
                    GTK_TYPE_NONE, 0);
   widget_signals[DRAW_DEFAULT] =
     gtk_signal_new ("draw_default",
                    GTK_RUN_FIRST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, draw_default),
-                   gtk_signal_default_marshaller,
+                   gtk_marshal_NONE__NONE,
                    GTK_TYPE_NONE, 0);
   widget_signals[SIZE_REQUEST] =
     gtk_signal_new ("size_request",
                    GTK_RUN_FIRST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, size_request),
-                   gtk_widget_marshal_signal_1,
+                   gtk_marshal_NONE__POINTER,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_POINTER);
   widget_signals[SIZE_ALLOCATE] =
@@ -386,7 +370,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_FIRST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, size_allocate),
-                   gtk_widget_marshal_signal_1,
+                   gtk_marshal_NONE__POINTER,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_POINTER);
   widget_signals[STATE_CHANGED] =
@@ -394,7 +378,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_FIRST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, state_changed),
-                   gtk_widget_marshal_signal_5,
+                   gtk_marshal_NONE__UINT,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_STATE_TYPE);
   widget_signals[PARENT_SET] =
@@ -402,7 +386,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_FIRST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, parent_set),
-                   gtk_widget_marshal_signal_6,
+                   gtk_marshal_NONE__OBJECT,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_OBJECT);
   widget_signals[STYLE_SET] =
@@ -410,7 +394,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_FIRST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, style_set),
-                   gtk_widget_marshal_signal_7,
+                   gtk_marshal_NONE__POINTER,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_STYLE);
   widget_signals[ADD_ACCELERATOR] =
@@ -419,12 +403,19 @@ gtk_widget_class_init (GtkWidgetClass *klass)
   widget_signals[REMOVE_ACCELERATOR] =
     gtk_accel_group_create_remove (object_class->type, GTK_RUN_LAST,
                                   GTK_SIGNAL_OFFSET (GtkWidgetClass, remove_accelerator));
+  widget_signals[GRAB_FOCUS] =
+    gtk_signal_new ("grab_focus",
+                   GTK_RUN_LAST | GTK_RUN_ACTION,
+                   object_class->type,
+                   GTK_SIGNAL_OFFSET (GtkWidgetClass, grab_focus),
+                   gtk_marshal_NONE__NONE,
+                   GTK_TYPE_NONE, 0);
   widget_signals[EVENT] =
     gtk_signal_new ("event",
                    GTK_RUN_LAST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, event),
-                   gtk_widget_marshal_signal_4,
+                   gtk_marshal_BOOL__POINTER,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[BUTTON_PRESS_EVENT] =
@@ -432,7 +423,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, button_press_event),
-                   gtk_widget_marshal_signal_4,
+                   gtk_marshal_BOOL__POINTER,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[BUTTON_RELEASE_EVENT] =
@@ -440,7 +431,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, button_release_event),
-                   gtk_widget_marshal_signal_4,
+                   gtk_marshal_BOOL__POINTER,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[MOTION_NOTIFY_EVENT] =
@@ -448,7 +439,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, motion_notify_event),
-                   gtk_widget_marshal_signal_4,
+                   gtk_marshal_BOOL__POINTER,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[DELETE_EVENT] =
@@ -456,7 +447,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, delete_event),
-                   gtk_widget_marshal_signal_4,
+                   gtk_marshal_BOOL__POINTER,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[DESTROY_EVENT] =
@@ -464,7 +455,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, destroy_event),
-                   gtk_widget_marshal_signal_4,
+                   gtk_marshal_BOOL__POINTER,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[EXPOSE_EVENT] =
@@ -472,7 +463,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, expose_event),
-                   gtk_widget_marshal_signal_4,
+                   gtk_marshal_BOOL__POINTER,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[KEY_PRESS_EVENT] =
@@ -480,7 +471,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, key_press_event),
-                   gtk_widget_marshal_signal_4,
+                   gtk_marshal_BOOL__POINTER,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[KEY_RELEASE_EVENT] =
@@ -488,7 +479,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, key_release_event),
-                   gtk_widget_marshal_signal_4,
+                   gtk_marshal_BOOL__POINTER,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[ENTER_NOTIFY_EVENT] =
@@ -496,7 +487,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, enter_notify_event),
-                   gtk_widget_marshal_signal_4,
+                   gtk_marshal_BOOL__POINTER,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[LEAVE_NOTIFY_EVENT] =
@@ -504,7 +495,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, leave_notify_event),
-                   gtk_widget_marshal_signal_4,
+                   gtk_marshal_BOOL__POINTER,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[CONFIGURE_EVENT] =
@@ -512,7 +503,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, configure_event),
-                   gtk_widget_marshal_signal_4,
+                   gtk_marshal_BOOL__POINTER,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[FOCUS_IN_EVENT] =
@@ -520,7 +511,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, focus_in_event),
-                   gtk_widget_marshal_signal_4,
+                   gtk_marshal_BOOL__POINTER,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[FOCUS_OUT_EVENT] =
@@ -528,7 +519,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, focus_out_event),
-                   gtk_widget_marshal_signal_4,
+                   gtk_marshal_BOOL__POINTER,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[MAP_EVENT] =
@@ -536,7 +527,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, map_event),
-                   gtk_widget_marshal_signal_4,
+                   gtk_marshal_BOOL__POINTER,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[UNMAP_EVENT] =
@@ -544,7 +535,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, unmap_event),
-                   gtk_widget_marshal_signal_4,
+                   gtk_marshal_BOOL__POINTER,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[PROPERTY_NOTIFY_EVENT] =
@@ -552,7 +543,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, property_notify_event),
-                   gtk_widget_marshal_signal_4,
+                   gtk_marshal_BOOL__POINTER,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[SELECTION_CLEAR_EVENT] =
@@ -560,7 +551,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, selection_clear_event),
-                   gtk_widget_marshal_signal_4,
+                   gtk_marshal_BOOL__POINTER,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[SELECTION_REQUEST_EVENT] =
@@ -568,7 +559,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, selection_request_event),
-                   gtk_widget_marshal_signal_4,
+                   gtk_marshal_BOOL__POINTER,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[SELECTION_NOTIFY_EVENT] =
@@ -576,7 +567,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, selection_notify_event),
-                   gtk_widget_marshal_signal_4,
+                   gtk_marshal_BOOL__POINTER,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[SELECTION_RECEIVED] =
@@ -584,15 +575,26 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, selection_received),
-                   gtk_widget_marshal_signal_1,
-                   GTK_TYPE_NONE, 1,
-                   GTK_TYPE_SELECTION_DATA);
+                   gtk_marshal_NONE__POINTER_UINT,
+                   GTK_TYPE_NONE, 2,
+                   GTK_TYPE_SELECTION_DATA,
+                   GTK_TYPE_UINT);
+  widget_signals[SELECTION_GET] =
+    gtk_signal_new ("selection_get",
+                   GTK_RUN_LAST,
+                   object_class->type,
+                   GTK_SIGNAL_OFFSET (GtkWidgetClass, selection_get),
+                   gtk_marshal_NONE__POINTER_UINT_UINT,
+                   GTK_TYPE_NONE, 3,
+                   GTK_TYPE_SELECTION_DATA,
+                   GTK_TYPE_UINT,
+                   GTK_TYPE_UINT);
   widget_signals[PROXIMITY_IN_EVENT] =
     gtk_signal_new ("proximity_in_event",
                    GTK_RUN_LAST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, proximity_in_event),
-                   gtk_widget_marshal_signal_4,
+                   gtk_marshal_BOOL__POINTER,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[PROXIMITY_OUT_EVENT] =
@@ -600,64 +602,94 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, proximity_out_event),
-                   gtk_widget_marshal_signal_4,
+                   gtk_marshal_BOOL__POINTER,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
-  widget_signals[DRAG_BEGIN_EVENT] =
-    gtk_signal_new ("drag_begin_event",
+  widget_signals[DRAG_LEAVE] =
+    gtk_signal_new ("drag_leave",
                    GTK_RUN_LAST,
                    object_class->type,
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_begin_event),
-                   gtk_widget_marshal_signal_4,
-                   GTK_TYPE_BOOL, 1,
-                   GTK_TYPE_GDK_EVENT);
-  widget_signals[DRAG_REQUEST_EVENT] =
-    gtk_signal_new ("drag_request_event",
+                   GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_leave),
+                   gtk_marshal_NONE__POINTER_UINT,
+                   GTK_TYPE_NONE, 2,
+                   GTK_TYPE_GDK_DRAG_CONTEXT,
+                   GTK_TYPE_UINT);
+  widget_signals[DRAG_BEGIN] =
+    gtk_signal_new ("drag_begin",
                    GTK_RUN_LAST,
                    object_class->type,
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_request_event),
-                   gtk_widget_marshal_signal_4,
-                   GTK_TYPE_BOOL, 1,
-                   GTK_TYPE_GDK_EVENT);
-  widget_signals[DRAG_END_EVENT] =
-    gtk_signal_new ("drag_end_event",
+                   GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_begin),
+                   gtk_marshal_NONE__POINTER,
+                   GTK_TYPE_NONE, 1,
+                   GTK_TYPE_GDK_DRAG_CONTEXT);
+  widget_signals[DRAG_END] =
+    gtk_signal_new ("drag_end",
                    GTK_RUN_LAST,
                    object_class->type,
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_end_event),
-                   gtk_widget_marshal_signal_4,
-                   GTK_TYPE_BOOL, 1,
-                   GTK_TYPE_GDK_EVENT);
-  widget_signals[DROP_ENTER_EVENT] =
-    gtk_signal_new ("drop_enter_event",
+                   GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_end),
+                   gtk_marshal_NONE__POINTER,
+                   GTK_TYPE_NONE, 1,
+                   GTK_TYPE_GDK_DRAG_CONTEXT);
+  widget_signals[DRAG_DATA_DELETE] =
+    gtk_signal_new ("drag_data_delete",
                    GTK_RUN_LAST,
                    object_class->type,
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, drop_enter_event),
-                   gtk_widget_marshal_signal_4,
-                   GTK_TYPE_BOOL, 1,
-                   GTK_TYPE_GDK_EVENT);
-  widget_signals[DROP_LEAVE_EVENT] =
-    gtk_signal_new ("drop_leave_event",
+                   GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_data_delete),
+                   gtk_marshal_NONE__POINTER,
+                   GTK_TYPE_NONE, 1,
+                   GTK_TYPE_GDK_DRAG_CONTEXT);
+  widget_signals[DRAG_MOTION] =
+    gtk_signal_new ("drag_motion",
                    GTK_RUN_LAST,
                    object_class->type,
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, drop_leave_event),
-                   gtk_widget_marshal_signal_4,
-                   GTK_TYPE_BOOL, 1,
-                   GTK_TYPE_GDK_EVENT);
-  widget_signals[DROP_DATA_AVAILABLE_EVENT] =
-    gtk_signal_new ("drop_data_available_event",
+                   GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_motion),
+                   gtk_marshal_BOOL__POINTER_INT_INT_UINT,
+                   GTK_TYPE_BOOL, 4,
+                   GTK_TYPE_GDK_DRAG_CONTEXT,
+                   GTK_TYPE_INT,
+                   GTK_TYPE_INT,
+                   GTK_TYPE_UINT);
+  widget_signals[DRAG_DROP] =
+    gtk_signal_new ("drag_drop",
                    GTK_RUN_LAST,
                    object_class->type,
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass,
-                                      drop_data_available_event),
-                   gtk_widget_marshal_signal_4,
-                   GTK_TYPE_BOOL, 1,
-                   GTK_TYPE_GDK_EVENT);
+                   GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_drop),
+                   gtk_marshal_BOOL__POINTER_INT_INT_UINT,
+                   GTK_TYPE_BOOL, 4,
+                   GTK_TYPE_GDK_DRAG_CONTEXT,
+                   GTK_TYPE_INT,
+                   GTK_TYPE_INT,
+                   GTK_TYPE_UINT);
+  widget_signals[DRAG_DATA_GET] =
+    gtk_signal_new ("drag_data_get",
+                   GTK_RUN_LAST,
+                   object_class->type,
+                   GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_data_get),
+                   gtk_marshal_NONE__POINTER_POINTER_UINT_UINT,
+                   GTK_TYPE_NONE, 4,
+                   GTK_TYPE_GDK_DRAG_CONTEXT,
+                   GTK_TYPE_SELECTION_DATA,
+                   GTK_TYPE_UINT,
+                   GTK_TYPE_UINT);
+  widget_signals[DRAG_DATA_RECEIVED] =
+    gtk_signal_new ("drag_data_received",
+                   GTK_RUN_LAST,
+                   object_class->type,
+                   GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_data_received),
+                   gtk_marshal_NONE__POINTER_INT_INT_POINTER_UINT_UINT,
+                   GTK_TYPE_NONE, 6,
+                   GTK_TYPE_GDK_DRAG_CONTEXT,
+                   GTK_TYPE_INT,
+                   GTK_TYPE_INT,
+                   GTK_TYPE_SELECTION_DATA,
+                   GTK_TYPE_UINT,
+                   GTK_TYPE_UINT);
   widget_signals[VISIBILITY_NOTIFY_EVENT] =
     gtk_signal_new ("visibility_notify_event",
                    GTK_RUN_LAST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, visibility_notify_event),
-                   gtk_widget_marshal_signal_4,
+                   gtk_marshal_BOOL__POINTER,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[CLIENT_EVENT] =
@@ -665,7 +697,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, client_event),
-                   gtk_widget_marshal_signal_4,
+                   gtk_marshal_BOOL__POINTER,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
   widget_signals[NO_EXPOSE_EVENT] =
@@ -673,42 +705,46 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    object_class->type,
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, no_expose_event),
-                   gtk_widget_marshal_signal_4,
+                   gtk_marshal_BOOL__POINTER,
                    GTK_TYPE_BOOL, 1,
                    GTK_TYPE_GDK_EVENT);
-  widget_signals[OTHER_EVENT] =
-    gtk_signal_new ("other_event",
-                   GTK_RUN_LAST,
+  widget_signals[DEBUG_MSG] =
+    gtk_signal_new ("debug_msg",
+                   GTK_RUN_LAST | GTK_RUN_ACTION,
                    object_class->type,
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, other_event),
-                   gtk_widget_marshal_signal_4,
-                   GTK_TYPE_BOOL, 1,
-                   GTK_TYPE_GDK_EVENT);
+                   GTK_SIGNAL_OFFSET (GtkWidgetClass, debug_msg),
+                   gtk_marshal_NONE__STRING,
+                   GTK_TYPE_NONE, 1,
+                   GTK_TYPE_STRING);
 
   gtk_object_class_add_signals (object_class, widget_signals, LAST_SIGNAL);
-  
+
+  object_class->set_arg = gtk_widget_set_arg;
+  object_class->get_arg = gtk_widget_get_arg;
   object_class->shutdown = gtk_widget_shutdown;
   object_class->destroy = gtk_widget_real_destroy;
   object_class->finalize = gtk_widget_finalize;
   
   klass->activate_signal = 0;
+  klass->set_scroll_adjustments_signal = 0;
   klass->show = gtk_widget_real_show;
+  klass->show_all = gtk_widget_show;
   klass->hide = gtk_widget_real_hide;
-  klass->show_all = gtk_widget_real_show;
-  klass->hide_all = gtk_widget_real_hide;
+  klass->hide_all = gtk_widget_hide;
   klass->map = gtk_widget_real_map;
   klass->unmap = gtk_widget_real_unmap;
   klass->realize = gtk_widget_real_realize;
   klass->unrealize = gtk_widget_real_unrealize;
   klass->draw = gtk_widget_real_draw;
   klass->draw_focus = NULL;
-  klass->size_request = NULL;
+  klass->size_request = gtk_widget_real_size_request;
   klass->size_allocate = gtk_widget_real_size_allocate;
   klass->state_changed = NULL;
   klass->parent_set = NULL;
   klass->style_set = gtk_widget_style_set;
   klass->add_accelerator = (void*) gtk_accel_group_handle_add;
   klass->remove_accelerator = (void*) gtk_accel_group_handle_remove;
+  klass->grab_focus = gtk_widget_real_grab_focus;
   klass->event = NULL;
   klass->button_press_event = NULL;
   klass->button_release_event = NULL;
@@ -717,7 +753,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
   klass->destroy_event = NULL;
   klass->expose_event = NULL;
   klass->key_press_event = gtk_widget_real_key_press_event;
-  klass->key_release_event = NULL;
+  klass->key_release_event = gtk_widget_real_key_release_event;
   klass->enter_notify_event = NULL;
   klass->leave_notify_event = NULL;
   klass->configure_event = NULL;
@@ -732,42 +768,32 @@ gtk_widget_class_init (GtkWidgetClass *klass)
   klass->selection_received = NULL;
   klass->proximity_in_event = NULL;
   klass->proximity_out_event = NULL;
-  klass->drag_begin_event = NULL;
-  klass->drag_request_event = NULL;
-  klass->drop_enter_event = NULL;
-  klass->drop_leave_event = NULL;
-  klass->drop_data_available_event = NULL;
-  klass->other_event = NULL;
-  klass->no_expose_event = NULL;
+  klass->drag_begin = NULL;
+  klass->drag_end = NULL;
+  klass->drag_data_delete = NULL;
+  klass->drag_leave = NULL;
+  klass->drag_motion = NULL;
+  klass->drag_drop = NULL;
+  klass->drag_data_received = NULL;
 
-  /* bindings test
-   */
-  {
-    GtkBindingSet *binding_set;
+  klass->no_expose_event = NULL;
 
-    binding_set = gtk_binding_set_by_class (klass);
-    gtk_binding_entry_add_signal (binding_set, '9', GDK_CONTROL_MASK, "hide", 0);
-    gtk_binding_entry_add_signal (binding_set, '9', GDK_CONTROL_MASK, "show", 0);
-  }
+  klass->debug_msg = gtk_widget_debug_msg;
 }
 
-/*****************************************
- * gtk_widget_set_arg:
- *
- *   arguments:
- *
- *   results:
- *****************************************/
-
 static void
-gtk_widget_set_arg (GtkWidget  *widget,
+gtk_widget_set_arg (GtkObject   *object,
                    GtkArg      *arg,
                    guint        arg_id)
 {
-  guint32 saved_flags;
+  GtkWidget *widget;
+
+  widget = GTK_WIDGET (object);
 
   switch (arg_id)
     {
+      guint32 saved_flags;
+      
     case ARG_NAME:
       gtk_widget_set_name (widget, GTK_VALUE_STRING (*arg));
       break;
@@ -781,10 +807,10 @@ gtk_widget_set_arg (GtkWidget     *widget,
       gtk_widget_set_uposition (widget, -2, GTK_VALUE_INT (*arg));
       break;
     case ARG_WIDTH:
-      gtk_widget_set_usize (widget, GTK_VALUE_INT (*arg), -1);
+      gtk_widget_set_usize (widget, GTK_VALUE_INT (*arg), -2);
       break;
     case ARG_HEIGHT:
-      gtk_widget_set_usize (widget, -1, GTK_VALUE_INT (*arg));
+      gtk_widget_set_usize (widget, -2, GTK_VALUE_INT (*arg));
       break;
     case ARG_VISIBLE:
       if (GTK_VALUE_BOOL(*arg))
@@ -795,6 +821,9 @@ gtk_widget_set_arg (GtkWidget       *widget,
     case ARG_SENSITIVE:
       gtk_widget_set_sensitive (widget, GTK_VALUE_BOOL (*arg));
       break;
+    case ARG_APP_PAINTABLE:
+      gtk_widget_set_app_paintable (widget, GTK_VALUE_BOOL (*arg));
+      break;
     case ARG_CAN_FOCUS:
       saved_flags = GTK_WIDGET_FLAGS (widget);
       if (GTK_VALUE_BOOL (*arg))
@@ -821,11 +850,24 @@ gtk_widget_set_arg (GtkWidget     *widget,
       if (GTK_VALUE_BOOL (*arg))
        gtk_widget_grab_default (widget);
       break;
+    case ARG_RECEIVES_DEFAULT:
+      if (GTK_VALUE_BOOL (*arg))
+       GTK_WIDGET_SET_FLAGS (widget, GTK_RECEIVES_DEFAULT);
+      else
+       GTK_WIDGET_UNSET_FLAGS (widget, GTK_RECEIVES_DEFAULT);
+      break;
+    case ARG_COMPOSITE_CHILD:
+      if (GTK_VALUE_BOOL(*arg))
+       GTK_WIDGET_SET_FLAGS (widget, GTK_COMPOSITE_CHILD);
+      else
+       GTK_WIDGET_UNSET_FLAGS (widget, GTK_COMPOSITE_CHILD);
+      break;
     case ARG_STYLE:
       gtk_widget_set_style (widget, (GtkStyle*) GTK_VALUE_BOXED (*arg));
       break;
     case ARG_EVENTS:
-      gtk_widget_set_events (widget, GTK_VALUE_FLAGS (*arg));
+      if (!GTK_WIDGET_REALIZED (widget) && !GTK_WIDGET_NO_WINDOW (widget))
+       gtk_widget_set_events (widget, GTK_VALUE_FLAGS (*arg));
       break;
     case ARG_EXTENSION_EVENTS:
       gtk_widget_set_extension_events (widget, GTK_VALUE_FLAGS (*arg));
@@ -844,16 +886,20 @@ gtk_widget_set_arg (GtkWidget     *widget,
  *****************************************/
 
 static void
-gtk_widget_get_arg (GtkWidget  *widget,
+gtk_widget_get_arg (GtkObject   *object,
                    GtkArg      *arg,
                    guint        arg_id)
 {
-  GtkWidgetAuxInfo *aux_info;
-  gint *eventp;
-  GdkExtensionMode *modep;
+  GtkWidget *widget;
+
+  widget = GTK_WIDGET (object);
   
   switch (arg_id)
     {
+      GtkWidgetAuxInfo *aux_info;
+      gint *eventp;
+      GdkExtensionMode *modep;
+
     case ARG_NAME:
       if (widget->name)
        GTK_VALUE_STRING (*arg) = g_strdup (widget->name);
@@ -866,28 +912,28 @@ gtk_widget_get_arg (GtkWidget     *widget,
     case ARG_X:
       aux_info = gtk_object_get_data_by_id (GTK_OBJECT (widget), aux_info_key_id);
       if (!aux_info)
-       GTK_VALUE_INT (*arg) = -2;
+       GTK_VALUE_INT (*arg) = -1;
       else
        GTK_VALUE_INT (*arg) = aux_info->x;
       break;
     case ARG_Y:
       aux_info = gtk_object_get_data_by_id (GTK_OBJECT (widget), aux_info_key_id);
       if (!aux_info)
-       GTK_VALUE_INT (*arg) = -2;
+       GTK_VALUE_INT (*arg) = -1;
       else
        GTK_VALUE_INT (*arg) = aux_info->y;
       break;
     case ARG_WIDTH:
       aux_info = gtk_object_get_data_by_id (GTK_OBJECT (widget), aux_info_key_id);
       if (!aux_info)
-       GTK_VALUE_INT (*arg) = -2;
+       GTK_VALUE_INT (*arg) = -1;
       else
        GTK_VALUE_INT (*arg) = aux_info->width;
       break;
     case ARG_HEIGHT:
       aux_info = gtk_object_get_data_by_id (GTK_OBJECT (widget), aux_info_key_id);
       if (!aux_info)
-       GTK_VALUE_INT (*arg) = -2;
+       GTK_VALUE_INT (*arg) = -1;
       else
        GTK_VALUE_INT (*arg) = aux_info->height;
       break;
@@ -897,6 +943,9 @@ gtk_widget_get_arg (GtkWidget       *widget,
     case ARG_SENSITIVE:
       GTK_VALUE_BOOL (*arg) = (GTK_WIDGET_SENSITIVE (widget) != FALSE);
       break;
+    case ARG_APP_PAINTABLE:
+      GTK_VALUE_BOOL (*arg) = (GTK_WIDGET_APP_PAINTABLE (widget) != FALSE);
+      break;
     case ARG_CAN_FOCUS:
       GTK_VALUE_BOOL (*arg) = (GTK_WIDGET_CAN_FOCUS (widget) != FALSE);
       break;
@@ -909,6 +958,12 @@ gtk_widget_get_arg (GtkWidget      *widget,
     case ARG_HAS_DEFAULT:
       GTK_VALUE_BOOL (*arg) = (GTK_WIDGET_HAS_DEFAULT (widget) != FALSE);
       break;
+    case ARG_RECEIVES_DEFAULT:
+      GTK_VALUE_BOOL (*arg) = (GTK_WIDGET_RECEIVES_DEFAULT (widget) != FALSE);
+      break;
+    case ARG_COMPOSITE_CHILD:
+      GTK_VALUE_BOOL (*arg) = (GTK_WIDGET_COMPOSITE_CHILD (widget) != FALSE);
+      break;
     case ARG_STYLE:
       GTK_VALUE_BOXED (*arg) = (gpointer) gtk_widget_get_style (widget);
       break;
@@ -959,7 +1014,10 @@ gtk_widget_init (GtkWidget *widget)
   widget->window = NULL;
   widget->parent = NULL;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_SENSITIVE | GTK_PARENT_SENSITIVE);
+  GTK_WIDGET_SET_FLAGS (widget,
+                       GTK_SENSITIVE |
+                       GTK_PARENT_SENSITIVE |
+                       (composite_child_stack ? GTK_COMPOSITE_CHILD : 0));
 
   widget->style = gtk_widget_peek_style ();
   gtk_style_ref (widget->style);
@@ -967,19 +1025,11 @@ gtk_widget_init (GtkWidget *widget)
   colormap = gtk_widget_peek_colormap ();
   visual = gtk_widget_peek_visual ();
   
-  /* XXX - should we ref the colormap and visual, too? */
-
   if (colormap != gtk_widget_get_default_colormap ())
-    {
-      /* gdk_colormap_ref (colormap); */
-      gtk_object_set_data (GTK_OBJECT (widget), colormap_key, colormap);
-    }
+    gtk_widget_set_colormap (widget, colormap);
 
   if (visual != gtk_widget_get_default_visual ())
-    {
-      /* gdk_visual_ref (visual); */
-      gtk_object_set_data (GTK_OBJECT (widget), visual_key, visual);
-    }
+    gtk_widget_set_visual (widget, visual);
 }
 
 /*****************************************
@@ -991,30 +1041,53 @@ gtk_widget_init (GtkWidget *widget)
  *****************************************/
 
 GtkWidget*
-gtk_widget_new (guint type,
+gtk_widget_new (GtkType      widget_type,
+               const gchar *first_arg_name,
                ...)
 {
-  GtkObject *obj;
-  GtkArg *args;
-  guint nargs;
-  va_list args1;
-  va_list args2;
+  GtkObject *object;
+  va_list var_args;
+  GSList *arg_list = NULL;
+  GSList *info_list = NULL;
+  gchar *error;
   
-  g_return_val_if_fail (gtk_type_is_a (type, gtk_widget_get_type ()), NULL);
+  g_return_val_if_fail (gtk_type_is_a (widget_type, GTK_TYPE_WIDGET), NULL);
   
-  obj = gtk_type_new (type);
+  object = gtk_type_new (widget_type);
   
-  va_start (args1, type);
-  va_start (args2, type);
+  va_start (var_args, first_arg_name);
+  error = gtk_object_args_collect (GTK_OBJECT_TYPE (object),
+                                  &arg_list,
+                                  &info_list,
+                                  first_arg_name,
+                                  var_args);
+  va_end (var_args);
   
-  args = gtk_object_collect_args (&nargs, gtk_object_get_arg_type, args1, args2);
-  gtk_object_setv (obj, nargs, args);
-  g_free (args);
-  
-  va_end (args1);
-  va_end (args2);
+  if (error)
+    {
+      g_warning ("gtk_widget_new(): %s", error);
+      g_free (error);
+    }
+  else
+    {
+      GSList *slist_arg;
+      GSList *slist_info;
+      
+      slist_arg = arg_list;
+      slist_info = info_list;
+      while (slist_arg)
+       {
+         gtk_object_arg_set (object, slist_arg->data, slist_info->data);
+         slist_arg = slist_arg->next;
+         slist_info = slist_info->next;
+       }
+      gtk_args_collect_cleanup (arg_list, info_list);
+    }
   
-  return GTK_WIDGET (obj);
+  if (!GTK_OBJECT_CONSTRUCTED (object))
+    gtk_object_default_construct (object);
+
+  return GTK_WIDGET (object);
 }
 
 /*****************************************
@@ -1026,11 +1099,11 @@ gtk_widget_new (guint type,
  *****************************************/
 
 GtkWidget*
-gtk_widget_newv (guint  type,
+gtk_widget_newv (GtkType type,
                 guint   nargs,
                 GtkArg *args)
 {
-  g_return_val_if_fail (gtk_type_is_a (type, gtk_widget_get_type ()), NULL);
+  g_return_val_if_fail (gtk_type_is_a (type, GTK_TYPE_WIDGET), NULL);
   
   return GTK_WIDGET (gtk_object_newv (type, nargs, args));
 }
@@ -1048,6 +1121,7 @@ gtk_widget_get (GtkWidget *widget,
                GtkArg          *arg)
 {
   g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (arg != NULL);
   
   gtk_object_getv (GTK_OBJECT (widget), 1, arg);
@@ -1066,6 +1140,9 @@ gtk_widget_getv (GtkWidget        *widget,
                 guint           nargs,
                 GtkArg         *args)
 {
+  g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
   gtk_object_getv (GTK_OBJECT (widget), nargs, args);
 }
 
@@ -1078,25 +1155,49 @@ gtk_widget_getv (GtkWidget      *widget,
  *****************************************/
 
 void
-gtk_widget_set (GtkWidget *widget,
+gtk_widget_set (GtkWidget   *widget,
+               const gchar *first_arg_name,
                ...)
 {
-  GtkArg *args;
-  guint nargs;
-  va_list args1;
-  va_list args2;
-  
+  GtkObject *object;
+  va_list var_args;
+  GSList *arg_list = NULL;
+  GSList *info_list = NULL;
+  gchar *error;
+
   g_return_if_fail (widget != NULL);
-  
-  va_start (args1, widget);
-  va_start (args2, widget);
-  
-  args = gtk_object_collect_args (&nargs, gtk_object_get_arg_type, args1, args2);
-  gtk_object_setv (GTK_OBJECT (widget), nargs, args);
-  g_free (args);
-  
-  va_end (args1);
-  va_end (args2);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  object = GTK_OBJECT (widget);
+
+  va_start (var_args, first_arg_name);
+  error = gtk_object_args_collect (GTK_OBJECT_TYPE (object),
+                                  &arg_list,
+                                  &info_list,
+                                  first_arg_name,
+                                  var_args);
+  va_end (var_args);
+
+  if (error)
+    {
+      g_warning ("gtk_widget_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_object_arg_set (object, slist_arg->data, slist_info->data);
+         slist_arg = slist_arg->next;
+         slist_info = slist_info->next;
+       }
+      gtk_args_collect_cleanup (arg_list, info_list);
+    }
 }
 
 /*****************************************
@@ -1112,18 +1213,30 @@ gtk_widget_setv (GtkWidget *widget,
                 guint      nargs,
                 GtkArg    *args)
 {
+  g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
   gtk_object_setv (GTK_OBJECT (widget), nargs, args);
 }
 
-/*****************************************
- * gtk_widget_unparent:
- *   do any cleanup necessary necessary
- *   for setting parent = NULL.
- *
- *   arguments:
- *
- *   results:
- *****************************************/
+static inline void        
+gtk_widget_queue_clear_child (GtkWidget *widget)
+{
+  GtkWidget *parent;
+
+  /* We check for GTK_WIDGET_IS_OFFSCREEN (widget), 
+   * and queue_clear_area(parent...) will check the rest of
+   * way up the tree with gtk_widget_is_offscreen (parent)
+   */
+  parent = widget->parent;
+  if (parent && GTK_WIDGET_DRAWABLE (parent) &&
+      !GTK_WIDGET_IS_OFFSCREEN (widget))
+    gtk_widget_queue_clear_area (parent,
+                                widget->allocation.x,
+                                widget->allocation.y,
+                                widget->allocation.width,
+                                widget->allocation.height);
+}
 
 void
 gtk_widget_unparent (GtkWidget *widget)
@@ -1132,6 +1245,7 @@ gtk_widget_unparent (GtkWidget *widget)
   GtkWidget *old_parent;
   
   g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
   if (widget->parent == NULL)
     return;
   
@@ -1142,6 +1256,7 @@ gtk_widget_unparent (GtkWidget *widget)
    * should eventually move into some gtk_window_unparent_branch() or
    * similar function.
    */
+  
   toplevel = gtk_widget_get_toplevel (widget);
   if (GTK_CONTAINER (widget->parent)->focus_child == widget)
     {
@@ -1173,6 +1288,9 @@ gtk_widget_unparent (GtkWidget *widget)
        gtk_window_set_default (GTK_WINDOW (toplevel), NULL);
     }
 
+  if (GTK_WIDGET_REDRAW_PENDING (widget))
+    gtk_widget_redraw_queue_remove (widget);
+
   if (GTK_IS_RESIZE_CONTAINER (widget))
     gtk_container_clear_resize_widgets (GTK_CONTAINER (widget));
   
@@ -1240,15 +1358,8 @@ gtk_widget_unparent (GtkWidget *widget)
 
       toplevel = toplevel->parent;
     }
-  
-  if (widget->window &&
-      GTK_WIDGET_NO_WINDOW (widget) &&
-      GTK_WIDGET_DRAWABLE (widget))
-    gdk_window_clear_area (widget->window,
-                          widget->allocation.x,
-                          widget->allocation.y,
-                          widget->allocation.width,
-                          widget->allocation.height);
+
+  gtk_widget_queue_clear_child (widget);
 
   /* Reset the width and height here, to force reallocation if we
    * get added back to a new parent. This won't work if our new
@@ -1282,7 +1393,8 @@ gtk_widget_destroy (GtkWidget *widget)
 {
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
-  
+  g_return_if_fail (GTK_OBJECT_CONSTRUCTED (widget));
+
   gtk_object_destroy ((GtkObject*) widget);
 }
 
@@ -1320,11 +1432,29 @@ void
 gtk_widget_show (GtkWidget *widget)
 {
   g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
   
   if (!GTK_WIDGET_VISIBLE (widget))
-    gtk_signal_emit (GTK_OBJECT (widget), widget_signals[SHOW]);
+    {
+      gtk_widget_queue_resize (widget);
+      gtk_signal_emit (GTK_OBJECT (widget), widget_signals[SHOW]);
+    }
 }
 
+static void
+gtk_widget_real_show (GtkWidget *widget)
+{
+  g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+  
+  if (!GTK_WIDGET_VISIBLE (widget))
+    {
+      GTK_WIDGET_SET_FLAGS (widget, GTK_VISIBLE);
+
+      if (widget->parent && GTK_WIDGET_MAPPED (widget->parent))
+       gtk_widget_map (widget);
+    }
+}
 
 /*************************************************************
  * gtk_widget_show_now:
@@ -1350,6 +1480,9 @@ gtk_widget_show_now (GtkWidget *widget)
 {
   gint flag = FALSE;
   
+  g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
   /* make sure we will get event */
   if (!GTK_WIDGET_MAPPED (widget) &&
       GTK_WIDGET_TOPLEVEL (widget))
@@ -1382,7 +1515,25 @@ gtk_widget_hide (GtkWidget *widget)
   g_return_if_fail (GTK_IS_WIDGET (widget));
   
   if (GTK_WIDGET_VISIBLE (widget))
-    gtk_signal_emit (GTK_OBJECT (widget), widget_signals[HIDE]);
+    {
+      gtk_signal_emit (GTK_OBJECT (widget), widget_signals[HIDE]);
+      gtk_widget_queue_resize (widget);
+    }
+}
+
+static void
+gtk_widget_real_hide (GtkWidget *widget)
+{
+  g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+  
+  if (GTK_WIDGET_VISIBLE (widget))
+    {
+      GTK_WIDGET_UNSET_FLAGS (widget, GTK_VISIBLE);
+      
+      if (GTK_WIDGET_MAPPED (widget))
+       gtk_widget_unmap (widget);
+    }
 }
 
 gint
@@ -1396,54 +1547,32 @@ gtk_widget_hide_on_delete (GtkWidget      *widget)
   return TRUE;
 }
 
-/*****************************************
- * gtk_widget_show_all:
- *
- *   Shows the widget and all children.
- *
- *   Container classes overwrite
- *   show_all and hide_all to call
- *   show_all (hide_all) on both themselves
- *   and on their child widgets.
- *
- *   arguments:
- *
- *   results:
- *****************************************/
-
 void
 gtk_widget_show_all (GtkWidget *widget)
 {
-  GtkWidgetClass *widget_class;
-  
+  GtkWidgetClass *class;
+
   g_return_if_fail (widget != NULL);
-  
-  /* show_all shouldn't be invoked through a signal,
-     because in this case it would be quite slow - there would
-     be a show and show_all signal emitted for every child widget.
-   */
-  widget_class = GTK_WIDGET_CLASS(GTK_OBJECT(widget)->klass);
-  widget_class->show_all (widget);
-}
+  g_return_if_fail (GTK_IS_WIDGET (widget));
 
-/*****************************************
- * gtk_widget_hide_all:
- *
- *   Hides the widget and all children.
- *   See gtk_widget_show_all.
- *
- *   arguments:
- *
- *   results:
- *****************************************/
+  class = GTK_WIDGET_CLASS (GTK_OBJECT (widget)->klass);
+
+  if (class->show_all)
+    class->show_all (widget);
+}
 
 void
 gtk_widget_hide_all (GtkWidget *widget)
 {
+  GtkWidgetClass *class;
+
   g_return_if_fail (widget != NULL);
-  g_assert (widget->parent);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  class = GTK_WIDGET_CLASS (GTK_OBJECT (widget)->klass);
 
-  GTK_WIDGET_CLASS (GTK_OBJECT (widget)->klass)->hide_all (widget);
+  if (class->hide_all)
+    class->hide_all (widget);
 }
 
 /*****************************************
@@ -1458,13 +1587,17 @@ void
 gtk_widget_map (GtkWidget *widget)
 {
   g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
   
   if (!GTK_WIDGET_MAPPED (widget))
     {
       if (!GTK_WIDGET_REALIZED (widget))
        gtk_widget_realize (widget);
-      
+
       gtk_signal_emit (GTK_OBJECT (widget), widget_signals[MAP]);
+
+      if (GTK_WIDGET_NO_WINDOW (widget))
+       gtk_widget_queue_draw (widget);
     }
 }
 
@@ -1480,9 +1613,14 @@ void
 gtk_widget_unmap (GtkWidget *widget)
 {
   g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
   
   if (GTK_WIDGET_MAPPED (widget))
-    gtk_signal_emit (GTK_OBJECT (widget), widget_signals[UNMAP]);
+    {
+      if (GTK_WIDGET_NO_WINDOW (widget))
+       gtk_widget_queue_clear_child (widget);
+      gtk_signal_emit (GTK_OBJECT (widget), widget_signals[UNMAP]);
+    }
 }
 
 /*****************************************
@@ -1501,12 +1639,13 @@ gtk_widget_realize (GtkWidget *widget)
   GtkWidgetShapeInfo *shape_info;
   
   g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
   
   if (!GTK_WIDGET_REALIZED (widget))
     {
       /*
        if (GTK_IS_CONTAINER (widget) && !GTK_WIDGET_NO_WINDOW (widget))
-         g_print ("%s\n", gtk_type_name (GTK_WIDGET_TYPE (widget)));
+         g_message ("gtk_widget_realize(%s)", gtk_type_name (GTK_WIDGET_TYPE (widget)));
       */
       
       if (widget->parent && !GTK_WIDGET_REALIZED (widget->parent))
@@ -1551,12 +1690,10 @@ void
 gtk_widget_unrealize (GtkWidget *widget)
 {
   g_return_if_fail (widget != NULL);
-  
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
   if (GTK_WIDGET_REDRAW_PENDING (widget))
-    {
-      gtk_widget_redraw_queue = g_slist_remove (gtk_widget_redraw_queue, widget);
-      GTK_PRIVATE_UNSET_FLAG (widget, GTK_REDRAW_PENDING);
-    }
+    gtk_widget_redraw_queue_remove (widget);
   
   if (GTK_WIDGET_HAS_SHAPE_MASK (widget))
     gtk_widget_shape_combine_mask (widget, NULL, -1, -1);
@@ -1576,59 +1713,561 @@ gtk_widget_unrealize (GtkWidget *widget)
  *   results:
  *****************************************/
 
-static gint
-gtk_widget_idle_draw (gpointer data)
-{
-  while (gtk_widget_redraw_queue)
-    gtk_widget_draw (gtk_widget_redraw_queue->data, NULL);
+typedef struct _GtkDrawData GtkDrawData;
+struct _GtkDrawData {
+  GdkRectangle rect;
+  GdkWindow *window;
+};
 
-  return FALSE;
-}
+static GMemChunk   *draw_data_mem_chunk = NULL;
+static GSList      *draw_data_free_list = NULL;
+static const gchar *draw_data_key  = "gtk-draw-data";
+static GQuark       draw_data_key_id = 0;
+static const gchar *draw_data_tmp_key  = "gtk-draw-data-tmp";
+static GQuark       draw_data_tmp_key_id = 0;
 
-void
-gtk_widget_queue_draw (GtkWidget *widget)
+static gint gtk_widget_idle_draw (gpointer data);
+
+static void
+gtk_widget_queue_draw_data (GtkWidget *widget,
+                           gint       x,
+                           gint       y,
+                           gint       width,
+                           gint       height,
+                           GdkWindow *window)
 {
-  GtkWidget *parent;
+  GSList      *node;
+  GtkDrawData *data;
   
   g_return_if_fail (widget != NULL);
-  
-  if (GTK_WIDGET_DRAWABLE (widget))
+
+  if ((width != 0) && (height != 0) && GTK_WIDGET_DRAWABLE (widget))
     {
-      /* We queue the redraw if:
-       *  a) the widget is not already queued for redraw and
-       *  b) non of the widgets ancestors are queued for redraw.
-       */
-      parent = widget;
-      while (parent)
+      if (!draw_data_key_id)
+       draw_data_key_id = g_quark_from_static_string (draw_data_key);
+      
+      if (draw_data_free_list)
+       {
+         node = draw_data_free_list;
+         data = node->data;
+         draw_data_free_list = draw_data_free_list->next;
+       }
+      else
+       {
+         if (!draw_data_mem_chunk)
+           draw_data_mem_chunk = g_mem_chunk_create (GtkDrawData, 64,
+                                                     G_ALLOC_ONLY);
+         data = g_chunk_new (GtkDrawData, draw_data_mem_chunk);
+         node = g_slist_alloc();
+         node->data = data;
+       }
+
+      data->rect.x = x;
+      data->rect.y = y;
+
+      if ((width < 0) || (height < 0))
+       {
+         data->rect.width = 0;
+         data->rect.height = 0;
+       }
+      else
        {
-         if (GTK_WIDGET_REDRAW_PENDING (parent))
-           return;
-         parent = parent->parent;
+         data->rect.width = width;
+         data->rect.height = height;
        }
+      data->window = window;
       
-      GTK_PRIVATE_SET_FLAG (widget, GTK_REDRAW_PENDING);
-      if (gtk_widget_redraw_queue == NULL)
-       gtk_idle_add_priority (GTK_PRIORITY_INTERNAL,
-                              gtk_widget_idle_draw,
-                              NULL);
+      if ((width < 0) || (height < 0))
+       {
+         GSList *draw_data_list = 
+           gtk_object_get_data_by_id (GTK_OBJECT (widget),
+                                      draw_data_key_id);
+         if (draw_data_list)
+           draw_data_free_list = g_slist_concat (draw_data_list,
+                                                 draw_data_free_list);
+         node->next = NULL;
+       }
+      else
+       node->next = gtk_object_get_data_by_id (GTK_OBJECT (widget),
+                                               draw_data_key_id);
 
-      gtk_widget_redraw_queue = g_slist_prepend (gtk_widget_redraw_queue, widget);
+      if (!GTK_WIDGET_REDRAW_PENDING (widget))
+       {
+         GTK_PRIVATE_SET_FLAG (widget, GTK_REDRAW_PENDING);
+         if (gtk_widget_redraw_queue == NULL)
+           gtk_idle_add_priority (GTK_PRIORITY_REDRAW,
+                                  gtk_widget_idle_draw,
+                                  NULL);
+         gtk_widget_redraw_queue = g_slist_prepend (gtk_widget_redraw_queue, widget);
+       }
+
+      gtk_object_set_data_by_id (GTK_OBJECT (widget), draw_data_key_id, node);
     }
 }
 
-void
-gtk_widget_queue_resize (GtkWidget *widget)
+void      
+gtk_widget_queue_draw_area (GtkWidget *widget,
+                           gint       x,
+                           gint       y,
+                           gint       width,
+                           gint       height)
 {
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
-  if (GTK_IS_RESIZE_CONTAINER (widget))
-    gtk_container_clear_resize_widgets (GTK_CONTAINER (widget));
-
-  if (widget->parent)
-    gtk_container_queue_resize (GTK_CONTAINER (widget->parent));
-  else if (GTK_WIDGET_TOPLEVEL (widget))
-    gtk_container_queue_resize (GTK_CONTAINER (widget));
+  if (widget->window && gdk_window_is_viewable (widget->window) &&
+      !gtk_widget_is_offscreen (widget))
+    gtk_widget_queue_draw_data (widget, x, y, width, height, NULL);
+}
+
+void      
+gtk_widget_queue_draw (GtkWidget *widget)
+{
+  g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  if (widget->window && gdk_window_is_viewable (widget->window) &&
+      !gtk_widget_is_offscreen (widget))
+    gtk_widget_queue_draw_data (widget, 0, 0, -1, -1, NULL);
+}
+
+void      
+gtk_widget_queue_clear_area (GtkWidget *widget,
+                            gint       x,
+                            gint       y,
+                            gint       width,
+                            gint       height)
+{
+  GtkWidget *parent;
+  
+  g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  if (!(widget->window && gdk_window_is_viewable (widget->window)) ||
+      gtk_widget_is_offscreen (widget))
+    return;
+
+  /* Find the correct widget */
+
+  if (GTK_WIDGET_NO_WINDOW (widget))
+    {
+      parent = widget;
+      while (parent && GTK_WIDGET_NO_WINDOW (parent))
+       parent = parent->parent;
+      
+      if (parent)
+       gtk_widget_queue_draw_data (parent, x, y, width, height, widget->window);
+    }
+  else
+    {
+      if (widget->parent)
+       {
+         gint wx, wy, wwidth, wheight;
+         /* Translate widget relative to window-relative */
+         
+         gdk_window_get_position (widget->window, &wx, &wy);
+         x -= wx - widget->allocation.x;
+         y -= wy - widget->allocation.y;
+         
+         gdk_window_get_size (widget->window, &wwidth, &wheight);
+         
+         if (x < 0)
+           {
+             width += x;  x = 0;
+           }
+         if (y < 0)
+           {
+             height += y; y = 0;
+           }
+         if (x + width > wwidth)
+           width = wwidth - x;
+         if (y + height > wheight)
+           height = wheight - y;
+       }
+
+      gtk_widget_queue_draw_data (widget, x, y, width, height, widget->window);
+    }
+}
+
+static void
+gtk_widget_redraw_queue_remove (GtkWidget *widget)
+{
+  GSList *draw_data_list;
+  GSList *tmp_list;
+
+  g_return_if_fail (GTK_WIDGET_REDRAW_PENDING (widget));
+
+  gtk_widget_redraw_queue = g_slist_remove (gtk_widget_redraw_queue, widget);
+
+  draw_data_list = gtk_object_get_data_by_id (GTK_OBJECT (widget),
+                                             draw_data_key_id);
+  tmp_list = g_slist_last (draw_data_list);
+  if (tmp_list)
+    {
+      tmp_list->next = draw_data_free_list;
+      draw_data_free_list = draw_data_list;
+    }
+
+  gtk_object_set_data_by_id (GTK_OBJECT (widget),
+                            draw_data_key_id,
+                            NULL);
+  
+  GTK_PRIVATE_UNSET_FLAG (widget, GTK_REDRAW_PENDING);
+}
+
+void      
+gtk_widget_queue_clear (GtkWidget *widget)
+{
+  g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  if (widget->allocation.width || widget->allocation.height)
+    {
+      if (GTK_WIDGET_NO_WINDOW (widget))
+       gtk_widget_queue_clear_area (widget, widget->allocation.x,
+                                    widget->allocation.y,
+                                    widget->allocation.width, 
+                                    widget->allocation.height);
+      else
+       gtk_widget_queue_clear_area (widget, 0, 0, 
+                                    widget->allocation.width, 
+                                    widget->allocation.height);
+    }
+}
+
+static gint
+gtk_widget_draw_data_combine (GtkDrawData *parent, GtkDrawData *child)
+{
+  gint parent_x2, parent_y2;
+  gint child_x2, child_y2;
+
+  /* Check for intersection */
+
+  parent_x2 = parent->rect.x + parent->rect.width;
+  child_x2 = child->rect.x + child->rect.width;
+  parent_y2 = parent->rect.y + parent->rect.height;
+  child_y2 = child->rect.y + child->rect.height;
+
+  if ((child->rect.x > parent_x2) || (parent->rect.x > child_x2) ||
+      (child->rect.y > parent_y2) || (parent->rect.y > child_y2))
+    return FALSE;
+  else
+    {
+      parent->rect.x = MIN (parent->rect.x, child->rect.x);
+      parent->rect.y = MIN (parent->rect.y, child->rect.y);
+      parent->rect.width = MAX (parent_x2, child_x2) - parent->rect.x;
+      parent->rect.height = MAX (parent_y2, child_y2) - parent->rect.y;
+    }
+
+  return TRUE;
+}
+
+/* Take a rectangle with respect to window, and translate it
+ * to coordinates relative to widget's allocation, clipping through
+ * intermediate windows. Returns whether translation failed. If the
+ * translation failed, we have something like a handlebox, where
+ * the child widget's GdkWindow is not a child of the parents GdkWindow.
+ */
+static gboolean
+gtk_widget_clip_rect (GtkWidget *widget,
+                     GdkWindow *window,
+                     GdkRectangle *rect,
+                     gint      *x_offset,
+                     gint      *y_offset)
+{
+  gint x,y, width, height;
+
+  while (window && (window != widget->window))
+    {
+      gdk_window_get_position (window, &x, &y);
+      rect->x += x;
+      if (x_offset)
+       *x_offset += x;
+      rect->y += y;
+      if (y_offset)
+       *y_offset += y;
+      
+      window = gdk_window_get_parent (window);
+      if (!window)
+       return FALSE;
+
+      gdk_window_get_size (window, &width, &height);
+      
+      if (rect->x < 0)
+       {
+         rect->width = (rect->width > -rect->x) ? rect->width + rect->x : 0;
+         rect->x = 0;
+       }
+      if (rect->y < 0)
+       {
+         rect->height = (rect->height > -rect->y) ? rect->width + rect->y : 0;
+         rect->y = 0;
+       }
+      if (rect->x + rect->width > width)
+       rect->width = (width > rect->x) ? width - rect->x : 0;
+      if (rect->y + rect->height > height)
+       rect->height = (height > rect->y) ? height - rect->y : 0;
+    }
+
+  if (!window)
+    return FALSE;
+
+  if (!GTK_WIDGET_NO_WINDOW (widget))
+    {
+      if (gdk_window_get_toplevel (window) != window)
+       {
+         gdk_window_get_position (window, &x, &y);
+         rect->x += x - widget->allocation.x;
+         if (x_offset)
+           *x_offset += x - widget->allocation.x;
+         rect->y += y - widget->allocation.y;
+         if (y_offset)
+           *y_offset += y - widget->allocation.y;
+       }
+    }
+
+  return TRUE;
+}
+
+static gint
+gtk_widget_idle_draw (gpointer cb_data)
+{
+  GSList *widget_list;
+  GSList *old_queue;
+  GSList *draw_data_list;
+  GtkWidget *widget;
+  
+  if (!draw_data_tmp_key_id)
+    draw_data_tmp_key_id = g_quark_from_static_string (draw_data_tmp_key);
+      
+  GDK_THREADS_ENTER ();
+
+  old_queue = gtk_widget_redraw_queue;
+  gtk_widget_redraw_queue = NULL;
+  
+  /* Translate all draw requests to be allocation-relative.
+   * At the same time, move all the data out of the way,
+   * so when we get down to the draw step, we can queue
+   * more information for "next time", if the application
+   * is that foolhardy.
+   */
+  widget_list = old_queue;
+  
+  while (widget_list)
+    {
+      widget = widget_list->data;
+      draw_data_list = gtk_object_get_data_by_id (GTK_OBJECT (widget),
+                                                 draw_data_key_id);
+      gtk_object_set_data_by_id (GTK_OBJECT (widget),
+                                draw_data_key_id,
+                                NULL);
+      gtk_object_set_data_by_id (GTK_OBJECT (widget),
+                                draw_data_tmp_key_id,
+                                draw_data_list);
+     
+      /* XXX: Since we are unsetting this flag here, further
+       * down the only way we can check if a redraw is queued
+       * on a given widget is by calling gtk_object_get_data.
+       * for speed purposes we might well want a private
+       * flag GTK_REDRAW_PROCESSING or something.
+       */
+      GTK_PRIVATE_UNSET_FLAG (widget, GTK_REDRAW_PENDING);
+
+      while (draw_data_list)
+       {
+         gboolean full_allocation = FALSE;
+         GtkDrawData *data = draw_data_list->data;
+
+         if (data->window)
+           {
+             /* If the translation fails, we have a handlebox,
+              * so redraw the whole widget. Could be done better?
+              */
+             full_allocation = !gtk_widget_clip_rect (widget, 
+                                                      data->window, 
+                                                      &data->rect,
+                                                      NULL, NULL);
+             data->window = NULL;
+           }
+         else
+           {
+             if ((data->rect.width == 0) && (data->rect.height == 0))
+               {
+                 if (GTK_WIDGET_NO_WINDOW (widget))
+                   {
+                     data->rect.x = widget->allocation.x;
+                     data->rect.y = widget->allocation.y;
+                   }
+                 else
+                   {
+                     data->rect.x = 0;
+                     data->rect.y = 0;
+                   }
+                 data->rect.width = widget->allocation.width;
+                 data->rect.height = widget->allocation.height;
+               }
+           }
+
+         draw_data_list = draw_data_list->next;
+       }
+
+      widget_list = widget_list->next;
+    }
+
+  /* Coalesce redraws.
+   */
+  widget_list = old_queue;
+  while (widget_list)
+    {
+      GSList *prev_node = NULL;
+      widget = widget_list->data;
+      draw_data_list = gtk_object_get_data_by_id (GTK_OBJECT (widget),
+                                                 draw_data_tmp_key_id);
+
+      while (draw_data_list)
+       {
+         gint x_offset, y_offset;
+         GtkDrawData *data = draw_data_list->data;
+         GSList *parent_list = draw_data_list->next;
+         GtkWidget *parent;
+         GdkWindow *window;
+
+         x_offset = 0;
+         y_offset = 0;
+         
+         parent = widget;
+         while (parent)
+           {
+             while (parent_list)
+               {
+                 if (gtk_widget_draw_data_combine (parent_list->data, data))
+                   {
+                     GSList *tmp;
+                     if (prev_node)
+                       prev_node->next = draw_data_list->next;
+                     else
+                       gtk_object_set_data_by_id (GTK_OBJECT (widget),
+                                                  draw_data_tmp_key_id,
+                                                  draw_data_list->next);
+
+                     tmp = draw_data_list->next;
+                     draw_data_list->next = draw_data_free_list;
+                     draw_data_free_list = draw_data_list;
+                     draw_data_list = tmp;
+
+                     goto next_rect;
+                   }
+                 
+                 parent_list = parent_list->next;
+               }
+
+             window = parent->window;
+
+             if (parent->parent && parent->parent->window != window)
+               {
+                 if (!GTK_WIDGET_NO_WINDOW (parent))
+                   {
+                     gint x, y;
+                     gdk_window_get_position (window, &x, &y);
+                     data->rect.x -= x - parent->allocation.x;
+                     x_offset -=  x - parent->allocation.x;
+                     data->rect.y -= y - parent->allocation.y;
+                     y_offset -=  y - parent->allocation.y;
+                   }
+                 /* If we can't translate the rectangle, stop trying to
+                  * merge. (This occurs for a handlebox)
+                  */
+                 if (!gtk_widget_clip_rect (parent->parent, window, &data->rect,
+                                            &x_offset, &y_offset))
+                   parent = NULL;
+               }
+
+             if (parent)
+               parent = parent->parent;
+
+             if (parent)
+               parent_list = gtk_object_get_data_by_id (GTK_OBJECT (parent),
+                                                        draw_data_tmp_key_id);
+             else
+               parent_list = NULL;
+           }
+
+         /* OK, this rectangle stays around. But take advantage
+          * of the work we've done to clip it to the visible area -
+          * rect.width/height have already been appropriately 
+          * decreased
+          */
+         data->rect.x -= x_offset;
+         data->rect.y -= y_offset;
+
+
+         prev_node = draw_data_list;
+
+         draw_data_list = draw_data_list->next;
+       next_rect:
+         continue;
+       }
+      widget_list = widget_list->next;
+    }
+
+  /* Process the draws */
+  
+  widget_list = old_queue;
+
+  while (widget_list)
+    {
+      GSList *tmp_list;
+      
+      widget = widget_list->data;
+      draw_data_list = gtk_object_get_data_by_id (GTK_OBJECT (widget),
+                                                 draw_data_tmp_key_id);
+      gtk_object_set_data_by_id (GTK_OBJECT (widget),
+                                draw_data_tmp_key_id,
+                                NULL);
+
+      tmp_list = draw_data_list;
+      while (tmp_list)
+       {
+         GtkDrawData *data = tmp_list->data;
+         if ((data->rect.width != 0) || (data->rect.height != 0))
+           gtk_widget_draw (widget, &data->rect);
+         
+         if (tmp_list->next)
+           tmp_list = tmp_list->next;
+         else
+           {
+             tmp_list->next = draw_data_free_list;
+             draw_data_free_list = draw_data_list;
+             break;
+           }
+       }
+
+      widget_list = widget_list->next;
+    }
+
+  g_slist_free (old_queue);
+
+  GDK_THREADS_LEAVE ();
+  
+  return FALSE;
+}
+
+void
+gtk_widget_queue_resize (GtkWidget *widget)
+{
+  g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  if (GTK_IS_RESIZE_CONTAINER (widget))
+    gtk_container_clear_resize_widgets (GTK_CONTAINER (widget));
+
+  if (GTK_WIDGET_DRAWABLE (widget))
+    gtk_widget_queue_clear (widget);
+
+  if (widget->parent)
+    gtk_container_queue_resize (GTK_CONTAINER (widget->parent));
+  else if (GTK_WIDGET_TOPLEVEL (widget))
+    gtk_container_queue_resize (GTK_CONTAINER (widget));
 }
 
 /*****************************************
@@ -1646,14 +2285,7 @@ gtk_widget_draw (GtkWidget    *widget,
   GdkRectangle temp_area;
 
   g_return_if_fail (widget != NULL);
-
-  if (GTK_WIDGET_REDRAW_PENDING (widget))
-    {
-      gtk_widget_redraw_queue = g_slist_remove (gtk_widget_redraw_queue, widget);
-      GTK_PRIVATE_UNSET_FLAG (widget, GTK_REDRAW_PENDING);
-
-      area = NULL;
-    }
+  g_return_if_fail (GTK_IS_WIDGET (widget));
 
   if (GTK_WIDGET_DRAWABLE (widget))
     {
@@ -1691,6 +2323,7 @@ void
 gtk_widget_draw_focus (GtkWidget *widget)
 {
   g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
   
   gtk_signal_emit (GTK_OBJECT (widget), widget_signals[DRAW_FOCUS]);
 }
@@ -1707,12 +2340,13 @@ void
 gtk_widget_draw_default (GtkWidget *widget)
 {
   g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
   
   gtk_signal_emit (GTK_OBJECT (widget), widget_signals[DRAW_DEFAULT]);
 }
 
 /*****************************************
- * gtk_widget_draw_children:
+ * gtk_widget_size_request:
  *
  *   arguments:
  *
@@ -1720,18 +2354,30 @@ gtk_widget_draw_default (GtkWidget *widget)
  *****************************************/
 
 void
-gtk_widget_draw_children (GtkWidget *widget)
+gtk_widget_size_request (GtkWidget     *widget,
+                        GtkRequisition *requisition)
 {
   g_return_if_fail (widget != NULL);
-  
-  if (GTK_IS_CONTAINER (widget))
-    gtk_container_foreach (GTK_CONTAINER (widget),
-                          gtk_widget_draw_children_recurse,
-                          NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+#ifdef G_ENABLE_DEBUG
+  if (requisition == &widget->requisition)
+    g_warning ("gtk_widget_size_request() called on child widget with widget equal\n to widget->requisition. gtk_widget_set_usize() may not work properly.");
+#endif /* G_ENABLE_DEBUG */
+
+  gtk_widget_ref (widget);
+  gtk_widget_ensure_style (widget);
+  gtk_signal_emit (GTK_OBJECT (widget), widget_signals[SIZE_REQUEST],
+                  &widget->requisition);
+
+  if (requisition)
+    gtk_widget_get_child_requisition (widget, requisition);
+
+  gtk_widget_unref (widget);
 }
 
 /*****************************************
- * gtk_widget_size_request:
+ * gtk_widget_get_requesition:
  *
  *   arguments:
  *
@@ -1739,17 +2385,16 @@ gtk_widget_draw_children (GtkWidget *widget)
  *****************************************/
 
 void
-gtk_widget_size_request (GtkWidget     *widget,
-                        GtkRequisition *requisition)
+gtk_widget_get_child_requisition (GtkWidget       *widget,
+                           GtkRequisition *requisition)
 {
   GtkWidgetAuxInfo *aux_info;
 
   g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
 
-  gtk_widget_ref (widget);
-  gtk_widget_ensure_style (widget);
-  gtk_signal_emit (GTK_OBJECT (widget), widget_signals[SIZE_REQUEST],
-                  requisition);
+  *requisition = widget->requisition;
+  
   aux_info = gtk_object_get_data_by_id (GTK_OBJECT (widget), aux_info_key_id);
   if (aux_info)
     {
@@ -1758,7 +2403,6 @@ gtk_widget_size_request (GtkWidget        *widget,
       if (aux_info->height > 0)
        requisition->height = aux_info->height;
     }
-  gtk_widget_unref (widget);
 }
 
 /*****************************************
@@ -1775,8 +2419,10 @@ gtk_widget_size_allocate (GtkWidget      *widget,
 {
   GtkWidgetAuxInfo *aux_info;
   GtkAllocation real_allocation;
+  gboolean needs_draw = FALSE;
   
   g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
   
   real_allocation = *allocation;
   aux_info = gtk_object_get_data_by_id (GTK_OBJECT (widget), aux_info_key_id);
@@ -1789,7 +2435,45 @@ gtk_widget_size_allocate (GtkWidget      *widget,
        real_allocation.y = aux_info->y;
     }
   
+  if (GTK_WIDGET_NO_WINDOW (widget))
+    {
+      if (widget->allocation.x != real_allocation.x ||
+         widget->allocation.y != real_allocation.y ||
+         widget->allocation.width != real_allocation.width ||
+         widget->allocation.height != real_allocation.height)
+       {
+         gtk_widget_queue_clear_child (widget);
+         needs_draw = TRUE;
+       }
+    }
+  else if (widget->allocation.width != real_allocation.width ||
+          widget->allocation.height != real_allocation.height)
+    {
+      needs_draw = TRUE;
+    }
+
   gtk_signal_emit (GTK_OBJECT (widget), widget_signals[SIZE_ALLOCATE], &real_allocation);
+
+  if (needs_draw)
+    gtk_widget_queue_draw (widget);
+}
+
+static void
+gtk_widget_real_size_allocate (GtkWidget     *widget,
+                              GtkAllocation *allocation)
+{
+  g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  widget->allocation = *allocation;
+  
+  if (GTK_WIDGET_REALIZED (widget) &&
+      !GTK_WIDGET_NO_WINDOW (widget))
+     {
+       gdk_window_move_resize (widget->window,
+                               allocation->x, allocation->y,
+                               allocation->width, allocation->height);
+     }
 }
 
 static void
@@ -1811,16 +2495,12 @@ gtk_widget_stop_remove_accelerator (GtkWidget *widget)
 }
 
 void
-gtk_widget_freeze_accelerators (GtkWidget *widget)
+gtk_widget_lock_accelerators (GtkWidget *widget)
 {
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
-
-  if (gtk_signal_handler_pending_by_func (GTK_OBJECT (widget),
-                                         widget_signals[ADD_ACCELERATOR],
-                                         TRUE,
-                                         GTK_SIGNAL_FUNC (gtk_widget_stop_add_accelerator),
-                                         NULL) == 0)
+  
+  if (!gtk_widget_accelerators_locked (widget))
     {
       gtk_signal_connect (GTK_OBJECT (widget),
                          "add_accelerator",
@@ -1834,16 +2514,12 @@ gtk_widget_freeze_accelerators (GtkWidget *widget)
 }
 
 void
-gtk_widget_thaw_accelerators (GtkWidget *widget)
+gtk_widget_unlock_accelerators (GtkWidget *widget)
 {
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
-
-  if (gtk_signal_handler_pending_by_func (GTK_OBJECT (widget),
-                                         widget_signals[ADD_ACCELERATOR],
-                                         TRUE,
-                                         GTK_SIGNAL_FUNC (gtk_widget_stop_add_accelerator),
-                                         NULL) > 0)
+  
+  if (gtk_widget_accelerators_locked (widget))
     {
       gtk_signal_disconnect_by_func (GTK_OBJECT (widget),
                                     GTK_SIGNAL_FUNC (gtk_widget_stop_add_accelerator),
@@ -1854,6 +2530,18 @@ gtk_widget_thaw_accelerators (GtkWidget *widget)
     }
 }
 
+gboolean
+gtk_widget_accelerators_locked (GtkWidget *widget)
+{
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+  
+  return gtk_signal_handler_pending_by_func (GTK_OBJECT (widget),
+                                            widget_signals[ADD_ACCELERATOR],
+                                            TRUE,
+                                            GTK_SIGNAL_FUNC (gtk_widget_stop_add_accelerator),
+                                            NULL) > 0;
+}
+
 void
 gtk_widget_add_accelerator (GtkWidget           *widget,
                            const gchar         *accel_signal,
@@ -1952,7 +2640,26 @@ gtk_widget_real_key_press_event (GtkWidget         *widget,
 
   if (!handled)
     handled = gtk_bindings_activate (GTK_OBJECT (widget),
-                                    event->keyval, event->state);
+                                    event->keyval,
+                                    event->state);
+
+  return handled;
+}
+
+static gint
+gtk_widget_real_key_release_event (GtkWidget         *widget,
+                                  GdkEventKey       *event)
+{
+  gboolean handled = FALSE;
+
+  g_return_val_if_fail (widget != NULL, handled);
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), handled);
+  g_return_val_if_fail (event != NULL, handled);
+
+  if (!handled)
+    handled = gtk_bindings_activate (GTK_OBJECT (widget),
+                                    event->keyval,
+                                    event->state | GDK_RELEASE_MASK);
 
   return handled;
 }
@@ -1973,6 +2680,7 @@ gtk_widget_event (GtkWidget *widget,
   gint signal_num;
 
   g_return_val_if_fail (widget != NULL, TRUE);
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), TRUE);
 
   gtk_widget_ref (widget);
   return_val = FALSE;
@@ -2051,24 +2759,6 @@ gtk_widget_event (GtkWidget *widget,
     case GDK_PROXIMITY_OUT:
       signal_num = PROXIMITY_OUT_EVENT;
       break;
-    case GDK_DRAG_BEGIN:
-      signal_num = DRAG_BEGIN_EVENT;
-      break;
-    case GDK_DRAG_REQUEST:
-      signal_num = DRAG_REQUEST_EVENT;
-      break;
-    case GDK_DROP_ENTER:
-      signal_num = DROP_ENTER_EVENT;
-      break;
-    case GDK_DROP_LEAVE:
-      signal_num = DROP_LEAVE_EVENT;
-      break;
-    case GDK_DROP_DATA_AVAIL:
-      signal_num = DROP_DATA_AVAILABLE_EVENT;
-      break;
-    case GDK_OTHER_EVENT:
-      signal_num = OTHER_EVENT;
-      break;
     case GDK_NO_EXPOSE:
       signal_num = NO_EXPOSE_EVENT;
       break;
@@ -2076,7 +2766,7 @@ gtk_widget_event (GtkWidget *widget,
       signal_num = CLIENT_EVENT;
       break;
     case GDK_EXPOSE:
-      /* there is no sense in providing a widget with bogus expose events
+      /* there is no sense in providing a widget with bogus expose events.
        */
       if (!event->any.window)
        {
@@ -2112,14 +2802,45 @@ gtk_widget_event (GtkWidget *widget,
  *   results:
  *****************************************/
 
-void
+gboolean
 gtk_widget_activate (GtkWidget *widget)
 {
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (widget));
+  g_return_val_if_fail (widget != NULL, FALSE);
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
   
   if (WIDGET_CLASS (widget)->activate_signal)
-    gtk_signal_emit (GTK_OBJECT (widget), WIDGET_CLASS (widget)->activate_signal);
+    {
+      /* FIXME: we should eventually check the signals signature here */
+      gtk_signal_emit (GTK_OBJECT (widget), WIDGET_CLASS (widget)->activate_signal);
+
+      return TRUE;
+    }
+  else
+    return FALSE;
+}
+
+gboolean
+gtk_widget_set_scroll_adjustments (GtkWidget     *widget,
+                                  GtkAdjustment *hadjustment,
+                                  GtkAdjustment *vadjustment)
+{
+  g_return_val_if_fail (widget != NULL, FALSE);
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+  if (hadjustment)
+    g_return_val_if_fail (GTK_IS_ADJUSTMENT (hadjustment), FALSE);
+  if (vadjustment)
+    g_return_val_if_fail (GTK_IS_ADJUSTMENT (vadjustment), FALSE);
+
+  if (WIDGET_CLASS (widget)->set_scroll_adjustments_signal)
+    {
+      /* FIXME: we should eventually check the signals signature here */
+      gtk_signal_emit (GTK_OBJECT (widget),
+                      WIDGET_CLASS (widget)->set_scroll_adjustments_signal,
+                      hadjustment, vadjustment);
+      return TRUE;
+    }
+  else
+    return FALSE;
 }
 
 /*****************************************
@@ -2132,10 +2853,11 @@ gtk_widget_activate (GtkWidget *widget)
  *****************************************/
 
 static void
-gtk_widget_reparent_container_child(GtkWidget *widget,
-                                   gpointer   client_data)
+gtk_widget_reparent_container_child (GtkWidget *widget,
+                                    gpointer   client_data)
 {
   g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (client_data != NULL);
   
   if (GTK_WIDGET_NO_WINDOW (widget))
@@ -2147,9 +2869,9 @@ gtk_widget_reparent_container_child(GtkWidget *widget,
        gdk_window_ref (widget->window);
 
       if (GTK_IS_CONTAINER (widget))
-       gtk_container_foreach (GTK_CONTAINER (widget),
-                              gtk_widget_reparent_container_child,
-                              client_data);
+       gtk_container_forall (GTK_CONTAINER (widget),
+                             gtk_widget_reparent_container_child,
+                             client_data);
     }
   else
     gdk_window_reparent (widget->window, 
@@ -2198,9 +2920,9 @@ gtk_widget_reparent (GtkWidget *widget,
          if (GTK_WIDGET_NO_WINDOW (widget))
            {
              if (GTK_IS_CONTAINER (widget))
-               gtk_container_foreach (GTK_CONTAINER (widget),
-                                      gtk_widget_reparent_container_child,
-                                      gtk_widget_get_parent_window (widget));
+               gtk_container_forall (GTK_CONTAINER (widget),
+                                     gtk_widget_reparent_container_child,
+                                     gtk_widget_get_parent_window (widget));
              else
                {
                  GdkWindow *parent_window;
@@ -2236,6 +2958,7 @@ gtk_widget_popup (GtkWidget *widget,
                  gint       y)
 {
   g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
   
   if (!GTK_WIDGET_VISIBLE (widget))
     {
@@ -2265,6 +2988,7 @@ gtk_widget_intersect (GtkWidget      *widget,
   gint return_val;
   
   g_return_val_if_fail (widget != NULL, FALSE);
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
   g_return_val_if_fail (area != NULL, FALSE);
   
   if (intersection)
@@ -2283,46 +3007,6 @@ gtk_widget_intersect (GtkWidget     *widget,
   return return_val;
 }
 
-
-gint
-gtk_widget_basic (GtkWidget *widget)
-{
-  GList *children;
-  GList *tmp_list;
-  gint return_val;
-  
-  g_return_val_if_fail (widget != NULL, FALSE);
-  
-  if (!GTK_WIDGET_BASIC (widget))
-    return FALSE;
-  else if (GTK_IS_CONTAINER (widget))
-    {
-      children = gtk_container_children (GTK_CONTAINER (widget));
-      if (children)
-       {
-         return_val = TRUE;
-         tmp_list = children;
-         
-         while (tmp_list)
-           {
-             if (!gtk_widget_basic (GTK_WIDGET (tmp_list->data)))
-               {
-                 return_val = FALSE;
-                 break;
-               }
-             
-             tmp_list = tmp_list->next;
-           }
-         
-         g_list_free (children);
-         return return_val;
-       }
-    }
-  
-  return TRUE;
-}
-
-
 /*****************************************
  * gtk_widget_grab_focus:
  *
@@ -2337,28 +3021,89 @@ gtk_widget_grab_focus (GtkWidget *widget)
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
-  if (GTK_WIDGET_CAN_FOCUS (widget))
+  gtk_signal_emit (GTK_OBJECT (widget), widget_signals[GRAB_FOCUS]);
+}
+
+static void
+reset_focus_recurse (GtkWidget *widget,
+                    gpointer   data)
+{
+  if (GTK_IS_CONTAINER (widget))
     {
-      GtkWidget *parent;
-      GtkWidget *child;
-      GtkType window_type;
-      
-      window_type = gtk_window_get_type ();
-      parent = widget->parent;
-      child = widget;
+      GtkContainer *container;
+
+      container = GTK_CONTAINER (widget);
+      gtk_container_set_focus_child (container, NULL);
+
+      gtk_container_foreach (container,
+                            reset_focus_recurse,
+                            NULL);
+    }
+}
+
+static void
+gtk_widget_real_grab_focus (GtkWidget *focus_widget)
+{
+  g_return_if_fail (focus_widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (focus_widget));
+  
+  if (GTK_WIDGET_CAN_FOCUS (focus_widget))
+    {
+      GtkWidget *toplevel;
+      GtkWidget *widget;
       
-      while (parent && !gtk_type_is_a (GTK_WIDGET_TYPE (parent), window_type))
+      /* clear the current focus setting, break if the current widget
+       * is the focus widget's parent, since containers above that will
+       * be set by the next loop.
+       */
+      toplevel = gtk_widget_get_toplevel (focus_widget);
+      if (GTK_IS_WINDOW (toplevel))
        {
-         gtk_container_set_focus_child (GTK_CONTAINER (parent), child);
-         child = parent;
-         parent = parent->parent;
+         widget = GTK_WINDOW (toplevel)->focus_widget;
+         
+         if (widget == focus_widget)
+           {
+             /* We call gtk_window_set_focus() here so that the
+              * toplevel window can request the focus if necessary.
+              * This is needed when the toplevel is a GtkPlug
+              */
+             if (!GTK_WIDGET_HAS_FOCUS (widget))
+               gtk_window_set_focus (GTK_WINDOW (toplevel), focus_widget);
+
+             return;
+           }
+         
+         if (widget)
+           {
+             while (widget->parent && widget->parent != focus_widget->parent)
+               {
+                 widget = widget->parent;
+                 gtk_container_set_focus_child (GTK_CONTAINER (widget), NULL);
+               }
+           }
        }
-      
-      if (parent && gtk_type_is_a (GTK_WIDGET_TYPE (parent), window_type))
+      else if (toplevel != focus_widget)
        {
-         gtk_container_set_focus_child (GTK_CONTAINER (parent), child);
-         gtk_window_set_focus (GTK_WINDOW (parent), widget);
+         /* gtk_widget_grab_focus() operates on a tree without window...
+          * actually, this is very questionable behaviour.
+          */
+         
+         gtk_container_foreach (GTK_CONTAINER (toplevel),
+                                reset_focus_recurse,
+                                NULL);
        }
+
+      /* now propagate the new focus up the widget tree and finally
+       * set it on the window
+       */
+      widget = focus_widget;
+      while (widget->parent)
+       {
+         gtk_container_set_focus_child (GTK_CONTAINER (widget->parent), widget);
+         widget = widget->parent;
+       }
+      if (GTK_IS_WINDOW (widget))
+       gtk_window_set_focus (GTK_WINDOW (widget), focus_widget);
     }
 }
 
@@ -2377,6 +3122,7 @@ gtk_widget_grab_default (GtkWidget *widget)
   GtkType window_type;
   
   g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (GTK_WIDGET_CAN_DEFAULT (widget));
   
   window_type = gtk_window_get_type ();
@@ -2387,6 +3133,8 @@ gtk_widget_grab_default (GtkWidget *widget)
   
   if (window && gtk_type_is_a (GTK_WIDGET_TYPE (window), window_type))
     gtk_window_set_default (GTK_WINDOW (window), widget);
+  else
+    g_warning("gtk_widget_grab_default() called on a widget not within a GtkWindow");
 }
 
 /*****************************************
@@ -2402,6 +3150,7 @@ gtk_widget_set_name (GtkWidget     *widget,
                     const gchar *name)
 {
   g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
   
   if (widget->name)
     g_free (widget->name);
@@ -2423,6 +3172,7 @@ gchar*
 gtk_widget_get_name (GtkWidget *widget)
 {
   g_return_val_if_fail (widget != NULL, NULL);
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
   
   if (widget->name)
     return widget->name;
@@ -2456,14 +3206,38 @@ gtk_widget_set_state (GtkWidget           *widget,
       GtkStateData data;
 
       data.state = state;
-      data.state_restauration = FALSE;
+      data.state_restoration = FALSE;
+      data.use_forall = FALSE;
       if (widget->parent)
        data.parent_sensitive = (GTK_WIDGET_IS_SENSITIVE (widget->parent) != FALSE);
       else
        data.parent_sensitive = TRUE;
 
       gtk_widget_propagate_state (widget, &data);
-      gtk_widget_queue_draw (widget);
+  
+      if (GTK_WIDGET_DRAWABLE (widget))
+       gtk_widget_queue_clear (widget);
+    }
+}
+
+void
+gtk_widget_set_app_paintable (GtkWidget *widget,
+                             gboolean   app_paintable)
+{
+  g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  app_paintable = (app_paintable != FALSE);
+
+  if (GTK_WIDGET_APP_PAINTABLE (widget) != app_paintable)
+    {
+      if (app_paintable)
+       GTK_WIDGET_SET_FLAGS (widget, GTK_APP_PAINTABLE);
+      else
+       GTK_WIDGET_UNSET_FLAGS (widget, GTK_APP_PAINTABLE);
+
+      if (GTK_WIDGET_DRAWABLE (widget))
+       gtk_widget_queue_clear (widget);
     }
 }
 
@@ -2479,7 +3253,7 @@ gtk_widget_set_state (GtkWidget           *widget,
 
 void
 gtk_widget_set_sensitive (GtkWidget *widget,
-                         gint       sensitive)
+                         gboolean   sensitive)
 {
   GtkStateData data;
 
@@ -2501,7 +3275,8 @@ gtk_widget_set_sensitive (GtkWidget *widget,
       GTK_WIDGET_UNSET_FLAGS (widget, GTK_SENSITIVE);
       data.state = GTK_WIDGET_STATE (widget);
     }
-  data.state_restauration = TRUE;
+  data.state_restoration = TRUE;
+  data.use_forall = TRUE;
 
   if (widget->parent)
     data.parent_sensitive = (GTK_WIDGET_IS_SENSITIVE (widget->parent) != FALSE);
@@ -2509,7 +3284,8 @@ gtk_widget_set_sensitive (GtkWidget *widget,
     data.parent_sensitive = TRUE;
 
   gtk_widget_propagate_state (widget, &data);
-  gtk_widget_queue_draw (widget);
+  if (GTK_WIDGET_DRAWABLE (widget))
+    gtk_widget_queue_clear (widget);
 }
 
 /*****************************************
@@ -2527,9 +3303,11 @@ gtk_widget_set_parent (GtkWidget *widget,
   GtkStateData data;
   
   g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (widget->parent == NULL);
   g_return_if_fail (!GTK_WIDGET_TOPLEVEL (widget));
   g_return_if_fail (parent != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (parent));
   g_return_if_fail (widget != parent);
 
   /* keep this function in sync with gtk_menu_attach_to_widget()
@@ -2543,8 +3321,9 @@ gtk_widget_set_parent (GtkWidget *widget,
     data.state = GTK_WIDGET_STATE (parent);
   else
     data.state = GTK_WIDGET_STATE (widget);
-  data.state_restauration = FALSE;
+  data.state_restoration = FALSE;
   data.parent_sensitive = (GTK_WIDGET_IS_SENSITIVE (parent) != FALSE);
+  data.use_forall = GTK_WIDGET_IS_SENSITIVE (parent) != GTK_WIDGET_IS_SENSITIVE (widget);
 
   gtk_widget_propagate_state (widget, &data);
   
@@ -2565,6 +3344,7 @@ gtk_widget_set_style (GtkWidget *widget,
   gboolean initial_emission;
 
   g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (style != NULL);
 
   initial_emission = !GTK_WIDGET_RC_STYLE (widget) && !GTK_WIDGET_USER_STYLE (widget);
@@ -2587,6 +3367,9 @@ gtk_widget_set_style (GtkWidget *widget,
 void
 gtk_widget_ensure_style (GtkWidget *widget)
 {
+  g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
   if (!GTK_WIDGET_USER_STYLE (widget) &&
       !GTK_WIDGET_RC_STYLE (widget))
     gtk_widget_set_rc_style (widget);
@@ -2600,6 +3383,7 @@ gtk_widget_set_rc_style (GtkWidget *widget)
   gboolean initial_emission;
   
   g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
 
   initial_emission = !GTK_WIDGET_RC_STYLE (widget) && !GTK_WIDGET_USER_STYLE (widget);
 
@@ -2643,6 +3427,7 @@ gtk_widget_restore_default_style (GtkWidget *widget)
   GtkStyle *default_style;
 
   g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
 
   GTK_PRIVATE_UNSET_FLAG (widget, GTK_USER_STYLE);
 
@@ -2659,21 +3444,36 @@ GtkStyle*
 gtk_widget_get_style (GtkWidget *widget)
 {
   g_return_val_if_fail (widget != NULL, NULL);
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
   
   return widget->style;
 }
 
+void       
+gtk_widget_modify_style (GtkWidget      *widget,
+                        GtkRcStyle     *style)
+{
+  GtkRcStyle *old_style;
+  
+  if (!rc_style_key_id)
+    rc_style_key_id = g_quark_from_static_string (rc_style_key);
+
+  old_style = gtk_object_get_data_by_id (GTK_OBJECT (widget), rc_style_key_id);
+
+  if (style != old_style)
+    gtk_object_set_data_by_id_full (GTK_OBJECT (widget),
+                                   rc_style_key_id,
+                                   style,
+                                   (GtkDestroyNotify)gtk_rc_style_unref);
+}
+
 static void
 gtk_widget_style_set (GtkWidget *widget,
                      GtkStyle  *previous_style)
 {
   if (GTK_WIDGET_REALIZED (widget) &&
       !GTK_WIDGET_NO_WINDOW (widget))
-    {
-      gtk_style_set_background (widget->style, widget->window, widget->state);
-      if (GTK_WIDGET_DRAWABLE (widget))
-       gdk_window_clear (widget->window);
-    }
+    gtk_style_set_background (widget->style, widget->window, widget->state);
 }
 
 static void
@@ -2682,6 +3482,7 @@ gtk_widget_set_style_internal (GtkWidget *widget,
                               gboolean   initial_emission)
 {
   g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (style != NULL);
   
   if (widget->style != style)
@@ -2689,7 +3490,10 @@ gtk_widget_set_style_internal (GtkWidget *widget,
       GtkStyle *previous_style;
 
       if (GTK_WIDGET_REALIZED (widget))
-       gtk_style_detach (widget->style);
+       {
+         gtk_widget_reset_shapes (widget);
+         gtk_style_detach (widget->style);
+       }
       
       previous_style = widget->style;
       widget->style = style;
@@ -2708,13 +3512,13 @@ gtk_widget_set_style_internal (GtkWidget *widget,
          GtkRequisition old_requisition;
          
          old_requisition = widget->requisition;
-         gtk_widget_size_request (widget, &widget->requisition);
+         gtk_widget_size_request (widget, NULL);
          
          if ((old_requisition.width != widget->requisition.width) ||
              (old_requisition.height != widget->requisition.height))
            gtk_widget_queue_resize (widget);
          else if (GTK_WIDGET_DRAWABLE (widget))
-           gtk_widget_queue_draw (widget);
+           gtk_widget_queue_clear (widget);
        }
     }
   else if (initial_emission)
@@ -2733,40 +3537,43 @@ gtk_widget_set_style_recurse (GtkWidget *widget,
     gtk_widget_set_rc_style (widget);
   
   if (GTK_IS_CONTAINER (widget))
-    gtk_container_foreach (GTK_CONTAINER (widget),
-                          gtk_widget_set_style_recurse,
-                          NULL);
+    gtk_container_forall (GTK_CONTAINER (widget),
+                         gtk_widget_set_style_recurse,
+                         NULL);
 }
 
 void
 gtk_widget_reset_rc_styles (GtkWidget *widget)
 {
+  g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
   gtk_widget_set_style_recurse (widget, NULL);
 }
 
 void
 gtk_widget_set_default_style (GtkStyle *style)
 {
-   if (style != default_style)
+  if (style != gtk_default_style)
      {
-       if (default_style)
-        gtk_style_unref (default_style);
-       default_style = style;
-       if (default_style)
-        gtk_style_ref (default_style);
+       if (gtk_default_style)
+        gtk_style_unref (gtk_default_style);
+       gtk_default_style = style;
+       if (gtk_default_style)
+        gtk_style_ref (gtk_default_style);
      }
 }
 
 GtkStyle*
 gtk_widget_get_default_style (void)
 {
-  if (!default_style)
+  if (!gtk_default_style)
     {
-      default_style = gtk_style_new ();
-      gtk_style_ref (default_style);
+      gtk_default_style = gtk_style_new ();
+      gtk_style_ref (gtk_default_style);
     }
   
-  return default_style;
+  return gtk_default_style;
 }
 
 void
@@ -2819,6 +3626,7 @@ gtk_widget_set_parent_window   (GtkWidget           *widget,
   GdkWindow *old_parent_window;
 
   g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
   
   old_parent_window = gtk_object_get_data_by_id (GTK_OBJECT (widget),
                                                 parent_window_key_id);
@@ -2878,6 +3686,7 @@ gtk_widget_set_uposition (GtkWidget *widget,
   GtkWidgetAuxInfo *aux_info;
   
   g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
   
   aux_info = gtk_object_get_data_by_id (GTK_OBJECT (widget), aux_info_key_id);
   if (!aux_info)
@@ -2920,6 +3729,7 @@ gtk_widget_set_usize (GtkWidget *widget,
   GtkWidgetAuxInfo *aux_info;
   
   g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
   
   aux_info = gtk_object_get_data_by_id (GTK_OBJECT (widget), aux_info_key_id);
   if (!aux_info)
@@ -2930,9 +3740,9 @@ gtk_widget_set_usize (GtkWidget *widget,
       gtk_object_set_data_by_id (GTK_OBJECT (widget), aux_info_key_id, aux_info);
     }
   
-  if (width > -1)
+  if (width > -2)
     aux_info->width = width;
-  if (height > -1)
+  if (height > -2)
     aux_info->height = height;
   
   if (GTK_WIDGET_VISIBLE (widget))
@@ -2954,6 +3764,7 @@ gtk_widget_set_events (GtkWidget *widget,
   gint *eventp;
   
   g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (!GTK_WIDGET_NO_WINDOW (widget));
   g_return_if_fail (!GTK_WIDGET_REALIZED (widget));
   
@@ -2976,6 +3787,52 @@ gtk_widget_set_events (GtkWidget *widget,
     }
 }
 
+/*****************************************
+ * gtk_widget_add_events:
+ *
+ *   arguments:
+ *
+ *   results:
+ *****************************************/
+
+void
+gtk_widget_add_events (GtkWidget *widget,
+                      gint       events)
+{
+  gint *eventp;
+  
+  g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+  g_return_if_fail (!GTK_WIDGET_NO_WINDOW (widget));
+  
+  eventp = gtk_object_get_data_by_id (GTK_OBJECT (widget), event_key_id);
+  
+  if (events)
+    {
+      if (!eventp)
+       {
+         eventp = g_new (gint, 1);
+         *eventp = 0;
+       }
+      
+      *eventp |= events;
+      if (!event_key_id)
+       event_key_id = g_quark_from_static_string (event_key);
+      gtk_object_set_data_by_id (GTK_OBJECT (widget), event_key_id, eventp);
+    }
+  else if (eventp)
+    {
+      g_free (eventp);
+      gtk_object_remove_data_by_id (GTK_OBJECT (widget), event_key_id);
+    }
+
+  if (GTK_WIDGET_REALIZED (widget))
+    {
+      gdk_window_set_events (widget->window,
+                            gdk_window_get_events (widget->window) | events);
+    }
+}
+
 /*****************************************
  * gtk_widget_set_extension_events:
  *
@@ -2991,6 +3848,7 @@ gtk_widget_set_extension_events (GtkWidget *widget,
   GdkExtensionMode *modep;
   
   g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
   
   modep = gtk_object_get_data_by_id (GTK_OBJECT (widget), extension_event_key_id);
   
@@ -3015,6 +3873,7 @@ GtkWidget*
 gtk_widget_get_toplevel (GtkWidget *widget)
 {
   g_return_val_if_fail (widget != NULL, NULL);
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
   
   while (widget->parent)
     widget = widget->parent;
@@ -3035,6 +3894,7 @@ gtk_widget_get_ancestor (GtkWidget *widget,
                         GtkType    widget_type)
 {
   g_return_val_if_fail (widget != NULL, NULL);
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
   
   while (widget && !gtk_type_is_a (GTK_WIDGET_TYPE (widget), widget_type))
     widget = widget->parent;
@@ -3059,16 +3919,21 @@ gtk_widget_get_colormap (GtkWidget *widget)
   GdkColormap *colormap;
   
   g_return_val_if_fail (widget != NULL, NULL);
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
   
-  if (!widget->window)
+  if (widget->window)
     {
-      colormap = gtk_object_get_data (GTK_OBJECT (widget), colormap_key);
+      colormap = gdk_window_get_colormap (widget->window);
+      /* If window was destroyed previously, we'll get NULL here */
       if (colormap)
        return colormap;
-      return gtk_widget_get_default_colormap ();
     }
   
-  return gdk_window_get_colormap (widget->window);
+  colormap = gtk_object_get_data (GTK_OBJECT (widget), colormap_key);
+  if (colormap)
+    return colormap;
+
+  return gtk_widget_get_default_colormap ();
 }
 
 /*****************************************
@@ -3085,16 +3950,74 @@ gtk_widget_get_visual (GtkWidget *widget)
   GdkVisual *visual;
   
   g_return_val_if_fail (widget != NULL, NULL);
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
   
-  if (!widget->window)
+  if (widget->window)
     {
-      visual = gtk_object_get_data (GTK_OBJECT (widget), visual_key);
+      visual = gdk_window_get_visual (widget->window);
+      /* If window was destroyed previously, we'll get NULL here */
       if (visual)
        return visual;
-      return gtk_widget_get_default_visual ();
     }
   
-  return gdk_window_get_visual (widget->window);
+  visual = gtk_object_get_data (GTK_OBJECT (widget), visual_key);
+  if (visual)
+    return visual;
+
+  return gtk_widget_get_default_visual ();
+}
+
+/*****************************************
+ * gtk_widget_set_colormap:
+ *    Set the colormap for the widget to the given
+ *    value. Widget must not have been previously
+ *    realized. This probably should only be used
+ *    from an init() function.
+ *   arguments:
+ *    widget:
+ *    colormap:
+ *   results:
+ *****************************************/
+
+void
+gtk_widget_set_colormap (GtkWidget *widget, GdkColormap *colormap)
+{
+  g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+  g_return_if_fail (!GTK_WIDGET_REALIZED (widget));
+  g_return_if_fail (colormap != NULL);
+
+  /* FIXME: reference count the colormap.
+   */
+  
+  gtk_object_set_data (GTK_OBJECT (widget), 
+                      colormap_key,
+                      colormap);
+}
+
+/*****************************************
+ * gtk_widget_set_visual:
+ *    Set the colormap for the widget to the given
+ *    value. Widget must not have been previously
+ *    realized. This probably should only be used
+ *    from an init() function.
+ *   arguments:
+ *    widget:
+ *    visual:
+ *   results:
+ *****************************************/
+
+void
+gtk_widget_set_visual (GtkWidget *widget, GdkVisual *visual)
+{
+  g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+  g_return_if_fail (!GTK_WIDGET_REALIZED (widget));
+  g_return_if_fail (visual != NULL);
+  
+  gtk_object_set_data (GTK_OBJECT (widget), 
+                      visual_key,
+                      visual);
 }
 
 /*****************************************
@@ -3111,6 +4034,7 @@ gtk_widget_get_events (GtkWidget *widget)
   gint *events;
   
   g_return_val_if_fail (widget != NULL, 0);
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), 0);
   
   events = gtk_object_get_data_by_id (GTK_OBJECT (widget), event_key_id);
   if (events)
@@ -3133,6 +4057,7 @@ gtk_widget_get_extension_events (GtkWidget *widget)
   GdkExtensionMode *mode;
   
   g_return_val_if_fail (widget != NULL, 0);
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), 0);
   
   mode = gtk_object_get_data_by_id (GTK_OBJECT (widget), extension_event_key_id);
   if (mode)
@@ -3155,6 +4080,7 @@ gtk_widget_get_pointer (GtkWidget *widget,
                        gint      *y)
 {
   g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
   
   if (x)
     *x = -1;
@@ -3188,6 +4114,7 @@ gtk_widget_is_ancestor (GtkWidget *widget,
                        GtkWidget *ancestor)
 {
   g_return_val_if_fail (widget != NULL, FALSE);
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
   g_return_val_if_fail (ancestor != NULL, FALSE);
   
   while (widget)
@@ -3200,22 +4127,50 @@ gtk_widget_is_ancestor (GtkWidget *widget,
   return FALSE;
 }
 
-/*****************************************
- * gtk_widget_is_child:
- *
- *   arguments:
- *
- *   results:
- *****************************************/
+static GQuark quark_composite_name = 0;
 
-gint
-gtk_widget_is_child (GtkWidget *widget,
-                    GtkWidget *child)
+void
+gtk_widget_set_composite_name (GtkWidget *widget,
+                              gchar     *name)
 {
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (child != NULL, FALSE);
-  
-  return (child->parent == widget);
+  g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+  g_return_if_fail (GTK_WIDGET_COMPOSITE_CHILD (widget));
+  g_return_if_fail (name != NULL);
+
+  if (!quark_composite_name)
+    quark_composite_name = g_quark_from_static_string ("gtk-composite-name");
+
+  gtk_object_set_data_by_id_full (GTK_OBJECT (widget),
+                                 quark_composite_name,
+                                 g_strdup (name),
+                                 g_free);
+}
+
+gchar*
+gtk_widget_get_composite_name (GtkWidget *widget)
+{
+  g_return_val_if_fail (widget != NULL, NULL);
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+
+  if (GTK_WIDGET_COMPOSITE_CHILD (widget) && widget->parent)
+    return gtk_container_child_composite_name (GTK_CONTAINER (widget->parent),
+                                              widget);
+  else
+    return NULL;
+}
+
+void
+gtk_widget_push_composite_child (void)
+{
+  composite_child_stack++;
+}
+
+void
+gtk_widget_pop_composite_child (void)
+{
+  if (composite_child_stack)
+    composite_child_stack--;
 }
 
 /*****************************************
@@ -3361,123 +4316,6 @@ gtk_widget_get_default_visual (void)
   return default_visual;
 }
 
-/*****************************************
- * gtk_widget_marshal_signal_1:
- *
- *   arguments:
- *
- *   results:
- *****************************************/
-
-static void
-gtk_widget_marshal_signal_1 (GtkObject     *object,
-                            GtkSignalFunc   func,
-                            gpointer        func_data,
-                            GtkArg         *args)
-{
-  GtkWidgetSignal1 rfunc;
-  
-  rfunc = (GtkWidgetSignal1) func;
-  
-  (* rfunc) (object,
-            GTK_VALUE_POINTER (args[0]),
-            func_data);
-}
-
-/*****************************************
- * gtk_widget_marshal_signal_4:
- *
- *   arguments:
- *
- *   results:
- *****************************************/
-
-static void
-gtk_widget_marshal_signal_4 (GtkObject     *object,
-                            GtkSignalFunc   func,
-                            gpointer        func_data,
-                            GtkArg         *args)
-{
-  GtkWidgetSignal4 rfunc;
-  gint *return_val;
-  
-  rfunc = (GtkWidgetSignal4) func;
-  return_val = GTK_RETLOC_BOOL (args[1]);
-  
-  *return_val = (* rfunc) (object,
-                          GTK_VALUE_BOXED (args[0]),
-                          func_data);
-}
-
-/*****************************************
- * gtk_widget_marshal_signal_5:
- *
- *   arguments:
- *
- *   results:
- *****************************************/
-
-static void
-gtk_widget_marshal_signal_5 (GtkObject     *object,
-                            GtkSignalFunc   func,
-                            gpointer        func_data,
-                            GtkArg         *args)
-{
-  GtkWidgetSignal5 rfunc;
-  
-  rfunc = (GtkWidgetSignal5) func;
-  
-  (* rfunc) (object,
-            GTK_VALUE_UINT (args[0]),
-            func_data);
-}
-
-/*****************************************
- * gtk_widget_marshal_signal_6:
- *
- *   arguments:
- *
- *   results:
- *****************************************/
-
-static void
-gtk_widget_marshal_signal_6 (GtkObject     *object,
-                            GtkSignalFunc   func,
-                            gpointer        func_data,
-                            GtkArg         *args)
-{
-  GtkWidgetSignal6 rfunc;
-  
-  rfunc = (GtkWidgetSignal6) func;
-  
-  (* rfunc) (object,
-            GTK_VALUE_OBJECT (args[0]),
-            func_data);
-}
-
-/*****************************************
- * gtk_widget_marshal_signal_7:
- *
- *   arguments:
- *
- *   results:
- *****************************************/
-
-static void
-gtk_widget_marshal_signal_7 (GtkObject     *object,
-                            GtkSignalFunc   func,
-                            gpointer        func_data,
-                            GtkArg         *args)
-{
-  GtkWidgetSignal7 rfunc;
-  
-  rfunc = (GtkWidgetSignal7) func;
-  
-  (* rfunc) (object,
-            GTK_VALUE_BOXED (args[0]),
-            func_data);
-}
-
 static void
 gtk_widget_shutdown (GtkObject *object)
 {
@@ -3551,60 +4389,6 @@ gtk_widget_finalize (GtkObject *object)
   parent_class->finalize (object);
 }
 
-/*****************************************
- * gtk_widget_real_show:
- *
- *   arguments:
- *
- *   results:
- *****************************************/
-
-static void
-gtk_widget_real_show (GtkWidget *widget)
-{
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-  
-  if (!GTK_WIDGET_VISIBLE (widget))
-    {
-      GTK_WIDGET_SET_FLAGS (widget, GTK_VISIBLE);
-      
-      if (widget->parent)
-       {
-         gtk_widget_queue_resize (widget->parent);
-         
-         if (GTK_WIDGET_MAPPED (widget->parent))
-           gtk_widget_map (widget);
-       }
-    }
-}
-
-/*****************************************
- * gtk_widget_real_hide:
- *
- *   arguments:
- *
- *   results:
- *****************************************/
-
-static void
-gtk_widget_real_hide (GtkWidget *widget)
-{
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-  
-  if (GTK_WIDGET_VISIBLE (widget))
-    {
-      GTK_WIDGET_UNSET_FLAGS (widget, GTK_VISIBLE);
-      
-      if (GTK_WIDGET_MAPPED (widget))
-       gtk_widget_unmap (widget);
-      
-      if (widget->parent)
-       gtk_widget_queue_resize (widget->parent);
-    }
-}
-
 /*****************************************
  * gtk_widget_real_map:
  *
@@ -3625,8 +4409,6 @@ gtk_widget_real_map (GtkWidget *widget)
       
       if (!GTK_WIDGET_NO_WINDOW (widget))
        gdk_window_show (widget->window);
-      else
-       gtk_widget_queue_draw (widget);
     }
 }
 
@@ -3647,14 +4429,8 @@ gtk_widget_real_unmap (GtkWidget *widget)
   if (GTK_WIDGET_MAPPED (widget))
     {
       GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
-      
-      if (GTK_WIDGET_NO_WINDOW (widget))
-       gdk_window_clear_area (widget->window,
-                              widget->allocation.x,
-                              widget->allocation.y,
-                              widget->allocation.width,
-                              widget->allocation.height);
-      else
+
+      if (!GTK_WIDGET_NO_WINDOW (widget))
        gdk_window_hide (widget->window);
     }
 }
@@ -3697,14 +4473,25 @@ gtk_widget_real_unrealize (GtkWidget *widget)
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
-  if (GTK_WIDGET_NO_WINDOW (widget) && GTK_WIDGET_MAPPED (widget))
+  if (GTK_WIDGET_MAPPED (widget))
     gtk_widget_real_unmap (widget);
 
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_REALIZED | GTK_MAPPED);
+  GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
 
   /* printf ("unrealizing %s\n", gtk_type_name (GTK_OBJECT(widget)->klass->type));
    */
 
+   /* We must do unrealize child widget BEFORE container widget.
+    * gdk_window_destroy() destroys specified xwindow and it's sub-xwindows.
+    * So, unrealizing container widget bofore it's children causes the problem 
+    * (for example, gdk_ic_destroy () with destroyed window causes crash. )
+    */
+
+  if (GTK_IS_CONTAINER (widget))
+    gtk_container_foreach (GTK_CONTAINER (widget),
+                          (GtkCallback) gtk_widget_unrealize,
+                          NULL);
+
   gtk_style_detach (widget->style);
   if (!GTK_WIDGET_NO_WINDOW (widget))
     {
@@ -3718,22 +4505,9 @@ gtk_widget_real_unrealize (GtkWidget *widget)
       widget->window = NULL;
     }
 
-  /* Unrealize afterwards to improve visual effect */
-
-  if (GTK_IS_CONTAINER (widget))
-    gtk_container_foreach (GTK_CONTAINER (widget),
-                          (GtkCallback) gtk_widget_unrealize,
-                          NULL);
+  GTK_WIDGET_UNSET_FLAGS (widget, GTK_REALIZED);
 }
 
-/*****************************************
- * gtk_widget_real_draw:
- *
- *   arguments:
- *
- *   results:
- *****************************************/
-
 static void
 gtk_widget_real_draw (GtkWidget           *widget,
                      GdkRectangle *area)
@@ -3758,42 +4532,15 @@ gtk_widget_real_draw (GtkWidget    *widget,
     }
 }
 
-/*****************************************
- * gtk_widget_real_size_allocate:
- *
- *   arguments:
- *
- *   results:
- *****************************************/
-
 static void
-gtk_widget_real_size_allocate (GtkWidget     *widget,
-                              GtkAllocation *allocation)
+gtk_widget_real_size_request (GtkWidget         *widget,
+                             GtkRequisition    *requisition)
 {
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
-  
-  if (GTK_WIDGET_NO_WINDOW (widget) &&
-      GTK_WIDGET_MAPPED (widget) &&
-      ((widget->allocation.x != allocation->x) ||
-       (widget->allocation.y != allocation->y) ||
-       (widget->allocation.width != allocation->width) ||
-       (widget->allocation.height != allocation->height)) &&
-      (widget->allocation.width != 0) &&
-      (widget->allocation.height != 0))
-    gdk_window_clear_area (widget->window,
-                          widget->allocation.x,
-                          widget->allocation.y,
-                          widget->allocation.width,
-                          widget->allocation.height);
-  
-  widget->allocation = *allocation;
-  
-  if (GTK_WIDGET_REALIZED (widget) &&
-      !GTK_WIDGET_NO_WINDOW (widget))
-    gdk_window_move_resize (widget->window,
-                           allocation->x, allocation->y,
-                           allocation->width, allocation->height);
+
+  requisition->width = widget->requisition.width;
+  requisition->height = widget->requisition.height;
 }
 
 /*****************************************
@@ -3828,18 +4575,6 @@ gtk_widget_peek_visual (void)
   return gtk_widget_get_default_visual ();
 }
 
-/*************************************************************
- * gtk_widget_propagate_state:
- *     Propagate a change in the widgets state down the tree
- *
- *   arguments:
- *     widget
- *     GtkStateData: state
- *                   parent_sensitive
- *
- *   results:
- *************************************************************/
-
 static void
 gtk_widget_propagate_state (GtkWidget           *widget,
                            GtkStateData        *data)
@@ -3858,7 +4593,7 @@ gtk_widget_propagate_state (GtkWidget           *widget,
 
       if (GTK_WIDGET_IS_SENSITIVE (widget))
        {
-         if (data->state_restauration)
+         if (data->state_restoration)
            GTK_WIDGET_STATE (widget) = GTK_WIDGET_SAVED_STATE (widget);
          else
            GTK_WIDGET_STATE (widget) = data->state;
@@ -3866,7 +4601,7 @@ gtk_widget_propagate_state (GtkWidget           *widget,
       else
        {
          GTK_WIDGET_STATE (widget) = GTK_STATE_INSENSITIVE;
-         if (!data->state_restauration &&
+         if (!data->state_restoration &&
              data->state != GTK_STATE_INSENSITIVE)
            GTK_WIDGET_SAVED_STATE (widget) = data->state;
        }
@@ -3874,7 +4609,7 @@ gtk_widget_propagate_state (GtkWidget           *widget,
   else
     {
       GTK_WIDGET_UNSET_FLAGS (widget, GTK_PARENT_SENSITIVE);
-      if (!data->state_restauration)
+      if (!data->state_restoration)
        {
          if (data->state != GTK_STATE_INSENSITIVE)
            GTK_WIDGET_SAVED_STATE (widget) = data->state;
@@ -3902,28 +4637,40 @@ gtk_widget_propagate_state (GtkWidget           *widget,
        {
          data->parent_sensitive = (GTK_WIDGET_IS_SENSITIVE (widget) != FALSE);
          data->state = GTK_WIDGET_STATE (widget);
-         gtk_container_foreach (GTK_CONTAINER (widget),
-                                (GtkCallback) gtk_widget_propagate_state,
-                                data);
+         if (data->use_forall)
+           gtk_container_forall (GTK_CONTAINER (widget),
+                                 (GtkCallback) gtk_widget_propagate_state,
+                                 data);
+         else
+           gtk_container_foreach (GTK_CONTAINER (widget),
+                                  (GtkCallback) gtk_widget_propagate_state,
+                                  data);
        }
       gtk_widget_unref (widget);
     }
 }
 
-/*****************************************
- * gtk_widget_draw_children_recurse:
- *
+/*************************************************************
+ * gtk_widget_is_offscreen:
+ *     Check if a widget is "offscreen"
  *   arguments:
- *
+ *     widget: a widget
  *   results:
- *****************************************/
+ *     TRUE if the widget or any of ancestors has the
+ *     PRIVATE_GTK_WIDGET_IS_OFFSCREEN set.
+ *************************************************************/
 
-static void
-gtk_widget_draw_children_recurse (GtkWidget *widget,
-                                 gpointer   client_data)
+static gboolean 
+gtk_widget_is_offscreen (GtkWidget *widget)
 {
-  gtk_widget_draw (widget, NULL);
-  gtk_widget_draw_children (widget);
+  while (widget)
+    {
+      if (GTK_WIDGET_IS_OFFSCREEN (widget))
+       return TRUE;
+      widget = widget->parent;
+    }
+
+  return FALSE;
 }
 
 /*****************************************
@@ -3989,6 +4736,7 @@ gtk_widget_shape_combine_mask (GtkWidget *widget,
   GtkWidgetShapeInfo* shape_info;
   
   g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
   /*  set_shape doesn't work on widgets without gdk window */
   g_return_if_fail (!GTK_WIDGET_NO_WINDOW (widget));
 
@@ -4026,94 +4774,36 @@ gtk_widget_shape_combine_mask (GtkWidget *widget,
     }
 }
 
-/*****************************************
- * gtk_widget_dnd_drag_add:
- *   when you get a DRAG_ENTER event, you can use this          
- *   to tell Gtk ofother widgets that are to be dragged as well
- *
- *   arguments:
- *
- *   results:
- *****************************************/
-void
-gtk_widget_dnd_drag_add (GtkWidget *widget)
+static void
+gtk_reset_shapes_recurse (GtkWidget *widget,
+                         GdkWindow *window)
 {
-}
+  GdkWindowPrivate *private;
+  gpointer data;
+  GList *list;
 
-/*****************************************
- * gtk_widget_dnd_drag_set:
- *   these two functions enable drag and/or drop on a
- *   widget and also let Gtk know what data types will be accepted
- *   use MIME type naming,plus tacking "URL:" on the front for link 
- *   dragging
- *            
- *
- *   arguments:
- *
- *   results:
- *****************************************/
-void
-gtk_widget_dnd_drag_set (GtkWidget   *widget,
-                        guint8       drag_enable,
-                        gchar      **type_accept_list,
-                        guint        numtypes)
-{
-  g_return_if_fail(widget != NULL);
-  
-  if (!widget->window)
-    gtk_widget_realize (widget);
-  
-  g_return_if_fail (widget->window != NULL);
-  gdk_window_dnd_drag_set (widget->window,
-                          drag_enable,
-                          type_accept_list,
-                          numtypes);
-}
+  private = (GdkWindowPrivate*) window;
 
-/*****************************************
- * gtk_widget_dnd_drop_set:
- *
- *   arguments:
- *
- *   results:
- *****************************************/
-void
-gtk_widget_dnd_drop_set (GtkWidget   *widget,
-                        guint8       drop_enable,
-                        gchar      **type_accept_list,
-                        guint        numtypes,
-                        guint8       is_destructive_operation)
-{
-  g_return_if_fail(widget != NULL);
-  
-  if (!widget->window)
-    gtk_widget_realize (widget);
-  
-  g_return_if_fail (widget->window != NULL);
-  gdk_window_dnd_drop_set (widget->window,
-                          drop_enable,
-                          type_accept_list,
-                          numtypes,
-                          is_destructive_operation);
+  if (private->destroyed)
+    return;
+  gdk_window_get_user_data (window, &data);
+  if (data != widget)
+    return;
+
+  gdk_window_shape_combine_mask (window, NULL, 0, 0);
+  for (list = private->children; list; list = list->next)
+    gtk_reset_shapes_recurse (widget, list->data);
 }
 
-/*****************************************
- * gtk_widget_dnd_data_set:
- *
- *   arguments:
- *
- *   results:
- *****************************************/
 void
-gtk_widget_dnd_data_set (GtkWidget   *widget,
-                        GdkEvent    *event,
-                        gpointer     data,
-                        gulong       data_numbytes)
+gtk_widget_reset_shapes (GtkWidget *widget)
 {
   g_return_if_fail (widget != NULL);
-  g_return_if_fail (widget->window != NULL);
-  
-  gdk_window_dnd_data_set (widget->window, event, data, data_numbytes);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+  g_return_if_fail (GTK_WIDGET_REALIZED (widget));
+
+  if (!GTK_WIDGET_HAS_SHAPE_MASK (widget))
+    gtk_reset_shapes_recurse (widget, widget->window);
 }
 
 void