]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkwidget.c
Add docs.
[~andy/gtk] / gtk / gtkwidget.c
index 6227967e7e57bc8091c6094ad6adb0764a8fd532..71bf80ef78dba8551160025504d9d4cefbef82ee 100644 (file)
 #include <string.h>
 #include <locale.h>
 #include "gtkcontainer.h"
+#include "gtkaccelmap.h"
+#include "gtkclipboard.h"
 #include "gtkiconfactory.h"
 #include "gtkintl.h"
 #include "gtkmain.h"
+#include "gtkmarshalers.h"
 #include "gtkrc.h"
 #include "gtkselection.h"
 #include "gtksettings.h"
 #include "gtksizegroup.h"
-#include "gtksignal.h"
 #include "gtkwidget.h"
 #include "gtkwindow.h"
 #include "gtkbindings.h"
@@ -48,6 +50,7 @@
 #include "gtkintl.h"
 #include "gtkaccessible.h"
 #include "gtktooltips.h"
+#include "gtkinvisible.h"
 
 #define WIDGET_CLASS(w)         GTK_WIDGET_GET_CLASS (w)
 #define        INIT_PATH_SIZE  (512)
@@ -69,9 +72,7 @@ enum {
   DIRECTION_CHANGED,
   GRAB_NOTIFY,
   CHILD_NOTIFY,
-  ADD_ACCELERATOR,
-  REMOVE_ACCELERATOR,
-  ACTIVATE_MNEMONIC,
+  MNEMONIC_ACTIVATE,
   GRAB_FOCUS,
   FOCUS,
   EVENT,
@@ -114,6 +115,8 @@ enum {
   WINDOW_STATE_EVENT,
   POPUP_MENU,
   SHOW_HELP,
+  ACCEL_CLOSURES_CHANGED,
+  SCREEN_CHANGED,
   LAST_SIGNAL
 };
 
@@ -128,6 +131,7 @@ enum {
   PROP_APP_PAINTABLE,
   PROP_CAN_FOCUS,
   PROP_HAS_FOCUS,
+  PROP_IS_FOCUS,
   PROP_CAN_DEFAULT,
   PROP_HAS_DEFAULT,
   PROP_RECEIVES_DEFAULT,
@@ -178,7 +182,7 @@ static void gtk_widget_direction_changed     (GtkWidget         *widget,
                                                  GtkTextDirection   previous_direction);
 
 static void    gtk_widget_real_grab_focus       (GtkWidget         *focus_widget);
-static void     gtk_widget_real_show_help        (GtkWidget         *widget,
+static gboolean gtk_widget_real_show_help        (GtkWidget         *widget,
                                                   GtkWidgetHelpType  help_type);
 
 static void    gtk_widget_dispatch_child_properties_changed    (GtkWidget        *object,
@@ -195,16 +199,12 @@ static gboolean           gtk_widget_real_focus_out_event         (GtkWidget        *widget,
 static gboolean                gtk_widget_real_focus                   (GtkWidget        *widget,
                                                                 GtkDirectionType  direction);
 static PangoContext*   gtk_widget_peek_pango_context           (GtkWidget        *widget);
-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_reset_rc_style               (GtkWidget        *widget);
 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);
 static gint            gtk_widget_event_internal               (GtkWidget        *widget,
                                                                 GdkEvent         *event);
 static gboolean                gtk_widget_real_mnemonic_activate       (GtkWidget        *widget,
@@ -213,12 +213,19 @@ static void               gtk_widget_aux_info_destroy             (GtkWidgetAuxInfo *aux_info);
 static AtkObject*      gtk_widget_real_get_accessible          (GtkWidget        *widget);
 static void            gtk_widget_accessible_interface_init    (AtkImplementorIface *iface);
 static AtkObject*      gtk_widget_ref_accessible               (AtkImplementor *implementor);
+static void             gtk_widget_invalidate_widget_windows    (GtkWidget        *widget,
+                                                                GdkRegion        *region);
+static GdkScreen *      gtk_widget_get_screen_unchecked         (GtkWidget        *widget);
+
+static void gtk_widget_set_usize_internal (GtkWidget *widget,
+                                          gint       width,
+                                          gint       height);
+
 
 /* --- variables --- */
 static gpointer         parent_class = NULL;
 static guint            widget_signals[LAST_SIGNAL] = { 0 };
 static GMemChunk       *aux_info_mem_chunk = NULL;
-static GdkColormap     *default_colormap = NULL;
 static GtkStyle        *gtk_default_style = NULL;
 static GSList          *colormap_stack = NULL;
 static guint            composite_child_stack = 0;
@@ -227,6 +234,8 @@ static GParamSpecPool  *style_property_spec_pool = NULL;
 
 static GQuark          quark_property_parser = 0;
 static GQuark          quark_aux_info = 0;
+static GQuark          quark_accel_path = 0;
+static GQuark          quark_accel_closures = 0;
 static GQuark          quark_event_mask = 0;
 static GQuark          quark_extension_event_mode = 0;
 static GQuark          quark_parent_window = 0;
@@ -239,23 +248,25 @@ GParamSpecPool         *_gtk_widget_child_property_pool = NULL;
 GObjectNotifyContext   *_gtk_widget_child_property_notify_context = NULL;
 
 /* --- functions --- */
-GtkType
+GType
 gtk_widget_get_type (void)
 {
-  static GtkType widget_type = 0;
+  static GType widget_type = 0;
   
   if (!widget_type)
     {
-      static const GtkTypeInfo widget_info =
+      static const GTypeInfo widget_info =
       {
-       "GtkWidget",
-       sizeof (GtkWidget),
        sizeof (GtkWidgetClass),
-       (GtkClassInitFunc) gtk_widget_class_init,
-       (GtkObjectInitFunc) gtk_widget_init,
-        /* reserved_1 */ NULL,
-       /* reserved_2 */ NULL,
-       (GtkClassInitFunc) NULL,
+       NULL,           /* base_init */
+       NULL,           /* base_finalize */
+       (GClassInitFunc) gtk_widget_class_init,
+       NULL,           /* class_finalize */
+       NULL,           /* class_init */
+       sizeof (GtkWidget),
+       0,              /* n_preallocs */
+       (GInstanceInitFunc) gtk_widget_init,
+       NULL,           /* value_table */
       };
       
       static const GInterfaceInfo accessibility_info =
@@ -265,8 +276,8 @@ gtk_widget_get_type (void)
         NULL /* interface data */
       };
 
-      widget_type = gtk_type_unique (GTK_TYPE_OBJECT, &widget_info);
+      widget_type = g_type_register_static (GTK_TYPE_OBJECT, "GtkWidget", 
+                                           &widget_info, G_TYPE_FLAG_ABSTRACT);
 
       g_type_add_interface_static (widget_type, ATK_TYPE_IMPLEMENTOR,
                                    &accessibility_info) ;
@@ -296,6 +307,8 @@ gtk_widget_class_init (GtkWidgetClass *klass)
 
   quark_property_parser = g_quark_from_static_string ("gtk-rc-property-parser");
   quark_aux_info = g_quark_from_static_string ("gtk-aux-info");
+  quark_accel_path = g_quark_from_static_string ("gtk-accel-path");
+  quark_accel_closures = g_quark_from_static_string ("gtk-accel-closures");
   quark_event_mask = g_quark_from_static_string ("gtk-event-mask");
   quark_extension_event_mode = g_quark_from_static_string ("gtk-extension-event-mode");
   quark_parent_window = g_quark_from_static_string ("gtk-parent-window");
@@ -338,8 +351,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
   klass->direction_changed = gtk_widget_direction_changed;
   klass->grab_notify = NULL;
   klass->child_notify = NULL;
-  klass->add_accelerator = (void*) gtk_accel_group_handle_add;
-  klass->remove_accelerator = (void*) gtk_accel_group_handle_remove;
   klass->mnemonic_activate = gtk_widget_real_mnemonic_activate;
   klass->grab_focus = gtk_widget_real_grab_focus;
   klass->focus = gtk_widget_real_focus;
@@ -360,10 +371,10 @@ gtk_widget_class_init (GtkWidgetClass *klass)
   klass->map_event = NULL;
   klass->unmap_event = NULL;
   klass->window_state_event = NULL;
-  klass->property_notify_event = gtk_selection_property_notify;
+  klass->property_notify_event = _gtk_selection_property_notify;
   klass->selection_clear_event = gtk_selection_clear;
-  klass->selection_request_event = gtk_selection_request;
-  klass->selection_notify_event = gtk_selection_notify;
+  klass->selection_request_event = _gtk_selection_request;
+  klass->selection_notify_event = _gtk_selection_notify;
   klass->selection_received = NULL;
   klass->proximity_in_event = NULL;
   klass->proximity_out_event = NULL;
@@ -374,6 +385,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
   klass->drag_motion = NULL;
   klass->drag_drop = NULL;
   klass->drag_data_received = NULL;
+  klass->screen_changed = NULL;
 
   klass->show_help = gtk_widget_real_show_help;
   
@@ -392,8 +404,8 @@ gtk_widget_class_init (GtkWidgetClass *klass)
   g_object_class_install_property (gobject_class,
                                   PROP_PARENT,
                                   g_param_spec_object ("parent",
-                                                       _("Parent widget"),
-                                                       _("The parent widget of this widget. Must be a Container widget."),
+                                                       _("Parent widget"), 
+                                                       _("The parent widget of this widget. Must be a Container widget"),
                                                        GTK_TYPE_CONTAINER,
                                                        G_PARAM_READWRITE));
 
@@ -401,7 +413,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                                   PROP_WIDTH_REQUEST,
                                   g_param_spec_int ("width_request",
                                                     _("Width request"),
-                                                    _("Override for width request of the widget, or -1 if natural request should be used."),
+                                                    _("Override for width request of the widget, or -1 if natural request should be used"),
                                                     -1,
                                                     G_MAXINT,
                                                     -1,
@@ -410,7 +422,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                                   PROP_HEIGHT_REQUEST,
                                   g_param_spec_int ("height_request",
                                                     _("Height request"),
-                                                    _("Override for height request of the widget, or -1 if natural request should be used."),
+                                                    _("Override for height request of the widget, or -1 if natural request should be used"),
                                                     -1,
                                                     G_MAXINT,
                                                     -1,
@@ -450,6 +462,13 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                                                         _("Whether the widget has the input focus"),
                                                         FALSE,
                                                         G_PARAM_READWRITE));
+  g_object_class_install_property (gobject_class,
+                                  PROP_HAS_FOCUS,
+                                  g_param_spec_boolean ("is_focus",
+                                                        _("Is focus"),
+                                                        _("Whether the widget is the focus widget within the toplevel"),
+                                                        FALSE,
+                                                        G_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_CAN_DEFAULT,
                                   g_param_spec_boolean ("can_default",
@@ -468,28 +487,28 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                                   PROP_RECEIVES_DEFAULT,
                                   g_param_spec_boolean ("receives_default",
                                                         _("Receives default"),
-                                                        _("If TRUE, the widget will receive the default action when it is focused."),
+                                                        _("If TRUE, the widget will receive the default action when it is focused"),
                                                         FALSE,
                                                         G_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_COMPOSITE_CHILD,
                                   g_param_spec_boolean ("composite_child",
                                                         _("Composite child"),
-                                                        _("Whether the widget is composed of other widgets"),
+                                                        _("Whether the widget is part of a composite widget"),
                                                         FALSE,
                                                         G_PARAM_READABLE));
   g_object_class_install_property (gobject_class,
                                   PROP_STYLE,
                                   g_param_spec_object ("style",
                                                        _("Style"),
-                                                       _("The style of the widget, which contains information about how it will look (colors etc)."),
+                                                       _("The style of the widget, which contains information about how it will look (colors etc)"),
                                                        GTK_TYPE_STYLE,
                                                        G_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_EVENTS,
                                   g_param_spec_flags ("events",
                                                       _("Events"),
-                                                      _("The event mask that decides what kind of GdkEvents this widget gets."),
+                                                      _("The event mask that decides what kind of GdkEvents this widget gets"),
                                                       GDK_TYPE_EVENT_MASK,
                                                       GDK_STRUCTURE_MASK,
                                                       G_PARAM_READWRITE));
@@ -497,433 +516,446 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                                   PROP_EXTENSION_EVENTS,
                                   g_param_spec_enum ("extension_events",
                                                      _("Extension events"),
-                                                     _("The mask that decides what kind of extension events this widget gets."),
+                                                     _("The mask that decides what kind of extension events this widget gets"),
                                                      GDK_TYPE_EXTENSION_MODE,
                                                      GDK_EXTENSION_EVENTS_NONE,
                                                      G_PARAM_READWRITE));
   widget_signals[SHOW] =
-    gtk_signal_new ("show",
-                   GTK_RUN_FIRST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, show),
-                   gtk_marshal_VOID__VOID,
-                   GTK_TYPE_NONE, 0);
+    g_signal_new ("show",
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_FIRST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, show),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__VOID,
+                 G_TYPE_NONE, 0);
   widget_signals[HIDE] =
-    gtk_signal_new ("hide",
-                   GTK_RUN_FIRST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, hide),
-                   gtk_marshal_VOID__VOID,
-                   GTK_TYPE_NONE, 0);
+    g_signal_new ("hide",
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_FIRST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, hide),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__VOID,
+                 G_TYPE_NONE, 0);
   widget_signals[MAP] =
-    gtk_signal_new ("map",
-                   GTK_RUN_FIRST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, map),
-                   gtk_marshal_VOID__VOID,
-                   GTK_TYPE_NONE, 0);
+    g_signal_new ("map",
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_FIRST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, map),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__VOID,
+                 G_TYPE_NONE, 0);
   widget_signals[UNMAP] =
-    gtk_signal_new ("unmap",
-                   GTK_RUN_FIRST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, unmap),
-                   gtk_marshal_VOID__VOID,
-                   GTK_TYPE_NONE, 0);
+    g_signal_new ("unmap",
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_FIRST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, unmap),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__VOID,
+                 G_TYPE_NONE, 0);
   widget_signals[REALIZE] =
-    gtk_signal_new ("realize",
-                   GTK_RUN_FIRST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, realize),
-                   gtk_marshal_VOID__VOID,
-                   GTK_TYPE_NONE, 0);
+    g_signal_new ("realize",
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_FIRST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, realize),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__VOID,
+                 G_TYPE_NONE, 0);
   widget_signals[UNREALIZE] =
-    gtk_signal_new ("unrealize",
-                   GTK_RUN_LAST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, unrealize),
-                   gtk_marshal_VOID__VOID,
-                   GTK_TYPE_NONE, 0);
+    g_signal_new ("unrealize",
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, unrealize),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__VOID,
+                 G_TYPE_NONE, 0);
   widget_signals[SIZE_REQUEST] =
     g_signal_new ("size_request",
-                  G_OBJECT_CLASS_TYPE (object_class),
-                  G_SIGNAL_RUN_FIRST,
-                  G_STRUCT_OFFSET (GtkWidgetClass, size_request),
-                  NULL, NULL,
-                  gtk_marshal_VOID__BOXED,
-                  GTK_TYPE_NONE, 1,
-                  GTK_TYPE_REQUISITION | G_SIGNAL_TYPE_STATIC_SCOPE);
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_FIRST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, size_request),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__BOXED,
+                 G_TYPE_NONE, 1,
+                 GTK_TYPE_REQUISITION | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[SIZE_ALLOCATE] = 
-    gtk_signal_new ("size_allocate",
-                   GTK_RUN_FIRST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, size_allocate),
-                   gtk_marshal_VOID__BOXED,
-                   GTK_TYPE_NONE, 1,
-                   GDK_TYPE_RECTANGLE | G_SIGNAL_TYPE_STATIC_SCOPE);
+    g_signal_new ("size_allocate",
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_FIRST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, size_allocate),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__BOXED,
+                 G_TYPE_NONE, 1,
+                 GDK_TYPE_RECTANGLE | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[STATE_CHANGED] =
-    gtk_signal_new ("state_changed",
-                   GTK_RUN_FIRST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, state_changed),
-                   gtk_marshal_VOID__ENUM,
-                   GTK_TYPE_NONE, 1,
-                   GTK_TYPE_STATE_TYPE);
+    g_signal_new ("state_changed",
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_FIRST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, state_changed),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__ENUM,
+                 G_TYPE_NONE, 1,
+                 GTK_TYPE_STATE_TYPE);
   widget_signals[PARENT_SET] =
-    gtk_signal_new ("parent_set",
-                   GTK_RUN_FIRST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, parent_set),
-                   gtk_marshal_VOID__OBJECT,
-                   GTK_TYPE_NONE, 1,
-                   GTK_TYPE_OBJECT);
+    g_signal_new ("parent_set",
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_FIRST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, parent_set),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__OBJECT,
+                 G_TYPE_NONE, 1,
+                 GTK_TYPE_WIDGET);
   widget_signals[HIERARCHY_CHANGED] =
-    gtk_signal_new ("hierarchy_changed",
-                   GTK_RUN_LAST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, hierarchy_changed),
-                   gtk_marshal_VOID__OBJECT,
-                   GTK_TYPE_NONE, 1,
-                   GTK_TYPE_WIDGET);
+    g_signal_new ("hierarchy_changed",
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, hierarchy_changed),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__OBJECT,
+                 G_TYPE_NONE, 1,
+                 GTK_TYPE_WIDGET);
   widget_signals[STYLE_SET] =
-    gtk_signal_new ("style_set",
-                   GTK_RUN_FIRST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, style_set),
-                   gtk_marshal_VOID__OBJECT,
-                   GTK_TYPE_NONE, 1,
-                   GTK_TYPE_STYLE);
+    g_signal_new ("style_set",
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_FIRST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, style_set),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__OBJECT,
+                 G_TYPE_NONE, 1,
+                 GTK_TYPE_STYLE);
   widget_signals[DIRECTION_CHANGED] =
-    gtk_signal_new ("direction_changed",
-                   GTK_RUN_FIRST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, direction_changed),
-                   gtk_marshal_VOID__ENUM,
-                   GTK_TYPE_NONE, 1,
-                   GTK_TYPE_TEXT_DIRECTION);
+    g_signal_new ("direction_changed",
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_FIRST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, direction_changed),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__ENUM,
+                 G_TYPE_NONE, 1,
+                 GTK_TYPE_TEXT_DIRECTION);
   widget_signals[GRAB_NOTIFY] =
-    gtk_signal_new ("grab_notify",
-                   GTK_RUN_FIRST,
-                   GTK_CLASS_TYPE (object_class),
-                    GTK_SIGNAL_OFFSET (GtkWidgetClass, grab_notify),
-                   gtk_marshal_VOID__BOOLEAN,
-                   GTK_TYPE_NONE, 1,
-                   GTK_TYPE_BOOL);
+    g_signal_new ("grab_notify",
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GtkWidgetClass, grab_notify),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__BOOLEAN,
+                 G_TYPE_NONE, 1,
+                 G_TYPE_BOOLEAN);
   widget_signals[CHILD_NOTIFY] =
     g_signal_new ("child_notify",
-                  G_TYPE_FROM_CLASS (klass),
+                  G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE | G_SIGNAL_DETAILED | G_SIGNAL_NO_HOOKS,
                   G_STRUCT_OFFSET (GtkWidgetClass, child_notify),
                   NULL, NULL,
                   g_cclosure_marshal_VOID__PARAM,
-                  G_TYPE_NONE,
-                  1, G_TYPE_PARAM);
-  widget_signals[ADD_ACCELERATOR] =
-    gtk_accel_group_create_add (GTK_CLASS_TYPE (object_class), GTK_RUN_LAST,
-                               GTK_SIGNAL_OFFSET (GtkWidgetClass, add_accelerator));
-  widget_signals[REMOVE_ACCELERATOR] =
-    gtk_accel_group_create_remove (GTK_CLASS_TYPE (object_class), GTK_RUN_LAST,
-                                  GTK_SIGNAL_OFFSET (GtkWidgetClass, remove_accelerator));
-  widget_signals[ACTIVATE_MNEMONIC] =
+                  G_TYPE_NONE, 1,
+                  G_TYPE_PARAM);
+  widget_signals[MNEMONIC_ACTIVATE] =
     g_signal_new ("mnemonic_activate",
-                  GTK_CLASS_TYPE (object_class),
-                  GTK_RUN_LAST,
-                  GTK_SIGNAL_OFFSET (GtkWidgetClass, mnemonic_activate),
-                  _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOOLEAN,
-                  GTK_TYPE_BOOL, 1,
-                  GTK_TYPE_BOOL);
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, mnemonic_activate),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__BOOLEAN,
+                 G_TYPE_BOOLEAN, 1,
+                 G_TYPE_BOOLEAN);
   widget_signals[GRAB_FOCUS] =
-    gtk_signal_new ("grab_focus",
-                   GTK_RUN_LAST | GTK_RUN_ACTION,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, grab_focus),
-                   gtk_marshal_VOID__VOID,
-                   GTK_TYPE_NONE, 0);
+    g_signal_new ("grab_focus",
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                 G_STRUCT_OFFSET (GtkWidgetClass, grab_focus),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__VOID,
+                 G_TYPE_NONE, 0);
   widget_signals[FOCUS] =
     g_signal_new ("focus",
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (GtkWidgetClass, focus),
-                  _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__ENUM,
-                  G_TYPE_BOOLEAN, 1,
-                  GTK_TYPE_DIRECTION_TYPE);
+                 G_TYPE_FROM_CLASS (object_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, focus),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__ENUM,
+                 G_TYPE_BOOLEAN, 1,
+                 GTK_TYPE_DIRECTION_TYPE);
   widget_signals[EVENT] =
     g_signal_new ("event",
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET(GtkWidgetClass, event),
-                  _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
-                  G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, event),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__BOXED,
+                 G_TYPE_BOOLEAN, 1,
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[EVENT_AFTER] =
     g_signal_new ("event-after",
-                  G_TYPE_FROM_CLASS (object_class),
-                  0,
-                  0,
-                  NULL, NULL,
-                  gtk_marshal_VOID__BOXED,
-                  G_TYPE_NONE, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 0,
+                 0,
+                 NULL, NULL,
+                 _gtk_marshal_VOID__BOXED,
+                 G_TYPE_NONE, 1,
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[BUTTON_PRESS_EVENT] =
     g_signal_new ("button_press_event",
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET(GtkWidgetClass, button_press_event),
-                  _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
-                  G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, button_press_event),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__BOXED,
+                 G_TYPE_BOOLEAN, 1,
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[BUTTON_RELEASE_EVENT] =
     g_signal_new ("button_release_event",
-                  G_TYPE_FROM_CLASS(object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET(GtkWidgetClass, button_release_event),
-                  _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
-                  G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, button_release_event),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__BOXED,
+                 G_TYPE_BOOLEAN, 1,
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[SCROLL_EVENT] =
     g_signal_new ("scroll_event",
-                  G_TYPE_FROM_CLASS(object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET(GtkWidgetClass, scroll_event),
-                  _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
-                  G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, scroll_event),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__BOXED,
+                 G_TYPE_BOOLEAN, 1,
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[MOTION_NOTIFY_EVENT] =
     g_signal_new ("motion_notify_event",
-                  G_TYPE_FROM_CLASS(object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET(GtkWidgetClass, motion_notify_event),
-                  _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
-                  G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, motion_notify_event),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__BOXED,
+                 G_TYPE_BOOLEAN, 1,
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[DELETE_EVENT] =
     g_signal_new ("delete_event",
-                  G_TYPE_FROM_CLASS(object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET(GtkWidgetClass, delete_event),
-                  _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
-                  G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, delete_event),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__BOXED,
+                 G_TYPE_BOOLEAN, 1,
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[DESTROY_EVENT] =
     g_signal_new ("destroy_event",
-                  G_TYPE_FROM_CLASS(object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET(GtkWidgetClass, destroy_event),
-                  _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
-                  G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, destroy_event),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__BOXED,
+                 G_TYPE_BOOLEAN, 1,
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[EXPOSE_EVENT] =
     g_signal_new ("expose_event",
-                  G_TYPE_FROM_CLASS(object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET(GtkWidgetClass, expose_event),
-                  _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
-                  G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, expose_event),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__BOXED,
+                 G_TYPE_BOOLEAN, 1,
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[KEY_PRESS_EVENT] =
     g_signal_new ("key_press_event",
-                  G_TYPE_FROM_CLASS(object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET(GtkWidgetClass, key_press_event),
-                  _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
-                  G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, key_press_event),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__BOXED,
+                 G_TYPE_BOOLEAN, 1,
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[KEY_RELEASE_EVENT] =
     g_signal_new ("key_release_event",
-                  G_TYPE_FROM_CLASS(object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET(GtkWidgetClass, key_release_event),
-                  _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
-                  G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, key_release_event),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__BOXED,
+                 G_TYPE_BOOLEAN, 1,
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[ENTER_NOTIFY_EVENT] =
     g_signal_new ("enter_notify_event",
-                  G_TYPE_FROM_CLASS(object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET(GtkWidgetClass, enter_notify_event),
-                  _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
-                  G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, enter_notify_event),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__BOXED,
+                 G_TYPE_BOOLEAN, 1,
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[LEAVE_NOTIFY_EVENT] =
     g_signal_new ("leave_notify_event",
-                  G_TYPE_FROM_CLASS(object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET(GtkWidgetClass, leave_notify_event),
-                  _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
-                  G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, leave_notify_event),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__BOXED,
+                 G_TYPE_BOOLEAN, 1,
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[CONFIGURE_EVENT] =
     g_signal_new ("configure_event",
-                  G_TYPE_FROM_CLASS(object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET(GtkWidgetClass, configure_event),
-                  _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
-                  G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, configure_event),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__BOXED,
+                 G_TYPE_BOOLEAN, 1,
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[FOCUS_IN_EVENT] =
     g_signal_new ("focus_in_event",
-                  G_TYPE_FROM_CLASS(object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET(GtkWidgetClass, focus_in_event),
-                  _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
-                  G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, focus_in_event),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__BOXED,
+                 G_TYPE_BOOLEAN, 1,
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[FOCUS_OUT_EVENT] =
     g_signal_new ("focus_out_event",
-                  G_TYPE_FROM_CLASS(object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET(GtkWidgetClass, focus_out_event),
-                  _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
-                  G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, focus_out_event),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__BOXED,
+                 G_TYPE_BOOLEAN, 1,
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[MAP_EVENT] =
     g_signal_new ("map_event",
-                  G_TYPE_FROM_CLASS(object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET(GtkWidgetClass, map_event),
-                  _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
-                  G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, map_event),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__BOXED,
+                 G_TYPE_BOOLEAN, 1,
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[UNMAP_EVENT] =
     g_signal_new ("unmap_event",
-                  G_TYPE_FROM_CLASS(object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET(GtkWidgetClass, unmap_event),
-                  _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
-                  G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, unmap_event),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__BOXED,
+                 G_TYPE_BOOLEAN, 1,
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[PROPERTY_NOTIFY_EVENT] =
     g_signal_new ("property_notify_event",
-                  G_TYPE_FROM_CLASS(object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET(GtkWidgetClass, property_notify_event),
-                  _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
-                  G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, property_notify_event),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__BOXED,
+                 G_TYPE_BOOLEAN, 1,
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[SELECTION_CLEAR_EVENT] =
     g_signal_new ("selection_clear_event",
-                  G_TYPE_FROM_CLASS(object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET(GtkWidgetClass, selection_clear_event),
-                  _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
-                  G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, selection_clear_event),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__BOXED,
+                 G_TYPE_BOOLEAN, 1,
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[SELECTION_REQUEST_EVENT] =
     g_signal_new ("selection_request_event",
-                  G_TYPE_FROM_CLASS(object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET(GtkWidgetClass, selection_request_event),
-                  _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
-                  G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, selection_request_event),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__BOXED,
+                 G_TYPE_BOOLEAN, 1,
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[SELECTION_NOTIFY_EVENT] =
     g_signal_new ("selection_notify_event",
-                  G_TYPE_FROM_CLASS(object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET(GtkWidgetClass, selection_notify_event),
-                  _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
-                  G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, selection_notify_event),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__BOXED,
+                 G_TYPE_BOOLEAN, 1,
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[SELECTION_RECEIVED] =
     g_signal_new ("selection_received",
-                 G_TYPE_FROM_CLASS (object_class),
+                 G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, selection_received),
                  NULL, NULL,
-                 gtk_marshal_VOID__BOXED_UINT,
+                 _gtk_marshal_VOID__BOXED_UINT,
                  G_TYPE_NONE, 2,
                  GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE,
                  G_TYPE_UINT);
   widget_signals[SELECTION_GET] =
     g_signal_new ("selection_get",
-                 G_TYPE_FROM_CLASS (object_class),
+                 G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, selection_get),
                  NULL, NULL,
-                 gtk_marshal_VOID__BOXED_UINT_UINT,
+                 _gtk_marshal_VOID__BOXED_UINT_UINT,
                  G_TYPE_NONE, 3,
                  GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE,
                  G_TYPE_UINT,
                  G_TYPE_UINT);
   widget_signals[PROXIMITY_IN_EVENT] =
     g_signal_new ("proximity_in_event",
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET(GtkWidgetClass, proximity_in_event),
-                  _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
-                  G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, proximity_in_event),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__BOXED,
+                 G_TYPE_BOOLEAN, 1,
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[PROXIMITY_OUT_EVENT] =
     g_signal_new ("proximity_out_event",
-                  G_TYPE_FROM_CLASS(object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET(GtkWidgetClass, proximity_out_event),
-                  _gtk_boolean_handled_accumulator, NULL,
-                  gtk_marshal_BOOLEAN__BOXED,
-                  G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, proximity_out_event),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__BOXED,
+                 G_TYPE_BOOLEAN, 1,
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[DRAG_LEAVE] =
-    gtk_signal_new ("drag_leave",
-                   GTK_RUN_LAST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_leave),
-                   gtk_marshal_VOID__OBJECT_UINT,
-                   GTK_TYPE_NONE, 2,
-                   GDK_TYPE_DRAG_CONTEXT,
-                   GTK_TYPE_UINT);
+    g_signal_new ("drag_leave",
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, drag_leave),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__OBJECT_UINT,
+                 G_TYPE_NONE, 2,
+                 GDK_TYPE_DRAG_CONTEXT,
+                 G_TYPE_UINT);
   widget_signals[DRAG_BEGIN] =
-    gtk_signal_new ("drag_begin",
-                   GTK_RUN_LAST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_begin),
-                   gtk_marshal_VOID__OBJECT,
-                   GTK_TYPE_NONE, 1,
-                   GDK_TYPE_DRAG_CONTEXT);
+    g_signal_new ("drag_begin",
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, drag_begin),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__OBJECT,
+                 G_TYPE_NONE, 1,
+                 GDK_TYPE_DRAG_CONTEXT);
   widget_signals[DRAG_END] =
-    gtk_signal_new ("drag_end",
-                   GTK_RUN_LAST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_end),
-                   gtk_marshal_VOID__OBJECT,
-                   GTK_TYPE_NONE, 1,
-                   GDK_TYPE_DRAG_CONTEXT);
+    g_signal_new ("drag_end",
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, drag_end),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__OBJECT,
+                 G_TYPE_NONE, 1,
+                 GDK_TYPE_DRAG_CONTEXT);
   widget_signals[DRAG_DATA_DELETE] =
-    gtk_signal_new ("drag_data_delete",
-                   GTK_RUN_LAST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_data_delete),
-                   gtk_marshal_VOID__OBJECT,
-                   GTK_TYPE_NONE, 1,
-                   GDK_TYPE_DRAG_CONTEXT);
+    g_signal_new ("drag_data_delete",
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, drag_data_delete),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__OBJECT,
+                 G_TYPE_NONE, 1,
+                 GDK_TYPE_DRAG_CONTEXT);
   widget_signals[DRAG_MOTION] =
     g_signal_new ("drag_motion",
-                  G_TYPE_FROM_CLASS(object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET(GtkWidgetClass, drag_motion),
-                  _gtk_boolean_handled_accumulator, NULL,
-                 gtk_marshal_BOOLEAN__OBJECT_INT_INT_UINT,
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, drag_motion),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__OBJECT_INT_INT_UINT,
                  G_TYPE_BOOLEAN, 4,
                  GDK_TYPE_DRAG_CONTEXT,
                  G_TYPE_INT,
@@ -931,11 +963,11 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_UINT);
   widget_signals[DRAG_DROP] =
     g_signal_new ("drag_drop",
-                  G_TYPE_FROM_CLASS(object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET(GtkWidgetClass, drag_drop),
-                  _gtk_boolean_handled_accumulator, NULL,
-                 gtk_marshal_BOOLEAN__OBJECT_INT_INT_UINT,
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, drag_drop),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__OBJECT_INT_INT_UINT,
                  G_TYPE_BOOLEAN, 4,
                  GDK_TYPE_DRAG_CONTEXT,
                  G_TYPE_INT,
@@ -943,11 +975,11 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_UINT);
   widget_signals[DRAG_DATA_GET] =
     g_signal_new ("drag_data_get",
-                 G_TYPE_FROM_CLASS (object_class),
+                 G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, drag_data_get),
                  NULL, NULL,
-                 gtk_marshal_VOID__OBJECT_BOXED_UINT_UINT,
+                 _gtk_marshal_VOID__OBJECT_BOXED_UINT_UINT,
                  G_TYPE_NONE, 4,
                  GDK_TYPE_DRAG_CONTEXT,
                  GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE,
@@ -955,11 +987,11 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_UINT);
   widget_signals[DRAG_DATA_RECEIVED] =
     g_signal_new ("drag_data_received",
-                 G_TYPE_FROM_CLASS (object_class),
+                 G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
-                 GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_data_received),
+                 G_STRUCT_OFFSET (GtkWidgetClass, drag_data_received),
                  NULL, NULL,
-                 gtk_marshal_VOID__OBJECT_INT_INT_BOXED_UINT_UINT,
+                 _gtk_marshal_VOID__OBJECT_INT_INT_BOXED_UINT_UINT,
                  G_TYPE_NONE, 6,
                  GDK_TYPE_DRAG_CONTEXT,
                  G_TYPE_INT,
@@ -969,54 +1001,74 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_UINT);
   widget_signals[VISIBILITY_NOTIFY_EVENT] =
     g_signal_new ("visibility_notify_event",
-                 G_TYPE_FROM_CLASS(object_class),
+                 G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
-                 G_STRUCT_OFFSET(GtkWidgetClass, visibility_notify_event),
-                  _gtk_boolean_handled_accumulator, NULL,
-                 gtk_marshal_BOOLEAN__BOXED,
+                 G_STRUCT_OFFSET (GtkWidgetClass, visibility_notify_event),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__BOXED,
                  G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[CLIENT_EVENT] =
     g_signal_new ("client_event",
-                 G_TYPE_FROM_CLASS(object_class),
+                 G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
-                 G_STRUCT_OFFSET(GtkWidgetClass, client_event),
+                 G_STRUCT_OFFSET (GtkWidgetClass, client_event),
                  _gtk_boolean_handled_accumulator, NULL,
-                 gtk_marshal_BOOLEAN__BOXED,
+                 _gtk_marshal_BOOLEAN__BOXED,
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[NO_EXPOSE_EVENT] =
     g_signal_new ("no_expose_event",
-                 G_TYPE_FROM_CLASS(object_class),
+                 G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
-                 G_STRUCT_OFFSET(GtkWidgetClass, no_expose_event),
+                 G_STRUCT_OFFSET (GtkWidgetClass, no_expose_event),
                  _gtk_boolean_handled_accumulator, NULL,
-                 gtk_marshal_BOOLEAN__BOXED,
+                 _gtk_marshal_BOOLEAN__BOXED,
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[WINDOW_STATE_EVENT] =
     g_signal_new ("window_state_event",
-                 G_TYPE_FROM_CLASS(object_class),
+                 G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
-                 G_STRUCT_OFFSET(GtkWidgetClass, window_state_event),
+                 G_STRUCT_OFFSET (GtkWidgetClass, window_state_event),
                  _gtk_boolean_handled_accumulator, NULL,
-                 gtk_marshal_BOOLEAN__BOXED,
+                 _gtk_marshal_BOOLEAN__BOXED,
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[POPUP_MENU] =
-    gtk_signal_new ("popup_menu",
-                   GTK_RUN_LAST | GTK_RUN_ACTION,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, popup_menu),
-                    gtk_marshal_NONE__NONE,
-                   GTK_TYPE_NONE, 0);
+    g_signal_new ("popup_menu",
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                 G_STRUCT_OFFSET (GtkWidgetClass, popup_menu),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__VOID,
+                 G_TYPE_BOOLEAN, 0);
   widget_signals[SHOW_HELP] =
-    gtk_signal_new ("show_help",
-                   GTK_RUN_LAST | GTK_RUN_ACTION,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, show_help),
-                    gtk_marshal_NONE__ENUM,
-                   GTK_TYPE_NONE, 1, GTK_TYPE_WIDGET_HELP_TYPE);
+    g_signal_new ("show_help",
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                 G_STRUCT_OFFSET (GtkWidgetClass, show_help),
+                 _gtk_boolean_handled_accumulator, NULL,
+                 _gtk_marshal_BOOLEAN__ENUM,
+                 G_TYPE_BOOLEAN, 1,
+                 GTK_TYPE_WIDGET_HELP_TYPE);
+  widget_signals[ACCEL_CLOSURES_CHANGED] =
+    g_signal_new ("accel_closures_changed",
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 0,
+                 0,
+                 NULL, NULL,
+                 _gtk_marshal_NONE__NONE,
+                 G_TYPE_NONE, 0);
+  widget_signals[SCREEN_CHANGED] =
+    g_signal_new ("screen_changed",
+                 G_TYPE_FROM_CLASS (gobject_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, screen_changed),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__OBJECT,
+                 G_TYPE_NONE, 1,
+                 GDK_TYPE_SCREEN);
   
   binding_set = gtk_binding_set_by_class (klass);
   gtk_binding_entry_add_signal (binding_set, GDK_F10, GDK_SHIFT_MASK,
@@ -1032,7 +1084,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                                 "show_help", 1,
                                 GTK_TYPE_WIDGET_HELP_TYPE,
                                 GTK_WIDGET_HELP_TOOLTIP);
-  
   gtk_binding_entry_add_signal (binding_set, GDK_F1, GDK_SHIFT_MASK,
                                 "show_help", 1,
                                 GTK_TYPE_WIDGET_HELP_TYPE,
@@ -1045,9 +1096,47 @@ gtk_widget_class_init (GtkWidgetClass *klass)
   gtk_widget_class_install_style_property (klass,
                                           g_param_spec_boolean ("interior_focus",
                                                                 _("Interior Focus"),
-                                                                _("Whether to draw the focus indicator inside widgets."),
+                                                                _("Whether to draw the focus indicator inside widgets"),
                                                                 TRUE,
                                                                 G_PARAM_READABLE));
+
+  gtk_widget_class_install_style_property (klass,
+                                          g_param_spec_int ("focus-line-width",
+                                                            _("Focus linewidth"),
+                                                            _("Width, in pixels, of the focus indicator line"),
+                                                            0, G_MAXINT, 1,
+                                                            G_PARAM_READWRITE));
+
+  gtk_widget_class_install_style_property (klass,
+                                          g_param_spec_string ("focus-line-pattern",
+                                                               _("Focus line dash pattern"),
+                                                               _("Dash pattern used to draw the focus indicator"),
+                                                               "\1\1",
+                                                               G_PARAM_READWRITE));
+  gtk_widget_class_install_style_property (klass,
+                                          g_param_spec_int ("focus-padding",
+                                                            _("Focus padding"),
+                                                            _("Width, in pixels, between focus indicator and the widget 'box'"),
+                                                            0, G_MAXINT, 1,
+                                                            G_PARAM_READWRITE));
+  gtk_widget_class_install_style_property (klass,
+                                          g_param_spec_boxed ("cursor-color",
+                                                              _("Cursor color"),
+                                                              _("Color with which to draw insertion cursor"),
+                                                              GDK_TYPE_COLOR,
+                                                              G_PARAM_READABLE));
+  gtk_widget_class_install_style_property (klass,
+                                          g_param_spec_boxed ("secondary-cursor-color",
+                                                              _("Secondary cursor color"),
+                                                              _("Color with which to draw the secondary insertion cursor when editing mixed right-to-left and left-to-right text"),
+                                                              GDK_TYPE_COLOR,
+                                                              G_PARAM_READABLE));
+  gtk_widget_class_install_style_property (klass,
+                                          g_param_spec_float ("cursor-aspect-ratio",
+                                                              _("Cursor line aspect ratio"),
+                                                              _("Aspect ratio with which to draw insertion cursor"),
+                                                              0.0, 1.0, 0.04,
+                                                              G_PARAM_READABLE));
 }
 
 static void
@@ -1056,9 +1145,7 @@ gtk_widget_set_property (GObject         *object,
                         const GValue    *value,
                         GParamSpec      *pspec)
 {
-  GtkWidget *widget;
-
-  widget = GTK_WIDGET (object);
+  GtkWidget *widget = GTK_WIDGET (object);
 
   switch (prop_id)
     {
@@ -1071,10 +1158,10 @@ gtk_widget_set_property (GObject         *object,
       gtk_container_add (GTK_CONTAINER (g_value_get_object (value)), widget);
       break;
     case PROP_WIDTH_REQUEST:
-      gtk_widget_set_usize (widget, g_value_get_int (value), -2);
+      gtk_widget_set_usize_internal (widget, g_value_get_int (value), -2);
       break;
     case PROP_HEIGHT_REQUEST:
-      gtk_widget_set_usize (widget, -2, g_value_get_int (value));
+      gtk_widget_set_usize_internal (widget, -2, g_value_get_int (value));
       break;
     case PROP_VISIBLE:
       if (g_value_get_boolean (value))
@@ -1101,6 +1188,10 @@ gtk_widget_set_property (GObject         *object,
       if (g_value_get_boolean (value))
        gtk_widget_grab_focus (widget);
       break;
+    case PROP_IS_FOCUS:
+      if (g_value_get_boolean (value))
+       gtk_widget_grab_focus (widget);
+      break;
     case PROP_CAN_DEFAULT:
       saved_flags = GTK_WIDGET_FLAGS (widget);
       if (g_value_get_boolean (value))
@@ -1141,9 +1232,7 @@ gtk_widget_get_property (GObject         *object,
                         GValue          *value,
                         GParamSpec      *pspec)
 {
-  GtkWidget *widget;
-
-  widget = GTK_WIDGET (object);
+  GtkWidget *widget = GTK_WIDGET (object);
   
   switch (prop_id)
     {
@@ -1158,7 +1247,7 @@ gtk_widget_get_property (GObject         *object,
       break;
     case PROP_PARENT:
       if (widget->parent)
-       g_value_set_object (value, G_OBJECT (widget->parent));
+       g_value_set_object (value, widget->parent);
       else
        g_value_set_object (value, NULL);
       break;
@@ -1191,6 +1280,9 @@ gtk_widget_get_property (GObject         *object,
     case PROP_HAS_FOCUS:
       g_value_set_boolean (value, (GTK_WIDGET_HAS_FOCUS (widget) != FALSE));
       break;
+    case PROP_IS_FOCUS:
+      g_value_set_boolean (value, (gtk_widget_is_focus (widget)));
+      break;
     case PROP_CAN_DEFAULT:
       g_value_set_boolean (value, (GTK_WIDGET_CAN_DEFAULT (widget) != FALSE));
       break;
@@ -1204,17 +1296,17 @@ gtk_widget_get_property (GObject         *object,
       g_value_set_boolean (value, (GTK_WIDGET_COMPOSITE_CHILD (widget) != FALSE));
       break;
     case PROP_STYLE:
-      g_value_set_object (value, G_OBJECT (gtk_widget_get_style (widget)));
+      g_value_set_object (value, gtk_widget_get_style (widget));
       break;
     case PROP_EVENTS:
-      eventp = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_event_mask);
+      eventp = g_object_get_qdata (G_OBJECT (widget), quark_event_mask);
       if (!eventp)
        g_value_set_flags (value, 0);
       else
        g_value_set_flags (value, *eventp);
       break;
     case PROP_EXTENSION_EVENTS:
-      modep = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_extension_event_mode);
+      modep = g_object_get_qdata (G_OBJECT (widget), quark_extension_event_mode);
       if (!modep)
        g_value_set_enum (value, 0);
       else
@@ -1248,6 +1340,10 @@ gtk_widget_init (GtkWidget *widget)
                        (composite_child_stack ? GTK_COMPOSITE_CHILD : 0) |
                        GTK_DOUBLE_BUFFERED);
 
+  GTK_PRIVATE_SET_FLAG (widget, GTK_REDRAW_ON_ALLOC);
+  GTK_PRIVATE_SET_FLAG (widget, GTK_REQUEST_NEEDED);
+  GTK_PRIVATE_SET_FLAG (widget, GTK_ALLOC_NEEDED);
+
   widget->style = gtk_widget_get_default_style ();
   g_object_ref (widget->style);
 }
@@ -1265,6 +1361,15 @@ gtk_widget_dispatch_child_properties_changed (GtkWidget   *widget,
     g_signal_emit (widget, widget_signals[CHILD_NOTIFY], g_quark_from_string (pspecs[i]->name), pspecs[i]);
 }
 
+/**
+ * gtk_widget_freeze_child_notify:
+ * @widget: a #GtkWidget
+ * 
+ * Stops emission of "child-notify" signals on @widget. The signals are
+ * queued until gtk_widget_thaw_child_notify() is called on @widget. 
+ *
+ * This is the analogue of g_object_freeze_notify() for child properties.
+ **/
 void
 gtk_widget_freeze_child_notify (GtkWidget *widget)
 {
@@ -1278,6 +1383,18 @@ gtk_widget_freeze_child_notify (GtkWidget *widget)
   g_object_unref (widget);
 }
 
+/**
+ * gtk_widget_child_notify:
+ * @widget: a #GtkWidget
+ * @child_property: the name of a child property installed on the 
+ *                  class of @widget<!-- -->'s parent.
+ * 
+ * Emits a "child-notify" signal for the 
+ * <link linkend="child-properties">child property</link> @child_property 
+ * on @widget.
+ *
+ * This is the analogue of g_object_notify() for child properties.
+ **/
 void
 gtk_widget_child_notify (GtkWidget    *widget,
                         const gchar  *child_property)
@@ -1309,6 +1426,13 @@ gtk_widget_child_notify (GtkWidget    *widget,
   g_object_unref (widget);
 }
 
+/**
+ * gtk_widget_thaw_child_notify:
+ * @widget: a #GtkWidget
+ *
+ * Reverts the effect of a previous call to gtk_widget_freeze_child_notify().
+ * This causes all queued "child-notify" signals on @widget to be emitted.
+ */ 
 void
 gtk_widget_thaw_child_notify (GtkWidget *widget)
 {
@@ -1334,26 +1458,26 @@ gtk_widget_thaw_child_notify (GtkWidget *widget)
  * gtk_widget_new:
  * @type: type ID of the widget to create
  * @first_property_name: name of first property to set
- * @Varargs: value of first property, followed by more properties, NULL-terminated
+ * @Varargs: value of first property, followed by more properties, %NULL-terminated
  * 
  * This is a convenience function for creating a widget and setting
  * its properties in one go. For example you might write:
- * gtk_widget_new (GTK_TYPE_LABEL, "label", "Hello World", "xalign",
- * 0.0, NULL) to create a left-aligned label. Equivalent to
- * gtk_object_new(), but returns a widget so you don't have to
+ * <literal>gtk_widget_new (GTK_TYPE_LABEL, "label", "Hello World", "xalign",
+ * 0.0, NULL)</literal> to create a left-aligned label. Equivalent to
+ * g_object_new(), but returns a widget so you don't have to
  * cast the object yourself.
  * 
  * Return value: a new #GtkWidget of type @widget_type
  **/
 GtkWidget*
-gtk_widget_new (GtkType      type,
+gtk_widget_new (GType        type,
                const gchar *first_property_name,
                ...)
 {
   GtkWidget *widget;
   va_list var_args;
   
-  g_return_val_if_fail (gtk_type_is_a (type, GTK_TYPE_WIDGET), NULL);
+  g_return_val_if_fail (g_type_is_a (type, GTK_TYPE_WIDGET), NULL);
   
   va_start (var_args, first_property_name);
   widget = (GtkWidget *)g_object_new_valist (type, first_property_name, var_args);
@@ -1366,10 +1490,10 @@ gtk_widget_new (GtkType      type,
  * gtk_widget_set:
  * @widget: a #GtkWidget
  * @first_property_name: name of first property to set
- * @Varargs: value of first property, followed by more properties, NULL-terminated
+ * @Varargs: value of first property, followed by more properties, %NULL-terminated
  * 
- * Like gtk_object_set() - there's no reason to use this instead of
- * gtk_object_set().
+ * Like g_object_set() - there's no reason to use this instead of
+ * g_object_set().
  **/
 void
 gtk_widget_set (GtkWidget   *widget,
@@ -1386,17 +1510,17 @@ gtk_widget_set (GtkWidget   *widget,
 }
 
 static inline void        
-gtk_widget_queue_clear_child (GtkWidget *widget)
+gtk_widget_queue_draw_child (GtkWidget *widget)
 {
   GtkWidget *parent;
 
   parent = widget->parent;
   if (parent && GTK_WIDGET_DRAWABLE (parent))
-    gtk_widget_queue_clear_area (parent,
-                                widget->allocation.x,
-                                widget->allocation.y,
-                                widget->allocation.width,
-                                widget->allocation.height);
+    gtk_widget_queue_draw_area (parent,
+                               widget->allocation.x,
+                               widget->allocation.y,
+                               widget->allocation.width,
+                               widget->allocation.height);
 }
 
 /**
@@ -1412,7 +1536,6 @@ gtk_widget_unparent (GtkWidget *widget)
 {
   GObjectNotifyQueue *nqueue;
   GtkWidget *toplevel;
-  GtkWidget *ancestor;
   GtkWidget *old_parent;
   
   g_return_if_fail (GTK_IS_WIDGET (widget));
@@ -1425,41 +1548,12 @@ gtk_widget_unparent (GtkWidget *widget)
   g_object_freeze_notify (G_OBJECT (widget));
   nqueue = g_object_notify_queue_freeze (G_OBJECT (widget), _gtk_widget_child_property_notify_context);
 
-  /* unset focused and default children properly, this code
-   * 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)
-    {
-      gtk_container_set_focus_child (GTK_CONTAINER (widget->parent), NULL);
-
-      if (GTK_WIDGET_TOPLEVEL (toplevel))
-       {
-         GtkWidget *child;
-      
-         child = GTK_WINDOW (toplevel)->focus_widget;
-         
-         while (child && child != widget)
-           child = child->parent;
-         
-         if (child == widget)
-           gtk_window_set_focus (GTK_WINDOW (toplevel), NULL);
-       }
-    }
   if (GTK_WIDGET_TOPLEVEL (toplevel))
-    {
-      GtkWidget *child;
-      
-      child = GTK_WINDOW (toplevel)->default_widget;
-      
-      while (child && child != widget)
-       child = child->parent;
-      
-      if (child == widget)
-       gtk_window_set_default (GTK_WINDOW (toplevel), NULL);
-    }
+    _gtk_window_unset_focus_and_default (GTK_WINDOW (toplevel), widget);
+
+  if (GTK_CONTAINER (widget->parent)->focus_child == widget)
+    gtk_container_set_focus_child (GTK_CONTAINER (widget->parent), NULL);
 
   /* If we are unanchoring the child, we save around the toplevel
    * to emit hierarchy changed
@@ -1469,65 +1563,7 @@ gtk_widget_unparent (GtkWidget *widget)
   else
     toplevel = NULL;
 
-  if (GTK_IS_RESIZE_CONTAINER (widget))
-    gtk_container_clear_resize_widgets (GTK_CONTAINER (widget));
-  
-  /* Remove the widget and all its children from any ->resize_widgets list
-   * of all the parents in our branch. This code should move into gtkcontainer.c
-   * somwhen, since we mess around with ->resize_widgets, which is
-   * actually not of our business.
-   *
-   * Two ways to make this prettier:
-   *   Write a g_slist_conditional_remove (GSList, gboolean (*)(gpointer))
-   *   Change resize_widgets to a GList
-   */
-  ancestor = widget->parent;
-  while (ancestor)
-    {
-      GSList *slist;
-      GSList *prev;
-
-      if (!GTK_CONTAINER (ancestor)->resize_widgets)
-       {
-         ancestor = ancestor->parent;
-         continue;
-       }
-
-      prev = NULL;
-      slist = GTK_CONTAINER (ancestor)->resize_widgets;
-      while (slist)
-       {
-         GtkWidget *child;
-         GtkWidget *parent;
-         GSList *last;
-
-         last = slist;
-         slist = last->next;
-         child = last->data;
-         
-         parent = child;
-         while (parent && (parent != widget))
-           parent = parent->parent;
-         
-         if (parent == widget)
-           {
-             GTK_PRIVATE_UNSET_FLAG (child, GTK_RESIZE_NEEDED);
-             
-             if (prev)
-               prev->next = slist;
-             else
-               GTK_CONTAINER (ancestor)->resize_widgets = slist;
-             
-             g_slist_free_1 (last);
-           }
-         else
-           prev = last;
-       }
-
-      ancestor = ancestor->parent;
-    }
-
-  gtk_widget_queue_clear_child (widget);
+  gtk_widget_queue_draw_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
@@ -1549,7 +1585,7 @@ gtk_widget_unparent (GtkWidget *widget)
   old_parent = widget->parent;
   widget->parent = NULL;
   gtk_widget_set_parent_window (widget, NULL);
-  gtk_signal_emit (GTK_OBJECT (widget), widget_signals[PARENT_SET], old_parent);
+  g_signal_emit (widget, widget_signals[PARENT_SET], 0, old_parent);
   if (toplevel)
     {
       _gtk_widget_propagate_hierarchy_changed (widget, toplevel);
@@ -1561,7 +1597,7 @@ gtk_widget_unparent (GtkWidget *widget)
   if (!widget->parent)
     g_object_notify_queue_clear (G_OBJECT (widget), nqueue);
   g_object_notify_queue_thaw (G_OBJECT (widget), nqueue);
-  gtk_widget_unref (widget);
+  g_object_unref (widget);
 }
 
 /**
@@ -1577,7 +1613,7 @@ gtk_widget_unparent (GtkWidget *widget)
  * reference GTK+ holds to it will be removed. Removing a
  * widget from its container or the list of toplevels results in the
  * widget being finalized, unless you've added additional references
- * to the widget with gtk_object_ref().
+ * to the widget with g_object_ref().
  *
  * In most cases, only toplevel widgets (windows) require explicit
  * destruction, because when you destroy a toplevel its children will
@@ -1597,12 +1633,12 @@ gtk_widget_destroy (GtkWidget *widget)
  * @widget: a #GtkWidget
  * @widget_pointer: address of a variable that contains @widget
  *
- * This function sets *@widget_pointer to NULL if @widget_pointer !=
- * NULL.  It's intended to be used as a callback connected to the
+ * This function sets *@widget_pointer to %NULL if @widget_pointer !=
+ * %NULL.  It's intended to be used as a callback connected to the
  * "destroy" signal of a widget. You connect gtk_widget_destroyed()
  * as a signal handler, and pass the address of your widget variable
  * as user data. Then when the widget is destroyed, the variable will
- * be set to NULL. Useful for example to avoid multiple copies
+ * be set to %NULL. Useful for example to avoid multiple copies
  * of the same dialog.
  * 
  **/
@@ -1638,24 +1674,20 @@ gtk_widget_destroyed (GtkWidget      *widget,
 void
 gtk_widget_show (GtkWidget *widget)
 {
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-  
   if (!GTK_WIDGET_VISIBLE (widget))
     {
-      g_object_ref (G_OBJECT (widget));
+      g_object_ref (widget);
       if (!GTK_WIDGET_TOPLEVEL (widget))
        gtk_widget_queue_resize (widget);
-      gtk_signal_emit (GTK_OBJECT (widget), widget_signals[SHOW]);
+      g_signal_emit (widget, widget_signals[SHOW], 0);
       g_object_notify (G_OBJECT (widget), "visible");
-      g_object_unref (G_OBJECT (widget));
+      g_object_unref (widget);
     }
 }
 
 static void
 gtk_widget_real_show (GtkWidget *widget)
 {
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-  
   if (!GTK_WIDGET_VISIBLE (widget))
     {
       GTK_WIDGET_SET_FLAGS (widget, GTK_VISIBLE);
@@ -1672,7 +1704,9 @@ static void
 gtk_widget_show_map_callback (GtkWidget *widget, GdkEvent *event, gint *flag)
 {
   *flag = TRUE;
-  gtk_signal_disconnect_by_data (GTK_OBJECT (widget), flag);
+  g_signal_handlers_disconnect_by_func (widget,
+                                       gtk_widget_show_map_callback, 
+                                       flag);
 }
 
 /**
@@ -1698,12 +1732,12 @@ gtk_widget_show_now (GtkWidget *widget)
     {
       gtk_widget_show (widget);
 
-      gtk_signal_connect (GTK_OBJECT (widget), "map_event",
-                         GTK_SIGNAL_FUNC (gtk_widget_show_map_callback), 
-                         &flag);
+      g_signal_connect (widget, "map_event",
+                       G_CALLBACK (gtk_widget_show_map_callback), 
+                       &flag);
 
       while (!flag)
-       gtk_main_iteration();
+       gtk_main_iteration ();
     }
   else
     gtk_widget_show (widget);
@@ -1723,20 +1757,22 @@ gtk_widget_hide (GtkWidget *widget)
   
   if (GTK_WIDGET_VISIBLE (widget))
     {
-      gtk_widget_ref (widget);
-      gtk_signal_emit (GTK_OBJECT (widget), widget_signals[HIDE]);
-      if (!GTK_WIDGET_TOPLEVEL (widget) && GTK_WIDGET_REALIZED (widget))
+      GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
+      if (toplevel != widget && GTK_WIDGET_TOPLEVEL (toplevel))
+       _gtk_window_unset_focus_and_default (GTK_WINDOW (toplevel), widget);
+
+      g_object_ref (widget);
+      g_signal_emit (widget, widget_signals[HIDE], 0);
+      if (!GTK_WIDGET_TOPLEVEL (widget))
        gtk_widget_queue_resize (widget);
       g_object_notify (G_OBJECT (widget), "visible");
-      gtk_widget_unref (widget);
+      g_object_unref (widget);
     }
 }
 
 static void
 gtk_widget_real_hide (GtkWidget *widget)
 {
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-  
   if (GTK_WIDGET_VISIBLE (widget))
     {
       GTK_WIDGET_UNSET_FLAGS (widget, GTK_VISIBLE);
@@ -1752,10 +1788,11 @@ gtk_widget_real_hide (GtkWidget *widget)
  * 
  * Utility function; intended to be connected to the "delete_event"
  * signal on a #GtkWindow. The function calls gtk_widget_hide() on its
- * argument, then returns %TRUE. If connected to "delete_event",
- * the result is that clicking the window manager close button for
- * will hide but not destroy the window. By default, GTK+ destroys
- * windows when "delete_event" is received.
+ * argument, then returns %TRUE. If connected to "delete_event", the
+ * result is that clicking the close button for a window (on the
+ * window frame, top right corner usually) will hide but not destroy
+ * the window. By default, GTK+ destroys windows when "delete_event"
+ * is received.
  * 
  * Return value: %TRUE
  **/
@@ -1828,10 +1865,10 @@ gtk_widget_map (GtkWidget *widget)
       if (!GTK_WIDGET_REALIZED (widget))
        gtk_widget_realize (widget);
 
-      gtk_signal_emit (GTK_OBJECT (widget), widget_signals[MAP]);
+      g_signal_emit (widget, widget_signals[MAP], 0);
 
       if (GTK_WIDGET_NO_WINDOW (widget))
-       gtk_widget_queue_draw (widget);
+       gdk_window_invalidate_rect (widget->window, &widget->allocation, FALSE);
     }
 }
 
@@ -1851,8 +1888,8 @@ gtk_widget_unmap (GtkWidget *widget)
   if (GTK_WIDGET_MAPPED (widget))
     {
       if (GTK_WIDGET_NO_WINDOW (widget))
-       gtk_widget_queue_clear_child (widget);
-      gtk_signal_emit (GTK_OBJECT (widget), widget_signals[UNMAP]);
+       gdk_window_invalidate_rect (widget->window, &widget->allocation, FALSE);
+      g_signal_emit (widget, widget_signals[UNMAP], 0);
     }
 }
 
@@ -1861,7 +1898,7 @@ gtk_widget_unmap (GtkWidget *widget)
  * @widget: a #GtkWidget
  * 
  * Creates the GDK (windowing system) resources associated with a
- * widget.  For example, widget->window will be created when a widget
+ * widget.  For example, @widget->window will be created when a widget
  * is realized.  Normally realization happens implicitly; if you show
  * a widget and all its parent containers, then the widget will be
  * realized and mapped automatically.
@@ -1876,7 +1913,7 @@ gtk_widget_unmap (GtkWidget *widget)
  * isn't very useful otherwise. Many times when you think you might
  * need it, a better approach is to connect to a signal that will be
  * called after the widget is realized automatically, such as
- * "expose_event". Or simply gtk_signal_connect_after() to the
+ * "expose_event". Or simply g_signal_connect_after() to the
  * "realize" signal.
  *  
  **/
@@ -1893,7 +1930,7 @@ gtk_widget_realize (GtkWidget *widget)
     {
       /*
        if (GTK_IS_CONTAINER (widget) && !GTK_WIDGET_NO_WINDOW (widget))
-         g_message ("gtk_widget_realize(%s)", gtk_type_name (GTK_WIDGET_TYPE (widget)));
+         g_message ("gtk_widget_realize(%s)", g_type_name (GTK_WIDGET_TYPE (widget)));
       */
 
       if (widget->parent == NULL &&
@@ -1907,11 +1944,11 @@ gtk_widget_realize (GtkWidget *widget)
 
       gtk_widget_ensure_style (widget);
       
-      gtk_signal_emit (GTK_OBJECT (widget), widget_signals[REALIZE]);
+      g_signal_emit (widget, widget_signals[REALIZE], 0);
       
       if (GTK_WIDGET_HAS_SHAPE_MASK (widget))
        {
-         shape_info = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_shape_info);
+         shape_info = g_object_get_qdata (G_OBJECT (widget), quark_shape_info);
          gdk_window_shape_combine_mask (widget->window,
                                         shape_info->shape_mask,
                                         shape_info->offset_x,
@@ -1937,7 +1974,7 @@ gtk_widget_realize (GtkWidget *widget)
  *
  * This function is only useful in widget implementations.
  * Causes a widget to be unrealized (frees all GDK resources
- * associated with the widget, such as widget->window).
+ * associated with the widget, such as @widget->window).
  * 
  **/
 void
@@ -1950,10 +1987,10 @@ gtk_widget_unrealize (GtkWidget *widget)
 
   if (GTK_WIDGET_REALIZED (widget))
     {
-      gtk_widget_ref (widget);
-      gtk_signal_emit (GTK_OBJECT (widget), widget_signals[UNREALIZE]);
+      g_object_ref (widget);
+      g_signal_emit (widget, widget_signals[UNREALIZE], 0);
       GTK_WIDGET_UNSET_FLAGS (widget, GTK_REALIZED | GTK_MAPPED);
-      gtk_widget_unref (widget);
+      g_object_unref (widget);
     }
 }
 
@@ -1997,61 +2034,19 @@ gtk_widget_queue_draw_area (GtkWidget *widget,
                            gint       y,
                            gint       width,
                            gint       height)
-{
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-
-  gtk_widget_queue_clear_area (widget, x, y, width, height);
-}
-
-/**
- * gtk_widget_queue_draw:
- * @widget: a #GtkWidget
- *
- * Equivalent to calling gtk_widget_queue_draw_area() for the
- * entire area of a widget.
- * 
- **/
-void      
-gtk_widget_queue_draw (GtkWidget *widget)
-{
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-
-  gtk_widget_queue_clear (widget);
-}
-
-/* Invalidates the given area (allocation-relative-coordinates)
- * in all of the widget's windows
- */
-/**
- * gtk_widget_queue_clear_area:
- * @widget: a #GtkWidget
- * @x: x coordinate of upper-left corner of rectangle to redraw
- * @y: y coordinate of upper-left corner of rectangle to redraw
- * @width: width of region to draw
- * @height: height of region to draw
- * 
- * DEPRECATED. This function is no longer different from
- * gtk_widget_queue_draw_area(), though it once was. Now it just calls
- * gtk_widget_queue_draw_area(). Originally
- * gtk_widget_queue_clear_area() would force a redraw of the
- * background for GTK_NO_WINDOW widgets, and
- * gtk_widget_queue_draw_area() would not. Now both functions ensure
- * the background will be redrawn.
- * 
- **/
-void      
-gtk_widget_queue_clear_area (GtkWidget *widget,
-                            gint       x,
-                            gint       y,
-                            gint       width,
-                            gint       height)
 {
   GdkRectangle invalid_rect;
+  GtkWidget *w;
   
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
-  if (!(widget->window && gdk_window_is_viewable (widget->window)))
+  if (!GTK_WIDGET_REALIZED (widget))
     return;
+  
+  /* Just return if the widget or one of its ancestors isn't mapped */
+  for (w = widget; w != NULL; w = w->parent)
+    if (!GTK_WIDGET_MAPPED (w))
+      return;
 
   /* Find the correct widget */
 
@@ -2067,7 +2062,7 @@ gtk_widget_queue_clear_area (GtkWidget *widget,
          x -= wx - widget->allocation.x;
          y -= wy - widget->allocation.y;
          
-         gdk_window_get_size (widget->window, &wwidth, &wheight);
+         gdk_drawable_get_size (widget->window, &wwidth, &wheight);
 
          if (x + width <= 0 || y + height <= 0 ||
              x >= wwidth || y >= wheight)
@@ -2097,30 +2092,78 @@ gtk_widget_queue_clear_area (GtkWidget *widget,
 }
 
 /**
- * gtk_widget_queue_clear:
+ * gtk_widget_queue_draw:
  * @widget: a #GtkWidget
+ *
+ * Equivalent to calling gtk_widget_queue_draw_area() for the
+ * entire area of a widget.
  * 
- * DEPRECATED. Use gtk_widget_queue_draw() instead.
  **/
 void      
-gtk_widget_queue_clear (GtkWidget *widget)
+gtk_widget_queue_draw (GtkWidget *widget)
 {
   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);
+       gtk_widget_queue_draw_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);
+       gtk_widget_queue_draw_area (widget, 0, 0, 
+                                   widget->allocation.width, 
+                                   widget->allocation.height);
     }
 }
 
+/* Invalidates the given area (allocation-relative-coordinates)
+ * in all of the widget's windows
+ */
+/**
+ * gtk_widget_queue_clear_area:
+ * @widget: a #GtkWidget
+ * @x: x coordinate of upper-left corner of rectangle to redraw
+ * @y: y coordinate of upper-left corner of rectangle to redraw
+ * @width: width of region to draw
+ * @height: height of region to draw
+ * 
+ * DEPRECATED. This function is no longer different from
+ * gtk_widget_queue_draw_area(), though it once was. Now it just calls
+ * gtk_widget_queue_draw_area(). Originally
+ * gtk_widget_queue_clear_area() would force a redraw of the
+ * background for %GTK_NO_WINDOW widgets, and
+ * gtk_widget_queue_draw_area() would not. Now both functions ensure
+ * the background will be redrawn.
+ * 
+ **/
+void      
+gtk_widget_queue_clear_area (GtkWidget *widget,
+                            gint       x,
+                            gint       y,
+                            gint       width,
+                            gint       height)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  gtk_widget_queue_draw_area (widget, x, y, width, height);
+}
+
+/**
+ * gtk_widget_queue_clear:
+ * @widget: a #GtkWidget
+ * 
+ * DEPRECATED. Use gtk_widget_queue_draw() instead.
+ **/
+void      
+gtk_widget_queue_clear (GtkWidget *widget)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  gtk_widget_queue_draw (widget);
+}
+
 /**
  * gtk_widget_queue_resize:
  * @widget: a #GtkWidget
@@ -2135,10 +2178,17 @@ gtk_widget_queue_clear (GtkWidget *widget)
 void
 gtk_widget_queue_resize (GtkWidget *widget)
 {
+  GdkRegion *region;
+  
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
-  gtk_widget_queue_clear (widget);
-
+  if (GTK_WIDGET_REALIZED (widget))
+    {
+      region = gdk_region_rectangle (&widget->allocation);
+      gtk_widget_invalidate_widget_windows (widget, region);
+      gdk_region_destroy (region);
+    }
+      
   _gtk_size_group_queue_resize (widget);
 }
 
@@ -2208,13 +2258,6 @@ gtk_widget_size_request (GtkWidget       *widget,
 #endif /* G_ENABLE_DEBUG */
 
   _gtk_size_group_compute_requisition (widget, requisition);
-
-#if 0  
-  if (requisition)
-    gtk_widget_get_child_requisition (widget, requisition);
-
-  gtk_widget_unref (widget);
-#endif  
 }
 
 /**
@@ -2228,13 +2271,13 @@ gtk_widget_size_request (GtkWidget      *widget,
  * case it returns that geometry instead of the widget's requisition.
  *
  * This function differs from gtk_widget_size_request() in that
- * it retrieves the last size request value from widget->requisition,
+ * it retrieves the last size request value from @widget->requisition,
  * while gtk_widget_size_request() actually calls the "size_request" method
- * on @widget to compute the size request and fill in widget->requisition,
- * and only then returns widget->requisition.
+ * on @widget to compute the size request and fill in @widget->requisition,
+ * and only then returns @widget->requisition.
  *
  * Because this function does not call the "size_request" method, it
- * can only be used when you know that widget->requisition is
+ * can only be used when you know that @widget->requisition is
  * up-to-date, that is, gtk_widget_size_request() has been called
  * since the last time a resize was queued. In general, only container
  * implementations have this information; applications should use
@@ -2247,6 +2290,38 @@ gtk_widget_get_child_requisition (GtkWidget       *widget,
   _gtk_size_group_get_child_requisition (widget, requisition);
 }
 
+static gboolean
+invalidate_predicate (GdkWindow *window,
+                     gpointer   data)
+{
+  gpointer user_data;
+
+  gdk_window_get_user_data (window, &user_data);
+
+  return (user_data == data);
+}
+
+/* Invalidate @region in widget->window and all children
+ * of widget->window owned by widget. @region is in the
+ * same coordinates as widget->allocation and will be
+ * modified by this call.
+ */
+static void
+gtk_widget_invalidate_widget_windows (GtkWidget *widget,
+                                     GdkRegion *region)
+{
+  if (!GTK_WIDGET_NO_WINDOW (widget))
+    {
+      int x, y;
+      
+      gdk_window_get_position (widget->window, &x, &y);
+      gdk_region_offset (region, -x, -y);
+    }
+
+  gdk_window_invalidate_maybe_recurse (widget->window, region,
+                                      invalidate_predicate, widget);
+}
+
 /**
  * gtk_widget_size_allocate:
  * @widget: a #GtkWidget
@@ -2261,11 +2336,18 @@ gtk_widget_size_allocate (GtkWidget     *widget,
                          GtkAllocation *allocation)
 {
   GtkWidgetAuxInfo *aux_info;
-  GtkAllocation real_allocation;
-  gboolean needs_draw = FALSE;
+  GdkRectangle real_allocation;
+  GdkRectangle old_allocation;
+  gboolean alloc_needed;
+  gboolean size_changed;
+  gboolean position_changed;
   
   g_return_if_fail (GTK_IS_WIDGET (widget));
-  
+
+  alloc_needed = GTK_WIDGET_ALLOC_NEEDED (widget);
+  GTK_PRIVATE_UNSET_FLAG (widget, GTK_ALLOC_NEEDED);
+
+  old_allocation = widget->allocation;
   real_allocation = *allocation;
   aux_info =_gtk_widget_get_aux_info (widget, FALSE);
   
@@ -2287,42 +2369,224 @@ gtk_widget_size_allocate (GtkWidget    *widget,
   real_allocation.width = MAX (real_allocation.width, 1);
   real_allocation.height = MAX (real_allocation.height, 1);
 
-  if (GTK_WIDGET_NO_WINDOW (widget))
+  size_changed = (old_allocation.width != real_allocation.width ||
+                 old_allocation.height != real_allocation.height);
+  position_changed = (old_allocation.x != real_allocation.x ||
+                     old_allocation.y != real_allocation.y);
+
+  if (!alloc_needed && !size_changed && !position_changed)
+    return;
+  
+  g_signal_emit (widget, widget_signals[SIZE_ALLOCATE], 0, &real_allocation);
+
+  if (GTK_WIDGET_MAPPED (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)
+      if (GTK_WIDGET_NO_WINDOW (widget) && GTK_WIDGET_REDRAW_ON_ALLOC (widget) && position_changed)
        {
-         gtk_widget_queue_clear_child (widget);
-         needs_draw = TRUE;
+         /* Invalidate union(old_allaction,widget->allocation) in widget->window
+          */
+         GdkRegion *invalidate = gdk_region_rectangle (&widget->allocation);
+         gdk_region_union_with_rect (invalidate, &old_allocation);
+
+         gdk_window_invalidate_region (widget->window, invalidate, FALSE);
+         gdk_region_destroy (invalidate);
+       }
+      
+      if (size_changed)
+       {
+         if (GTK_WIDGET_REDRAW_ON_ALLOC (widget))
+           {
+             /* Invalidate union(old_allaction,widget->allocation) in widget->window and descendents owned by widget
+              */
+             GdkRegion *invalidate = gdk_region_rectangle (&widget->allocation);
+             gdk_region_union_with_rect (invalidate, &old_allocation);
+
+             gtk_widget_invalidate_widget_windows (widget, invalidate);
+             gdk_region_destroy (invalidate);
+           }
        }
     }
-  else if (widget->allocation.width != real_allocation.width ||
-          widget->allocation.height != real_allocation.height)
+
+  if ((size_changed || position_changed) && widget->parent &&
+      GTK_WIDGET_REALIZED (widget->parent) && GTK_CONTAINER (widget->parent)->reallocate_redraws)
+    {
+      GdkRegion *invalidate = gdk_region_rectangle (&widget->parent->allocation);
+      gtk_widget_invalidate_widget_windows (widget->parent, invalidate);
+      gdk_region_destroy (invalidate);
+    }
+}
+
+/**
+ * gtk_widget_common_ancestor:
+ * @widget_a: a #GtkWidget
+ * @widget_b: a #GtkWidget
+ * 
+ * Find the common ancestor of @widget_a and @widget_b that
+ * is closest to the two widgets.
+ * 
+ * Return value: the closest common ancestor of @widget_a and
+ *   @widget_b or %NULL if @widget_a and @widget_b do not
+ *   share a common ancestor.
+ **/
+static GtkWidget *
+gtk_widget_common_ancestor (GtkWidget *widget_a,
+                           GtkWidget *widget_b)
+{
+  GtkWidget *parent_a;
+  GtkWidget *parent_b;
+  gint depth_a = 0;
+  gint depth_b = 0;
+
+  parent_a = widget_a;
+  while (parent_a->parent)
+    {
+      parent_a = parent_a->parent;
+      depth_a++;
+    }
+
+  parent_b = widget_b;
+  while (parent_b->parent)
+    {
+      parent_b = parent_b->parent;
+      depth_b++;
+    }
+
+  if (parent_a != parent_b)
+    return NULL;
+
+  while (depth_a > depth_b)
+    {
+      widget_a = widget_a->parent;
+      depth_a--;
+    }
+
+  while (depth_b > depth_a)
+    {
+      widget_b = widget_b->parent;
+      depth_b--;
+    }
+
+  while (widget_a != widget_b)
+    {
+      widget_a = widget_a->parent;
+      widget_b = widget_b->parent;
+    }
+
+  return widget_a;
+}
+
+/**
+ * gtk_widget_translate_coordinates:
+ * @src_widget:  a #GtkWidget
+ * @dest_widget: a #GtkWidget
+ * @src_x: X position relative to @src_widget
+ * @src_y: Y position relative to @src_widget
+ * @dest_x: location to store X position relative to @dest_widget
+ * @dest_y: location to store Y position relative to @dest_widget
+ * 
+ * Translate coordinates relative to @src_widget's allocation to coordinates
+ * relative to @dest_widget's allocations. In order to perform this
+ * operation, both widgets must be realized, and must share a common
+ * toplevel.
+ * 
+ * Return value: %FALSE if either widget was not realized, or there
+ *   was no common ancestor. In this case, nothing is stored in
+ *   *@dest_x and *@dest_y. Otherwise %TRUE.
+ **/
+gboolean
+gtk_widget_translate_coordinates (GtkWidget  *src_widget,
+                                 GtkWidget  *dest_widget,
+                                 gint        src_x,
+                                 gint        src_y,
+                                 gint       *dest_x,
+                                 gint       *dest_y)
+{
+  GtkWidget *ancestor;
+  GdkWindow *window;
+
+  g_return_val_if_fail (GTK_IS_WIDGET (src_widget), FALSE);
+  g_return_val_if_fail (GTK_IS_WIDGET (dest_widget), FALSE);
+
+  ancestor = gtk_widget_common_ancestor (src_widget, dest_widget);
+  if (!ancestor || !GTK_WIDGET_REALIZED (src_widget) || !GTK_WIDGET_REALIZED (dest_widget))
+    return FALSE;
+
+  /* Translate from allocation relative to window relative */
+  if (!GTK_WIDGET_NO_WINDOW (src_widget) && src_widget->parent)
+    {
+      gint wx, wy;
+      gdk_window_get_position (src_widget->window, &wx, &wy);
+
+      src_x -= wx - src_widget->allocation.x;
+      src_y -= wy - src_widget->allocation.y;
+    }
+  else
+    {
+      src_x += src_widget->allocation.x;
+      src_y += src_widget->allocation.y;
+    }
+
+  /* Translate to the common ancestor */
+  window = src_widget->window;
+  while (window != ancestor->window)
     {
-      needs_draw = TRUE;
+      gint dx, dy;
+      
+      gdk_window_get_position (window, &dx, &dy);
+      
+      src_x += dx;
+      src_y += dy;
+      
+      window = gdk_window_get_parent (window);
+
+      if (!window)             /* Handle GtkHandleBox */
+       return FALSE;
     }
 
-  if (GTK_IS_RESIZE_CONTAINER (widget))
-    gtk_container_clear_resize_widgets (GTK_CONTAINER (widget));
+  /* And back */
+  window = dest_widget->window;
+  while (window != ancestor->window)
+    {
+      gint dx, dy;
+      
+      gdk_window_get_position (window, &dx, &dy);
+      
+      src_x -= dx;
+      src_y -= dy;
+      
+      window = gdk_window_get_parent (window);
+      
+      if (!window)             /* Handle GtkHandleBox */
+       return FALSE;
+    }
 
-  gtk_signal_emit (GTK_OBJECT (widget), widget_signals[SIZE_ALLOCATE], &real_allocation);
+  /* Translate from window relative to allocation relative */
+  if (!GTK_WIDGET_NO_WINDOW (dest_widget) && dest_widget->parent)
+    {
+      gint wx, wy;
+      gdk_window_get_position (dest_widget->window, &wx, &wy);
 
-  if (needs_draw)
+      src_x += wx - dest_widget->allocation.x;
+      src_y += wy - dest_widget->allocation.y;
+    }
+  else
     {
-      gtk_widget_queue_draw (widget);
-      if (widget->parent && GTK_CONTAINER (widget->parent)->reallocate_redraws)
-       gtk_widget_queue_draw (widget->parent);
+      src_x -= dest_widget->allocation.x;
+      src_y -= dest_widget->allocation.y;
     }
+
+  if (dest_x)
+    *dest_x = src_x;
+  if (dest_y)
+    *dest_y = src_y;
+
+  return TRUE;
 }
 
 static void
 gtk_widget_real_size_allocate (GtkWidget     *widget,
                               GtkAllocation *allocation)
 {
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-
   widget->allocation = *allocation;
   
   if (GTK_WIDGET_REALIZED (widget) &&
@@ -2334,148 +2598,304 @@ gtk_widget_real_size_allocate (GtkWidget     *widget,
      }
 }
 
+typedef struct {
+  GClosure   closure;
+  guint      signal_id;
+} AccelClosure;
+
 static void
-gtk_widget_stop_add_accelerator (GtkWidget *widget)
+closure_accel_activate (GClosure     *closure,
+                       GValue       *return_value,
+                       guint         n_param_values,
+                       const GValue *param_values,
+                       gpointer      invocation_hint,
+                       gpointer      marshal_data)
 {
-  g_return_if_fail (GTK_IS_WIDGET (widget));
+  AccelClosure *aclosure = (AccelClosure*) closure;
+
+  if (GTK_WIDGET_IS_SENSITIVE (closure->data))
+    g_signal_emit (closure->data, aclosure->signal_id, 0);
 
-  gtk_signal_emit_stop (GTK_OBJECT (widget), widget_signals[ADD_ACCELERATOR]);
+  /* we handled the accelerator */
+  g_value_set_boolean (return_value, TRUE);
 }
 
 static void
-gtk_widget_stop_remove_accelerator (GtkWidget *widget)
+closures_destroy (gpointer data)
 {
-  g_return_if_fail (GTK_IS_WIDGET (widget));
+  GSList *slist, *closures = data;
 
-  gtk_signal_emit_stop (GTK_OBJECT (widget), widget_signals[REMOVE_ACCELERATOR]);
+  for (slist = closures; slist; slist = slist->next)
+    {
+      g_closure_invalidate (slist->data);
+      g_closure_unref (slist->data);
+    }
+  g_slist_free (closures);
 }
 
-void
-gtk_widget_lock_accelerators (GtkWidget *widget)
+static GClosure*
+widget_new_accel_closure (GtkWidget *widget,
+                         guint      signal_id)
 {
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-  
-  if (!gtk_widget_accelerators_locked (widget))
+  AccelClosure *aclosure;
+  GClosure *closure = NULL;
+  GSList *slist, *closures;
+
+  closures = g_object_steal_qdata (G_OBJECT (widget), quark_accel_closures);
+  for (slist = closures; slist; slist = slist->next)
+    if (!gtk_accel_group_from_accel_closure (slist->data))
+      {
+       /* reuse this closure */
+       closure = slist->data;
+       break;
+      }
+  if (!closure)
     {
-      gtk_signal_connect (GTK_OBJECT (widget),
-                         "add_accelerator",
-                         GTK_SIGNAL_FUNC (gtk_widget_stop_add_accelerator),
-                         NULL);
-      gtk_signal_connect (GTK_OBJECT (widget),
-                         "remove_accelerator",
-                         GTK_SIGNAL_FUNC (gtk_widget_stop_remove_accelerator),
-                         NULL);
+      closure = g_closure_new_object (sizeof (AccelClosure), G_OBJECT (widget));
+      closures = g_slist_prepend (closures, g_closure_ref (closure));
+      g_closure_sink (closure);
+      g_closure_set_marshal (closure, closure_accel_activate);
     }
+  g_object_set_qdata_full (G_OBJECT (widget), quark_accel_closures, closures, closures_destroy);
+  
+  aclosure = (AccelClosure*) closure;
+  g_assert (closure->data == widget);
+  g_assert (closure->marshal == closure_accel_activate);
+  aclosure->signal_id = signal_id;
+
+  return closure;
 }
 
+/**
+ * gtk_widget_add_accelerator
+ * @widget:       widget to install an accelerator on
+ * @accel_signal: widget signal to emit on accelerator activation
+ * @accel_group:  accel group for this widget, added to its toplevel
+ * @accel_key:    GDK keyval of the accelerator
+ * @accel_mods:   modifier key combination of the accelerator
+ * @accel_flags:  flag accelerators, e.g. %GTK_ACCEL_VISIBLE
+ *
+ * Installs an accelerator for this @widget in @accel_group that causes
+ * @accel_signal to be emitted if the accelerator is activated.
+ * The @accel_group needs to be added to the widget's toplevel via
+ * gtk_window_add_accel_group(), and the signal must be of type %G_RUN_ACTION.
+ * Accelerators added through this function are not user changeable during
+ * runtime. If you want to support accelerators that can be changed by the
+ * user, use gtk_accel_map_add_entry() and gtk_widget_set_accel_path() or
+ * gtk_menu_item_set_accel_path() instead.
+ */
 void
-gtk_widget_unlock_accelerators (GtkWidget *widget)
+gtk_widget_add_accelerator (GtkWidget      *widget,
+                           const gchar    *accel_signal,
+                           GtkAccelGroup  *accel_group,
+                           guint           accel_key,
+                           GdkModifierType accel_mods,
+                           GtkAccelFlags   accel_flags)
 {
+  GClosure *closure;
+  GSignalQuery query;
+
   g_return_if_fail (GTK_IS_WIDGET (widget));
-  
-  if (gtk_widget_accelerators_locked (widget))
+  g_return_if_fail (accel_signal != NULL);
+  g_return_if_fail (GTK_IS_ACCEL_GROUP (accel_group));
+
+  g_signal_query (g_signal_lookup (accel_signal, G_OBJECT_TYPE (widget)), &query);
+  if (!query.signal_id ||
+      !(query.signal_flags & G_SIGNAL_ACTION) ||
+      query.return_type != G_TYPE_NONE ||
+      query.n_params)
     {
-      gtk_signal_disconnect_by_func (GTK_OBJECT (widget),
-                                    GTK_SIGNAL_FUNC (gtk_widget_stop_add_accelerator),
-                                    NULL);
-      gtk_signal_disconnect_by_func (GTK_OBJECT (widget),
-                                    GTK_SIGNAL_FUNC (gtk_widget_stop_remove_accelerator),
-                                    NULL);
+      /* hmm, should be elaborate enough */
+      g_warning (G_STRLOC ": widget `%s' has no activatable signal \"%s\" without arguments",
+                G_OBJECT_TYPE_NAME (widget), accel_signal);
+      return;
     }
+
+  closure = widget_new_accel_closure (widget, query.signal_id);
+
+  g_object_ref (widget);
+
+  /* install the accelerator. since we don't map this onto an accel_path,
+   * the accelerator will automatically be locked.
+   */
+  gtk_accel_group_connect (accel_group,
+                          accel_key,
+                          accel_mods,
+                          accel_flags | GTK_ACCEL_LOCKED,
+                          closure);
+
+  g_signal_emit (widget, widget_signals[ACCEL_CLOSURES_CHANGED], 0);
+
+  g_object_unref (widget);
 }
 
+/**
+ * gtk_widget_remove_accelerator:
+ * @widget:       widget to install an accelerator on
+ * @accel_group:  accel group for this widget
+ * @accel_key:    GDK keyval of the accelerator
+ * @accel_mods:   modifier key combination of the accelerator
+ * @returns:      whether an accelerator was installed and could be removed
+ *
+ * Removes an accelerator from @widget, previously installed with
+ * gtk_widget_add_accelerator().
+ */
 gboolean
-gtk_widget_accelerators_locked (GtkWidget *widget)
+gtk_widget_remove_accelerator (GtkWidget      *widget,
+                              GtkAccelGroup  *accel_group,
+                              guint           accel_key,
+                              GdkModifierType accel_mods)
 {
-  g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+  GtkAccelGroupEntry *ag_entry;
+  GList *slist, *clist;
+  guint n;
   
-  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;
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+  g_return_val_if_fail (GTK_IS_ACCEL_GROUP (accel_group), FALSE);
+
+  ag_entry = gtk_accel_group_query (accel_group, accel_key, accel_mods, &n);
+  clist = gtk_widget_list_accel_closures (widget);
+  for (slist = clist; slist; slist = slist->next)
+    {
+      guint i;
+
+      for (i = 0; i < n; i++)
+       if (slist->data == (gpointer) ag_entry[i].closure)
+         {
+           gboolean is_removed = gtk_accel_group_disconnect (accel_group, slist->data);
+
+           g_signal_emit (widget, widget_signals[ACCEL_CLOSURES_CHANGED], 0);
+
+           g_list_free (clist);
+
+           return is_removed;
+         }
+    }
+  g_list_free (clist);
+
+  g_warning (G_STRLOC ": no accelerator (%u,%u) installed in accel group (%p) for %s (%p)",
+            accel_key, accel_mods, accel_group,
+            G_OBJECT_TYPE_NAME (widget), widget);
+
+  return FALSE;
 }
 
-void
-gtk_widget_add_accelerator (GtkWidget           *widget,
-                           const gchar         *accel_signal,
-                           GtkAccelGroup       *accel_group,
-                           guint                accel_key,
-                           guint                accel_mods,
-                           GtkAccelFlags        accel_flags)
+/**
+ * gtk_widget_list_accel_closures
+ * @widget:  widget to list accelerator closures for
+ * @returns: a newly allocated #GList of closures
+ *
+ * Lists the closures used by @widget for accelerator group connections
+ * with gtk_accel_group_connect_by_path() or gtk_accel_group_connect().
+ * The closures can be used to monitor accelerator changes on @widget,
+ * by connecting to the ::accel_changed signal of the #GtkAccelGroup of a 
+ * closure which can be found out with gtk_accel_group_from_accel_closure().
+ */
+GList*
+gtk_widget_list_accel_closures (GtkWidget *widget)
 {
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-  g_return_if_fail (accel_group != NULL);
+  GSList *slist;
+  GList *clist = NULL;
+
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
 
-  gtk_accel_group_add (accel_group,
-                      accel_key,
-                      accel_mods,
-                      accel_flags,
-                      (GObject*) widget,
-                      accel_signal);
+  for (slist = g_object_get_qdata (G_OBJECT (widget), quark_accel_closures); slist; slist = slist->next)
+    if (gtk_accel_group_from_accel_closure (slist->data))
+      clist = g_list_prepend (clist, slist->data);
+  return clist;
 }
 
-void
-gtk_widget_remove_accelerator (GtkWidget           *widget,
-                              GtkAccelGroup       *accel_group,
-                              guint                accel_key,
-                              guint                accel_mods)
+typedef struct {
+  GQuark         path_quark;
+  GtkWidget     *widget;
+  GtkAccelGroup *accel_group;
+  GClosure      *closure;
+} AccelPath;
+
+static void
+destroy_accel_path (gpointer data)
 {
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-  g_return_if_fail (accel_group != NULL);
+  AccelPath *apath = data;
 
-  gtk_accel_group_remove (accel_group,
-                         accel_key,
-                         accel_mods,
-                         (GObject*) widget);
+  gtk_accel_group_disconnect (apath->accel_group, apath->closure);
+
+  /* closures_destroy takes care of unrefing the closure */
+  g_object_unref (apath->accel_group);
+  
+  g_free (apath);
 }
 
+
+/**
+ * gtk_widget_set_accel_path:
+ * @widget: a #GtkWidget
+ * @accel_path: path used to look up the the accelerator
+ * @accel_group: a #GtkAccelGroup.
+ * 
+ * Given an accelerator group, @accel_group, and an accelerator path,
+ * @accel_path, sets up an accelerator in @accel_group so whenever the
+ * key binding that is defined for @accel_path is pressed, @widget
+ * will be activated.  This removes any accelerators (for any
+ * accelerator group) installed by previous calls to
+ * gtk_widget_set_accel_path(). Associating accelerators with
+ * paths allows them to be modified by the user and the modifications
+ * to be saved for future use. (See gtk_accel_map_save().)
+ *
+ * This function is a low level function that would most likely
+ * be used by a menu creation system like #GtkItemFactory. If you
+ * use #GtkItemFactory, setting up accelerator paths will be done
+ * automatically.
+ *
+ * Even when you you aren't using #GtkItemFactory, if you only want to
+ * set up accelerators on menu items gtk_menu_item_set_accel_path()
+ * provides a somewhat more convenient interface.
+ **/
 void
-gtk_widget_remove_accelerators (GtkWidget           *widget,
-                               const gchar         *accel_signal,
-                               gboolean             visible_only)
+gtk_widget_set_accel_path (GtkWidget     *widget,
+                          const gchar   *accel_path,
+                          GtkAccelGroup *accel_group)
 {
-  GSList *slist;
-  guint signal_id;
-  
+  AccelPath *apath;
+
   g_return_if_fail (GTK_IS_WIDGET (widget));
-  g_return_if_fail (accel_signal != NULL);
-  
-  signal_id = gtk_signal_lookup (accel_signal, GTK_OBJECT_TYPE (widget));
-  g_return_if_fail (signal_id != 0);
-  
-  slist = gtk_accel_group_entries_from_object (G_OBJECT (widget));
-  while (slist)
+  g_return_if_fail (GTK_WIDGET_GET_CLASS (widget)->activate_signal != 0);
+
+  if (accel_path)
     {
-      GtkAccelEntry *ac_entry;
-      
-      ac_entry = slist->data;
-      slist = slist->next;
-      if (ac_entry->accel_flags & GTK_ACCEL_VISIBLE &&
-         ac_entry->signal_id == signal_id)
-       gtk_widget_remove_accelerator (GTK_WIDGET (widget),
-                                      ac_entry->accel_group,
-                                      ac_entry->accelerator_key,
-                                      ac_entry->accelerator_mods);
+      g_return_if_fail (GTK_IS_ACCEL_GROUP (accel_group));
+      g_return_if_fail (_gtk_accel_path_is_valid (accel_path));
+
+      gtk_accel_map_add_entry (accel_path, 0, 0);
+      apath = g_new (AccelPath, 1);
+      apath->widget = widget;
+      apath->accel_group = g_object_ref (accel_group);
+      apath->path_quark = g_quark_from_string (accel_path);
+      apath->closure = widget_new_accel_closure (apath->widget, GTK_WIDGET_GET_CLASS (apath->widget)->activate_signal);
     }
+  else
+    apath = NULL;
+
+  /* also removes possible old settings */
+  g_object_set_qdata_full (G_OBJECT (widget), quark_accel_path, apath, destroy_accel_path);
+
+  if (apath)
+    gtk_accel_group_connect_by_path (apath->accel_group, g_quark_to_string (apath->path_quark), apath->closure);
+
+  g_signal_emit (widget, widget_signals[ACCEL_CLOSURES_CHANGED], 0);
 }
 
-guint
-gtk_widget_accelerator_signal (GtkWidget           *widget,
-                              GtkAccelGroup       *accel_group,
-                              guint                accel_key,
-                              guint                accel_mods)
+const gchar*
+_gtk_widget_get_accel_path (GtkWidget *widget,
+                           gboolean  *locked)
 {
-  GtkAccelEntry *ac_entry;
+  AccelPath *apath;
 
-  g_return_val_if_fail (GTK_IS_WIDGET (widget), 0);
-  g_return_val_if_fail (accel_group != NULL, 0);
-
-  ac_entry = gtk_accel_group_get_entry (accel_group, accel_key, accel_mods);
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
 
-  if (ac_entry && ac_entry->object == (GObject*) widget)
-    return ac_entry->signal_id;
-  return 0;
+  apath = g_object_get_qdata (G_OBJECT (widget), quark_accel_path);
+  if (locked)
+    *locked = apath ? apath->accel_group->lock_count > 0 : TRUE;
+  return apath ? g_quark_to_string (apath->path_quark) : NULL;
 }
 
 gboolean
@@ -2490,10 +2910,11 @@ gtk_widget_mnemonic_activate (GtkWidget *widget,
   if (!GTK_WIDGET_IS_SENSITIVE (widget))
     handled = TRUE;
   else
-    gtk_signal_emit (GTK_OBJECT (widget),
-                    widget_signals[ACTIVATE_MNEMONIC],
-                    group_cycling,
-                    &handled);
+    g_signal_emit (widget,
+                  widget_signals[MNEMONIC_ACTIVATE],
+                  0,
+                  group_cycling,
+                  &handled);
   return handled;
 }
 
@@ -2509,7 +2930,7 @@ gtk_widget_real_mnemonic_activate (GtkWidget *widget,
     {
       g_warning ("widget `%s' isn't suitable for mnemonic activation",
                 G_OBJECT_TYPE_NAME (widget));
-      gdk_beep ();
+      gdk_display_beep (gtk_widget_get_display (widget));
     }
   return TRUE;
 }
@@ -2518,41 +2939,20 @@ static gboolean
 gtk_widget_real_key_press_event (GtkWidget         *widget,
                                 GdkEventKey       *event)
 {
-  gboolean handled = FALSE;
-
-  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);
-
-  return handled;
+  return _gtk_bindings_activate_event (GTK_OBJECT (widget), event);
 }
 
 static gboolean
 gtk_widget_real_key_release_event (GtkWidget         *widget,
                                   GdkEventKey       *event)
 {
-  gboolean handled = FALSE;
-
-  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;
+  return _gtk_bindings_activate_event (GTK_OBJECT (widget), event);
 }
 
 static gboolean
 gtk_widget_real_focus_in_event (GtkWidget     *widget,
                                 GdkEventFocus *event)
 {
-  GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
   gtk_widget_queue_draw (widget);
 
   return FALSE;
@@ -2562,12 +2962,14 @@ static gboolean
 gtk_widget_real_focus_out_event (GtkWidget     *widget,
                                  GdkEventFocus *event)
 {
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
   gtk_widget_queue_draw (widget);
 
   return FALSE;
 }
 
+#define WIDGET_REALIZED_FOR_EVENT(widget, event) \
+     (event->type == GDK_FOCUS_CHANGE || GTK_WIDGET_REALIZED(widget))
+
 /**
  * gtk_widget_event:
  * @widget: a #GtkWidget
@@ -2589,7 +2991,7 @@ gtk_widget_event (GtkWidget *widget,
                  GdkEvent  *event)
 {
   g_return_val_if_fail (GTK_IS_WIDGET (widget), TRUE);
-  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), TRUE);
+  g_return_val_if_fail (WIDGET_REALIZED_FOR_EVENT (widget, event), TRUE);
 
   if (event->type == GDK_EXPOSE)
     {
@@ -2611,13 +3013,13 @@ gtk_widget_event (GtkWidget *widget,
  * Very rarely-used function. This function is used to emit
  * an expose event signals on a widget. This function is not
  * normally used directly. The only time it is used is when
- * propagating an expose event to a child NO_WINDOW widget, and
- * that is normally done using gtk_container_propagate_expose.
+ * propagating an expose event to a child %NO_WINDOW widget, and
+ * that is normally done using gtk_container_propagate_expose().
  *
  * If you want to force an area of a window to be redrawn, 
  * use gdk_window_invalidate_rect() or gdk_window_invalidate_region().
  * To cause the redraw to be done immediately, follow that call
- * with a call to gdk_window_procss_updates().
+ * with a call to gdk_window_process_updates().
  * 
  * Return value: return from the event signal emission (%TRUE if the event was handled)
  **/
@@ -2642,10 +3044,10 @@ gtk_widget_event_internal (GtkWidget *widget,
 {
   gboolean return_val = FALSE;
 
-  gtk_widget_ref (widget);
+  g_object_ref (widget);
 
-  gtk_signal_emit (GTK_OBJECT (widget), widget_signals[EVENT], event, &return_val);
-  return_val |= !GTK_WIDGET_REALIZED (widget);
+  g_signal_emit (widget, widget_signals[EVENT], 0, event, &return_val);
+  return_val |= !WIDGET_REALIZED_FOR_EVENT (widget, event);
   if (!return_val)
     {
       gint signal_num;
@@ -2738,14 +3140,14 @@ gtk_widget_event_internal (GtkWidget *widget,
          break;
        }
       if (signal_num != -1)
-       gtk_signal_emit (GTK_OBJECT (widget), widget_signals[signal_num], event, &return_val);
+       g_signal_emit (widget, widget_signals[signal_num], 0, event, &return_val);
     }
-  if (GTK_WIDGET_REALIZED (widget))
-    gtk_signal_emit (GTK_OBJECT (widget), widget_signals[EVENT_AFTER], event);
+  if (WIDGET_REALIZED_FOR_EVENT (widget, event))
+    g_signal_emit (widget, widget_signals[EVENT_AFTER], 0, event);
   else
     return_val = TRUE;
 
-  gtk_widget_unref (widget);
+  g_object_unref (widget);
 
   return return_val;
 }
@@ -2770,7 +3172,7 @@ gtk_widget_activate (GtkWidget *widget)
   if (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);
+      g_signal_emit (widget, WIDGET_CLASS (widget)->activate_signal, 0);
 
       return TRUE;
     }
@@ -2806,47 +3208,62 @@ gtk_widget_set_scroll_adjustments (GtkWidget     *widget,
   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);
+      g_signal_emit (widget,
+                    WIDGET_CLASS (widget)->set_scroll_adjustments_signal, 0,
+                    hadjustment, vadjustment);
       return TRUE;
     }
   else
     return FALSE;
 }
 
-/*****************************************
- * gtk_widget_reparent_container_child:
- *   assistent function to gtk_widget_reparent
- *
- *   arguments:
- *
- *   results:
- *****************************************/
+static void
+gtk_widget_reparent_subwindows (GtkWidget *widget,
+                               GdkWindow *new_window)
+{
+  if (GTK_WIDGET_NO_WINDOW (widget))
+    {
+      GList *children = gdk_window_get_children (widget->window);
+      GList *tmp_list;
+
+      for (tmp_list = children; tmp_list; tmp_list = tmp_list->next)
+       {
+         GtkWidget *child;
+         GdkWindow *window = tmp_list->data;
+
+         gdk_window_get_user_data (window, (void **)&child);
+         while (child && child != widget)
+           child = child->parent;
+
+         if (child)
+           gdk_window_reparent (window, new_window, 0, 0);
+       }
+
+      g_list_free (children);
+    }
+  else
+    gdk_window_reparent (widget->window, new_window, 0, 0);
+}
 
 static void
-gtk_widget_reparent_container_child (GtkWidget *widget,
-                                    gpointer   client_data)
+gtk_widget_reparent_fixup_child (GtkWidget *widget,
+                                gpointer   client_data)
 {
-  g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (client_data != NULL);
   
   if (GTK_WIDGET_NO_WINDOW (widget))
     {
       if (widget->window)
-       gdk_window_unref (widget->window);
+       g_object_unref (widget->window);
       widget->window = (GdkWindow*) client_data;
       if (widget->window)
-       gdk_window_ref (widget->window);
+       g_object_ref (widget->window);
 
       if (GTK_IS_CONTAINER (widget))
-       gtk_container_forall (GTK_CONTAINER (widget),
-                             gtk_widget_reparent_container_child,
-                             client_data);
+        gtk_container_forall (GTK_CONTAINER (widget),
+                              gtk_widget_reparent_fixup_child,
+                              client_data);
     }
-  else
-    gdk_window_reparent (widget->window, 
-                        (GdkWindow*) client_data, 0, 0);
 }
 
 /**
@@ -2875,18 +3292,21 @@ gtk_widget_reparent (GtkWidget *widget,
       if (GTK_WIDGET_REALIZED (widget) && GTK_WIDGET_REALIZED (new_parent))
        GTK_PRIVATE_SET_FLAG (widget, GTK_IN_REPARENT);
       
-      gtk_widget_ref (widget);
+      g_object_ref (widget);
       gtk_container_remove (GTK_CONTAINER (widget->parent), widget);
       gtk_container_add (GTK_CONTAINER (new_parent), widget);
-      gtk_widget_unref (widget);
+      g_object_unref (widget);
       
       if (GTK_WIDGET_IN_REPARENT (widget))
        {
          GTK_PRIVATE_UNSET_FLAG (widget, GTK_IN_REPARENT);
-         
-         gtk_widget_reparent_container_child (widget,
-                                              gtk_widget_get_parent_window (widget));
+
+         gtk_widget_reparent_subwindows (widget, gtk_widget_get_parent_window (widget));
+         gtk_widget_reparent_fixup_child (widget,
+                                          gtk_widget_get_parent_window (widget));
        }
+
+      g_object_notify (G_OBJECT (widget), "parent");
     }
 }
 
@@ -2935,17 +3355,17 @@ gtk_widget_intersect (GtkWidget    *widget,
  * gtk_widget_region_intersect:
  * @widget: a #GtkWidget
  * @region: a #GdkRegion, in the same coordinate system as 
- *          widget->allocation. That is, relative to widget->window
- *          for NO_WINDOW widgets; relative to the parent window
- *          of widget->window for widgets with their own window.
+ *          @widget->allocation. That is, relative to @widget->window
+ *          for %NO_WINDOW widgets; relative to the parent window
+ *          of @widget->window for widgets with their own window.
  * @returns: A newly allocated region holding the intersection of @widget
  *           and @region. The coordinates of the return value are
- *           relative to widget->window for NO_WINDOW widgets, and
- *           relative to the parent window of widget->window for
+ *           relative to @widget->window for %NO_WINDOW widgets, and
+ *           relative to the parent window of @widget->window for
  *           widgets with their own window.
  * 
  * Computes the intersection of a @widget's area and @region, returning
- * the intersection. The result may be empty, use #gdk_region_empty to
+ * the intersection. The result may be empty, use gdk_region_empty() to
  * check.
  **/
 GdkRegion *
@@ -2971,7 +3391,7 @@ gtk_widget_region_intersect (GtkWidget *widget,
  * Causes @widget to have the keyboard focus for the #GtkWindow it's
  * inside. @widget must be a focusable widget, such as a #GtkEntry;
  * something like #GtkFrame won't work. (More precisely, it must have the
- * #GTK_CAN_FOCUS flag set.)
+ * %GTK_CAN_FOCUS flag set.)
  * 
  **/
 void
@@ -2979,10 +3399,13 @@ gtk_widget_grab_focus (GtkWidget *widget)
 {
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
-  g_object_ref (G_OBJECT (widget));
-  gtk_signal_emit (GTK_OBJECT (widget), widget_signals[GRAB_FOCUS]);
+  if (!GTK_WIDGET_IS_SENSITIVE (widget))
+    return;
+  
+  g_object_ref (widget);
+  g_signal_emit (widget, widget_signals[GRAB_FOCUS], 0);
   g_object_notify (G_OBJECT (widget), "has_focus");
-  g_object_unref (G_OBJECT (widget));
+  g_object_unref (widget);
 }
 
 static void
@@ -3005,8 +3428,6 @@ reset_focus_recurse (GtkWidget *widget,
 static void
 gtk_widget_real_grab_focus (GtkWidget *focus_widget)
 {
-  g_return_if_fail (GTK_IS_WIDGET (focus_widget));
-  
   if (GTK_WIDGET_CAN_FOCUS (focus_widget))
     {
       GtkWidget *toplevel;
@@ -3023,12 +3444,12 @@ gtk_widget_real_grab_focus (GtkWidget *focus_widget)
          
          if (widget == focus_widget)
            {
-             /* We call gtk_window_set_focus() here so that the
+             /* We call _gtk_window_internal_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);
+               _gtk_window_internal_set_focus (GTK_WINDOW (toplevel), focus_widget);
 
              return;
            }
@@ -3063,16 +3484,21 @@ gtk_widget_real_grab_focus (GtkWidget *focus_widget)
          widget = widget->parent;
        }
       if (GTK_IS_WINDOW (widget))
-       gtk_window_set_focus (GTK_WINDOW (widget), focus_widget);
+       _gtk_window_internal_set_focus (GTK_WINDOW (widget), focus_widget);
     }
 }
 
-static void
+static gboolean
 gtk_widget_real_show_help (GtkWidget        *widget,
                            GtkWidgetHelpType help_type)
 {
   if (help_type == GTK_WIDGET_HELP_TOOLTIP)
-    _gtk_tooltips_show_tip (widget);
+    {
+      _gtk_tooltips_toggle_keyboard_mode (widget);
+      return TRUE;
+    }
+  else
+    return FALSE;
 }
 
 static gboolean
@@ -3096,8 +3522,8 @@ gtk_widget_real_focus (GtkWidget         *widget,
  * @widget: a #GtkWidget
  * 
  * Determines if the widget is the focus widget within its
- * toplevel. (This does not mean that the HAS_FOCUS flag is
- * necessarily set; HAS_FOCUS will only be set if the
+ * toplevel. (This does not mean that the %HAS_FOCUS flag is
+ * necessarily set; %HAS_FOCUS will only be set if the
  * toplevel widget additionally has the global input focus.)
  * 
  * Return value: %TRUE if the widget is the focus widget.
@@ -3122,9 +3548,9 @@ gtk_widget_is_focus (GtkWidget *widget)
  * @widget: a #GtkWidget
  *
  * Causes @widget to become the default widget. @widget must have the
- * #GTK_CAN_DEFAULT flag set; typically you have to set this flag
- * yourself by calling GTK_WIDGET_SET_FLAGS (@widget,
- * GTK_CAN_DEFAULT).  The default widget is activated when the user
+ * %GTK_CAN_DEFAULT flag set; typically you have to set this flag
+ * yourself by calling <literal>GTK_WIDGET_SET_FLAGS (@widget,
+ * GTK_CAN_DEFAULT)</literal>.  The default widget is activated when the user
  * presses Enter in a window.  Default widgets must be activatable,
  * that is, gtk_widget_activate() should affect them.
  * 
@@ -3133,22 +3559,14 @@ void
 gtk_widget_grab_default (GtkWidget *widget)
 {
   GtkWidget *window;
-  GtkType window_type;
   
   g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (GTK_WIDGET_CAN_DEFAULT (widget));
   
-  window_type = GTK_TYPE_WINDOW;
-  window = widget->parent;
-  
-  while (window && !gtk_type_is_a (GTK_WIDGET_TYPE (window), window_type))
-    window = window->parent;
+  window = gtk_widget_get_toplevel (widget);
   
-  if (window && gtk_type_is_a (GTK_WIDGET_TYPE (window), window_type))
-    {
-      gtk_window_set_default (GTK_WINDOW (window), widget);
-      g_object_notify (G_OBJECT (widget), "has_default");
-    }
+  if (window && GTK_WIDGET_TOPLEVEL (window))
+    gtk_window_set_default (GTK_WINDOW (window), widget);
   else
     g_warning (G_STRLOC ": widget not within a GtkWindow");
 }
@@ -3184,11 +3602,11 @@ gtk_widget_set_name (GtkWidget   *widget,
  * gtk_widget_get_name:
  * @widget: a #GtkWidget
  * 
- * Retrieves the name of a widget. The return value should not be
- * freed. See gtk_widget_set_name() for the significance of widget
- * names.
+ * Retrieves the name of a widget. See gtk_widget_set_name() for the
+ * significance of widget names.
  * 
- * Return value: name of the widget
+ * Return value: name of the widget. This string is owned by GTK+ and
+ * should not be modified or freed
  **/
 G_CONST_RETURN gchar*
 gtk_widget_get_name (GtkWidget *widget)
@@ -3197,7 +3615,7 @@ gtk_widget_get_name (GtkWidget *widget)
   
   if (widget->name)
     return widget->name;
-  return gtk_type_name (GTK_WIDGET_TYPE (widget));
+  return g_type_name (GTK_WIDGET_TYPE (widget));
 }
 
 /**
@@ -3236,7 +3654,7 @@ gtk_widget_set_state (GtkWidget           *widget,
       gtk_widget_propagate_state (widget, &data);
   
       if (GTK_WIDGET_DRAWABLE (widget))
-       gtk_widget_queue_clear (widget);
+       gtk_widget_queue_draw (widget);
     }
 }
 
@@ -3256,7 +3674,7 @@ gtk_widget_set_app_paintable (GtkWidget *widget,
        GTK_WIDGET_UNSET_FLAGS (widget, GTK_APP_PAINTABLE);
 
       if (GTK_WIDGET_DRAWABLE (widget))
-       gtk_widget_queue_clear (widget);
+       gtk_widget_queue_draw (widget);
 
       g_object_notify (G_OBJECT (widget), "app_paintable");
     }
@@ -3294,15 +3712,49 @@ gtk_widget_set_double_buffered (GtkWidget *widget,
     GTK_WIDGET_UNSET_FLAGS (widget, GTK_DOUBLE_BUFFERED);
 }
 
+/**
+ * gtk_widget_set_redraw_on_allocate:
+ * @widget: a #GtkWidget
+ * @redraw_on_allocate: if %TRUE, the entire widget will be redrawn
+ *   when it is allocated to a new size. Otherwise, only the
+ *   new portion of the widget will be redrawn.
+ *
+ * Sets whether a when a widgets size allocation changes, the entire
+ * widget is queued for drawing. By default, this setting is %TRUE and
+ * the entire widget is redrawn on every size change. If your widget
+ * leaves the upper left are unchanged when made bigger, turning this
+ * setting on will improve performance.
+
+ * Note that for %NO_WINDOW widgets setting this flag to %FALSE turns
+ * off all allocation on resizing: the widget will not even redraw if
+ * its position changes; this is to allow containers that don't draw
+ * anything to avoid excess invalidations. If you set this flag on a
+ * %NO_WINDOW widget that <emphasis>does</emphasis> draw on @widget->window, 
+ * you are responsible for invalidating both the old and new allocation 
+ * of the widget when the widget is moved and responsible for invalidating
+ * regions newly when the widget increases size.
+ **/
+void
+gtk_widget_set_redraw_on_allocate (GtkWidget *widget,
+                                  gboolean   redraw_on_allocate)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  if (redraw_on_allocate)
+    GTK_PRIVATE_SET_FLAG (widget, GTK_REDRAW_ON_ALLOC);
+  else
+    GTK_PRIVATE_UNSET_FLAG (widget, GTK_REDRAW_ON_ALLOC);
+}
+
 /**
  * gtk_widget_set_sensitive:
- * @widget: a @widget
+ * @widget: a #GtkWidget
  * @sensitive: %TRUE to make the widget sensitive
  *
  * Sets the sensitivity of a widget. A widget is sensitive if the user
  * can interact with it. Insensitive widgets are "grayed out" and the
  * user can't interact with them. Insensitive widgets are known as
- * "inactive" in some other toolkits.
+ * "inactive", "disabled", or "ghosted" in some other toolkits.
  * 
  **/
 void
@@ -3338,7 +3790,7 @@ gtk_widget_set_sensitive (GtkWidget *widget,
 
   gtk_widget_propagate_state (widget, &data);
   if (GTK_WIDGET_DRAWABLE (widget))
-    gtk_widget_queue_clear (widget);
+    gtk_widget_queue_draw (widget);
 
   g_object_notify (G_OBJECT (widget), "sensitive");
 }
@@ -3370,7 +3822,7 @@ gtk_widget_set_parent (GtkWidget *widget,
   /* keep this function in sync with gtk_menu_attach_to_widget()
    */
 
-  gtk_widget_ref (widget);
+  g_object_ref (widget);
   gtk_object_sink (GTK_OBJECT (widget));
   widget->parent = parent;
 
@@ -3384,9 +3836,9 @@ gtk_widget_set_parent (GtkWidget *widget,
 
   gtk_widget_propagate_state (widget, &data);
   
-  gtk_widget_set_style_recurse (widget, NULL);
+  gtk_widget_reset_rc_styles (widget);
 
-  gtk_signal_emit (GTK_OBJECT (widget), widget_signals[PARENT_SET], NULL);
+  g_signal_emit (widget, widget_signals[PARENT_SET], 0, NULL);
   if (GTK_WIDGET_ANCHORED (widget->parent))
     _gtk_widget_propagate_hierarchy_changed (widget, NULL);
   g_object_notify (G_OBJECT (widget), "parent");
@@ -3432,9 +3884,9 @@ gtk_widget_get_parent (GtkWidget *widget)
  * gtk_widget_set_style:
  * @widget: a #GtkWidget
  * @style: a #GtkStyle, or %NULL to remove the effect of a previous
- *         gtk_widget_set_style and go back to the default style
+ *         gtk_widget_set_style() and go back to the default style
  *
- * Sets the #GtkStyle for a widget (widget->style). You probably don't
+ * Sets the #GtkStyle for a widget (@widget->style). You probably don't
  * want to use this function; it interacts badly with themes, because
  * themes work by replacing the #GtkStyle. Instead, use
  * gtk_widget_modify_style().
@@ -3468,7 +3920,7 @@ gtk_widget_set_style (GtkWidget *widget,
  * gtk_widget_ensure_style:
  * @widget: a #GtkWidget
  *
- * Ensures that @widget has a style (widget->style). Not a very useful
+ * Ensures that @widget has a style (@widget->style). Not a very useful
  * function; most of the time, if you want the style, the widget is
  * realized, and realized widgets are guaranteed to have a style
  * already.
@@ -3490,7 +3942,7 @@ gtk_widget_ensure_style (GtkWidget *widget)
 static void
 gtk_widget_reset_rc_style (GtkWidget *widget)
 {
-  GtkStyle *new_style;
+  GtkStyle *new_style = NULL;
   gboolean initial_emission;
   
   g_return_if_fail (GTK_IS_WIDGET (widget));
@@ -3499,8 +3951,9 @@ gtk_widget_reset_rc_style (GtkWidget *widget)
 
   GTK_PRIVATE_UNSET_FLAG (widget, GTK_USER_STYLE);
   GTK_WIDGET_SET_FLAGS (widget, GTK_RC_STYLE);
-
-  new_style = gtk_rc_get_style (widget);
+  
+  if (gtk_widget_has_screen (widget))
+    new_style = gtk_rc_get_style (widget);
   if (!new_style)
     new_style = gtk_widget_get_default_style ();
 
@@ -3512,7 +3965,7 @@ gtk_widget_reset_rc_style (GtkWidget *widget)
  * gtk_widget_get_style:
  * @widget: a #GtkWidget
  * 
- * Simply an accessor function that returns widget->style.
+ * Simply an accessor function that returns @widget->style.
  * 
  * Return value: the widget's #GtkStyle
  **/
@@ -3529,8 +3982,8 @@ gtk_widget_get_style (GtkWidget *widget)
  * @widget: a #GtkWidget
  * @style: the #GtkRcStyle holding the style modifications
  * 
- * Modify style values on the widget. Modifications made using this
- * technique take precendence over style values set via an RC file,
+ * Modifies style values on the widget. Modifications made using this
+ * technique take precedence over style values set via an RC file,
  * however, they will be overriden if a style is explicitely set on
  * the widget using gtk_widget_set_style(). The #GtkRcStyle structure
  * is designed so each field can either be set or unset, so it is
@@ -3544,8 +3997,8 @@ gtk_widget_get_style (GtkWidget *widget)
  * make your modifications to the returned style, then call
  * gtk_widget_modify_style() with that style. On the other hand,
  * if you first call gtk_widget_modify_style(), subsequent calls
- * to such functions gtk_widget_modify_fg() will be have a cumulative
- * effect with the inital modifications.
+ * to such functions gtk_widget_modify_fg() will have a cumulative
+ * effect with the initial modifications.
  **/
 void       
 gtk_widget_modify_style (GtkWidget      *widget,
@@ -3553,15 +4006,15 @@ gtk_widget_modify_style (GtkWidget      *widget,
 {
   GtkRcStyle *old_style;
 
+  g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (GTK_IS_RC_STYLE (style));
   
-  old_style = gtk_object_get_data_by_id (GTK_OBJECT (widget),
-                                        quark_rc_style);
+  old_style = g_object_get_qdata (G_OBJECT (widget), quark_rc_style);
 
-  gtk_object_set_data_by_id_full (GTK_OBJECT (widget),
-                                  quark_rc_style,
-                                  gtk_rc_style_copy (style),
-                                  (GtkDestroyNotify)gtk_rc_style_unref);
+  g_object_set_qdata_full (G_OBJECT (widget),
+                          quark_rc_style,
+                          gtk_rc_style_copy (style),
+                          (GDestroyNotify) gtk_rc_style_unref);
 
   /* note that "style" may be invalid here if it was the old
    * modifier style and the only reference was our own.
@@ -3575,7 +4028,7 @@ gtk_widget_modify_style (GtkWidget      *widget,
  * gtk_widget_get_modifier_style:
  * @widget: a #GtkWidget
  * 
- * Return the current modifier style for the widget. (As set by
+ * Returns the current modifier style for the widget. (As set by
  * gtk_widget_modify_style().) If no style has previously set, a new
  * #GtkRcStyle will be created with all values unset, and set as the
  * modifier style for the widget. If you make changes to this rc
@@ -3597,16 +4050,17 @@ gtk_widget_get_modifier_style (GtkWidget      *widget)
 {
   GtkRcStyle *rc_style;
   
-  rc_style = gtk_object_get_data_by_id (GTK_OBJECT (widget),
-                                       quark_rc_style);
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+
+  rc_style = g_object_get_qdata (G_OBJECT (widget), quark_rc_style);
 
   if (!rc_style)
     {
       rc_style = gtk_rc_style_new ();
-      gtk_object_set_data_by_id_full (GTK_OBJECT (widget),
-                                     quark_rc_style,
-                                     rc_style,
-                                     (GtkDestroyNotify)gtk_rc_style_unref);
+      g_object_set_qdata_full (G_OBJECT (widget),
+                              quark_rc_style,
+                              rc_style,
+                              (GDestroyNotify) gtk_rc_style_unref);
     }
 
   return rc_style;
@@ -3620,36 +4074,43 @@ gtk_widget_modify_color_component (GtkWidget     *widget,
 {
   GtkRcStyle *rc_style = gtk_widget_get_modifier_style (widget);  
 
-  switch (component)
+  if (color)
     {
-    case GTK_RC_FG:
-      rc_style->fg[state] = *color;
-      break;
-    case GTK_RC_BG:
-      rc_style->bg[state] = *color;
-      break;
-    case GTK_RC_TEXT:
-      rc_style->text[state] = *color;
-       break;
-    case GTK_RC_BASE:
-      rc_style->base[state] = *color;
-      break;
-    default:
-      g_assert_not_reached();
+      switch (component)
+       {
+       case GTK_RC_FG:
+         rc_style->fg[state] = *color;
+         break;
+       case GTK_RC_BG:
+         rc_style->bg[state] = *color;
+         break;
+       case GTK_RC_TEXT:
+         rc_style->text[state] = *color;
+         break;
+       case GTK_RC_BASE:
+         rc_style->base[state] = *color;
+         break;
+       default:
+         g_assert_not_reached();
+       }
+      
+      rc_style->color_flags[state] |= component;
     }
-
-  rc_style->color_flags[state] |= component;
+  else
+    rc_style->color_flags[state] &= ~component;
 
   gtk_widget_modify_style (widget, rc_style);
 }
 
 /**
  * gtk_widget_modify_fg:
- * @widget: a #GtkWidget
+ * @widget: a #GtkWidget.
  * @state: the state for which to set the foreground color.
- * @color: the color to assign (does not need to be allocated)
+ * @color: the color to assign (does not need to be allocated),
+ *         or %NULL to undo the effect of previous calls to
+ *         of gtk_widget_modify_fg().
  * 
- * Set the foreground color for a widget in a particular state.  All
+ * Sets the foreground color for a widget in a particular state.  All
  * other style values are left untouched. See also
  * gtk_widget_modify_style().
  **/
@@ -3660,18 +4121,19 @@ gtk_widget_modify_fg (GtkWidget   *widget,
 {
   g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (state >= GTK_STATE_NORMAL && state <= GTK_STATE_INSENSITIVE);
-  g_return_if_fail (color != NULL);
 
   gtk_widget_modify_color_component (widget, GTK_RC_FG, state, color);
 }
 
 /**
  * gtk_widget_modify_bg:
- * @widget: a #GtkWidget
- * @state: the state for which to set the foreground color.
- * @color: the color to assign (does not need to be allocated)
+ * @widget: a #GtkWidget.
+ * @state: the state for which to set the background color.
+ * @color: the color to assign (does not need to be allocated),
+ *         or %NULL to undo the effect of previous calls to
+ *         of gtk_widget_modify_bg().
  * 
- * Set the background color for a widget in a particular state.  All
+ * Sets the background color for a widget in a particular state.  All
  * other style values are left untouched. See also
  * gtk_widget_modify_style().
  **/
@@ -3682,20 +4144,21 @@ gtk_widget_modify_bg (GtkWidget   *widget,
 {
   g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (state >= GTK_STATE_NORMAL && state <= GTK_STATE_INSENSITIVE);
-  g_return_if_fail (color != NULL);
 
   gtk_widget_modify_color_component (widget, GTK_RC_BG, state, color);
 }
 
 /**
- * gtk_widget_modify_base:
- * @widget: a #GtkWidget
- * @state: the state for which to set the foreground color.
- * @color: the color to assign (does not need to be allocated)
- * 
- * Set the text color for a widget in a particular state.  All other
+ * gtk_widget_modify_text:
+ * @widget: a #GtkWidget.
+ * @state: the state for which to set the text color.
+ * @color: the color to assign (does not need to be allocated),
+ *         or %NULL to undo the effect of previous calls to
+ *         of gtk_widget_modify_text().
+ * 
+ * Sets the text color for a widget in a particular state.  All other
  * style values are left untouched. The text color is the foreground
- * color used along with the base color (see gtk_widget_modify_base)
+ * color used along with the base color (see gtk_widget_modify_base())
  * for widgets such as #GtkEntry and #GtkTextView. See also
  * gtk_widget_modify_style().
  **/
@@ -3706,21 +4169,22 @@ gtk_widget_modify_text (GtkWidget   *widget,
 {
   g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (state >= GTK_STATE_NORMAL && state <= GTK_STATE_INSENSITIVE);
-  g_return_if_fail (color != NULL);
 
   gtk_widget_modify_color_component (widget, GTK_RC_TEXT, state, color);
 }
 
 /**
  * gtk_widget_modify_base:
- * @widget: a #GtkWidget
- * @state: the state for which to set the foreground color.
- * @color: the color to assign (does not need to be allocated)
+ * @widget: a #GtkWidget.
+ * @state: the state for which to set the base color.
+ * @color: the color to assign (does not need to be allocated),
+ *         or %NULL to undo the effect of previous calls to
+ *         of gtk_widget_modify_base().
  * 
- * Set the text color for a widget in a particular state.
+ * Sets the base color for a widget in a particular state.
  * All other style values are left untouched. The base color
  * is the background color used along with the text color
- * (see gtk_widget_modify_text) for widgets such as #GtkEntry
+ * (see gtk_widget_modify_text()) for widgets such as #GtkEntry
  * and #GtkTextView. See also gtk_widget_modify_style().
  **/
 void
@@ -3730,7 +4194,6 @@ gtk_widget_modify_base (GtkWidget  *widget,
 {
   g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (state >= GTK_STATE_NORMAL && state <= GTK_STATE_INSENSITIVE);
-  g_return_if_fail (color != NULL);
 
   gtk_widget_modify_color_component (widget, GTK_RC_BASE, state, color);
 }
@@ -3738,9 +4201,10 @@ gtk_widget_modify_base (GtkWidget  *widget,
 /**
  * gtk_widget_modify_font:
  * @widget: a #GtkWidget
- * @font_desc: the font description to use
+ * @font_desc: the font description to use, or %NULL to undo
+ *   the effect of previous calls to gtk_widget_modify_font().
  * 
- * Set the font to use for a widget.  All other style values are left
+ * Sets the font to use for a widget.  All other style values are left
  * untouched. See also gtk_widget_modify_style().
  **/
 void
@@ -3750,15 +4214,17 @@ gtk_widget_modify_font (GtkWidget            *widget,
   GtkRcStyle *rc_style;
 
   g_return_if_fail (GTK_IS_WIDGET (widget));
-  g_return_if_fail (font_desc != NULL);
 
   rc_style = gtk_widget_get_modifier_style (widget);  
 
   if (rc_style->font_desc)
     pango_font_description_free (rc_style->font_desc);
-  
-  rc_style->font_desc = pango_font_description_copy (font_desc);
 
+  if (font_desc)
+    rc_style->font_desc = pango_font_description_copy (font_desc);
+  else
+    rc_style->font_desc = NULL;
+  
   gtk_widget_modify_style (widget, rc_style);
 }
 
@@ -3783,10 +4249,7 @@ gtk_widget_set_style_internal (GtkWidget *widget,
                               GtkStyle  *style,
                               gboolean   initial_emission)
 {
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-  g_return_if_fail (style != NULL);
-
-  g_object_ref (G_OBJECT (widget));
+  g_object_ref (widget);
   g_object_freeze_notify (G_OBJECT (widget));
 
   if (widget->style != style || initial_emission)
@@ -3813,45 +4276,47 @@ gtk_widget_set_style_internal (GtkWidget *widget,
       if (GTK_WIDGET_REALIZED (widget))
        widget->style = gtk_style_attach (widget->style, widget->window);
 
-      gtk_signal_emit (GTK_OBJECT (widget),
-                      widget_signals[STYLE_SET],
-                      initial_emission ? NULL : previous_style);
+      g_signal_emit (widget,
+                    widget_signals[STYLE_SET],
+                    0,
+                    initial_emission ? NULL : previous_style);
       g_object_unref (previous_style);
 
       if (widget->parent && !initial_emission)
-       {
-         GtkRequisition old_requisition;
-         
-         old_requisition = 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_clear (widget);
-       }
+       gtk_widget_queue_resize (widget);
     }
   else if (initial_emission)
-    gtk_signal_emit (GTK_OBJECT (widget),
-                    widget_signals[STYLE_SET],
-                    NULL);
+    g_signal_emit (widget,
+                  widget_signals[STYLE_SET],
+                  0,
+                  NULL);
   g_object_notify (G_OBJECT (widget), "style");
   g_object_thaw_notify (G_OBJECT (widget));
-  g_object_unref (G_OBJECT (widget));
+  g_object_unref (widget);
 }
 
+typedef struct {
+  GtkWidget *previous_toplevel;
+  GdkScreen *previous_screen;
+  GdkScreen *new_screen;
+} HierarchyChangedInfo;
+
 static void
-gtk_widget_set_style_recurse (GtkWidget *widget,
-                             gpointer   client_data)
+do_screen_change (GtkWidget *widget,
+                 GdkScreen *old_screen,
+                 GdkScreen *new_screen)
 {
-  if (GTK_WIDGET_RC_STYLE (widget))
-    gtk_widget_reset_rc_style (widget);
-  
-  if (GTK_IS_CONTAINER (widget))
-    gtk_container_forall (GTK_CONTAINER (widget),
-                         gtk_widget_set_style_recurse,
-                         NULL);
+  if (old_screen != new_screen)
+    {
+      if (old_screen)
+       {
+         PangoContext *context = g_object_get_qdata (G_OBJECT (widget), quark_pango_context);
+         if (context)
+           g_object_set_qdata (G_OBJECT (widget), quark_pango_context, NULL);
+       }
+      
+      g_signal_emit (widget, widget_signals[SCREEN_CHANGED], 0, old_screen);
+    }
 }
 
 static void
@@ -3859,28 +4324,29 @@ gtk_widget_propagate_hierarchy_changed_recurse (GtkWidget *widget,
                                                gpointer   client_data)
 {
   gboolean new_anchored;
+  HierarchyChangedInfo *info = client_data;
 
   new_anchored = GTK_WIDGET_TOPLEVEL (widget) ||
                  (widget->parent && GTK_WIDGET_ANCHORED (widget->parent));
 
   if (GTK_WIDGET_ANCHORED (widget) != new_anchored)
     {
-      gtk_widget_ref (widget);
+      g_object_ref (widget);
       
       if (new_anchored)
        GTK_PRIVATE_SET_FLAG (widget, GTK_ANCHORED);
       else
        GTK_PRIVATE_UNSET_FLAG (widget, GTK_ANCHORED);
       
-      g_signal_emit (GTK_OBJECT (widget), widget_signals[HIERARCHY_CHANGED],
-                    0, client_data);
-  
+      g_signal_emit (widget, widget_signals[HIERARCHY_CHANGED], 0, info->previous_toplevel);
+      do_screen_change (widget, info->previous_screen, info->new_screen);
+      
       if (GTK_IS_CONTAINER (widget))
        gtk_container_forall (GTK_CONTAINER (widget),
                              gtk_widget_propagate_hierarchy_changed_recurse,
                              client_data);
       
-      gtk_widget_unref (widget);
+      g_object_unref (widget);
     }
 }
 
@@ -3889,21 +4355,92 @@ gtk_widget_propagate_hierarchy_changed_recurse (GtkWidget *widget,
  * @widget: a #GtkWidget
  * @previous_toplevel: Previous toplevel
  * 
- * Propagate changes in the anchored state to a widget and all
- * children, unsetting or setting the ANCHORED flag, and
- * emitting hierarchy_changed.
+ * Propagates changes in the anchored state to a widget and all
+ * children, unsetting or setting the %ANCHORED flag, and
+ * emitting ::hierarchy_changed.
  **/
 void
 _gtk_widget_propagate_hierarchy_changed (GtkWidget    *widget,
                                         GtkWidget    *previous_toplevel)
 {
+  HierarchyChangedInfo info;
+
+  info.previous_toplevel = previous_toplevel;
+  info.previous_screen = previous_toplevel ? gtk_widget_get_screen (previous_toplevel) : NULL;
+
+  if (GTK_WIDGET_TOPLEVEL (widget) ||
+      (widget->parent && GTK_WIDGET_ANCHORED (widget->parent)))
+    info.new_screen = gtk_widget_get_screen (widget);
+  else
+    info.new_screen = NULL;
+
+  if (info.previous_screen)
+    g_object_ref (info.previous_screen);
   if (previous_toplevel)
     g_object_ref (previous_toplevel);
 
-  gtk_widget_propagate_hierarchy_changed_recurse (widget, previous_toplevel);
-  
+  gtk_widget_propagate_hierarchy_changed_recurse (widget, &info);
+
   if (previous_toplevel)
     g_object_unref (previous_toplevel);
+  if (info.previous_screen)
+    g_object_unref (info.previous_screen);
+}
+
+static void
+gtk_widget_propagate_screen_changed_recurse (GtkWidget *widget,
+                                            gpointer   client_data)
+{
+  HierarchyChangedInfo *info = client_data;
+
+  g_object_ref (widget);
+  
+  do_screen_change (widget, info->previous_screen, info->new_screen);
+  
+  if (GTK_IS_CONTAINER (widget))
+    gtk_container_forall (GTK_CONTAINER (widget),
+                         gtk_widget_propagate_screen_changed_recurse,
+                         client_data);
+  
+  g_object_unref (widget);
+}
+
+/**
+ * _gtk_widget_propagate_screen_changed:
+ * @widget: a #GtkWidget
+ * @previous_screen: Previous screen
+ * 
+ * Propagates changes in the screen for a widget to all
+ * children, emitting ::screen_changed.
+ **/
+void
+_gtk_widget_propagate_screen_changed (GtkWidget    *widget,
+                                     GdkScreen    *previous_screen)
+{
+  HierarchyChangedInfo info;
+
+  info.previous_screen = previous_screen;
+  info.new_screen = gtk_widget_get_screen (widget);
+
+  if (previous_screen)
+    g_object_ref (previous_screen);
+
+  gtk_widget_propagate_screen_changed_recurse (widget, &info);
+
+  if (previous_screen)
+    g_object_unref (previous_screen);
+}
+
+static void
+reset_rc_styles_recurse (GtkWidget *widget, gpointer data)
+{
+  if (GTK_WIDGET_RC_STYLE (widget))
+    gtk_widget_reset_rc_style (widget);
+  
+  if (GTK_IS_CONTAINER (widget))
+    gtk_container_forall (GTK_CONTAINER (widget),
+                         reset_rc_styles_recurse,
+                         NULL);
 }
 
 void
@@ -3911,9 +4448,17 @@ gtk_widget_reset_rc_styles (GtkWidget *widget)
 {
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
-  gtk_widget_set_style_recurse (widget, NULL);
+  reset_rc_styles_recurse (widget, NULL);
 }
 
+/**
+ * gtk_widget_get_default_style:
+ * 
+ * Returns the default style used by all widgets initially.
+ * 
+ * Returns: the default style. This #GtkStyle object is owned by GTK+ and
+ * should not be modified or freed.
+ */ 
 GtkStyle*
 gtk_widget_get_default_style (void)
 {
@@ -3929,18 +4474,19 @@ gtk_widget_get_default_style (void)
 static PangoContext *
 gtk_widget_peek_pango_context (GtkWidget *widget)
 {
-  return gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_pango_context);
+  return g_object_get_qdata (G_OBJECT (widget), quark_pango_context);
 }
 
 /**
  * gtk_widget_get_pango_context:
  * @widget: a #GtkWidget
  * 
- * Get a #PangoContext with the appropriate colormap, font description
+ * Gets a #PangoContext with the appropriate colormap, font description
  * and base direction for this widget. Unlike the context returned
  * by gtk_widget_create_pango_context(), this context is owned by
- * the widget (it can be used as long as widget exists), and will
- * be updated to match any changes to the widget's attributes.
+ * the widget (it can be used until the screen for the widget changes
+ * or the widget is removed from its toplevel), and will be updated to
+ * match any changes to the widget's attributes.
  *
  * If you create and keep a #PangoLayout using this context, you must
  * deal with changes to the context by calling pango_layout_context_changed()
@@ -3956,12 +4502,14 @@ gtk_widget_get_pango_context (GtkWidget *widget)
 
   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
   
-  context = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_pango_context);
+  context = g_object_get_qdata (G_OBJECT (widget), quark_pango_context);
   if (!context)
     {
       context = gtk_widget_create_pango_context (GTK_WIDGET (widget));
-      gtk_object_set_data_by_id_full (GTK_OBJECT (widget), quark_pango_context, context,
-                                     (GDestroyNotify) g_object_unref);
+      g_object_set_qdata_full (G_OBJECT (widget),
+                              quark_pango_context,
+                              context,
+                              g_object_unref);
     }
 
   return context;
@@ -3969,22 +4517,32 @@ gtk_widget_get_pango_context (GtkWidget *widget)
 
 /**
  * gtk_widget_create_pango_context:
- * @widget: a #PangoWidget
+ * @widget: a #GtkWidget
  * 
- * Create a new pango context with the appropriate colormap,
+ * Creates a new #PangoContext with the appropriate colormap,
  * font description, and base direction for drawing text for
- * this widget. See also gtk_widget_get_pango_context()
+ * this widget. See also gtk_widget_get_pango_context().
  * 
  * Return value: the new #PangoContext
  **/
 PangoContext *
 gtk_widget_create_pango_context (GtkWidget *widget)
 {
+  GdkScreen *screen;
   PangoContext *context;
 
   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
 
-  context = gdk_pango_context_get ();
+  screen = gtk_widget_get_screen_unchecked (widget);
+  if (!screen)
+    {
+      GTK_NOTE (MULTIHEAD,
+               g_warning ("gtk_widget_create_pango_context ()) called without screen"));
+      
+      screen = gdk_screen_get_default ();
+    }
+
+  context = gdk_pango_context_get_for_screen (screen);
 
   gdk_pango_context_set_colormap (context, gtk_widget_get_colormap (widget));
   pango_context_set_base_dir (context,
@@ -3998,10 +4556,10 @@ gtk_widget_create_pango_context (GtkWidget *widget)
 
 /**
  * gtk_widget_create_pango_layout:
- * @widget: a #PangoWidget
+ * @widget: a #GtkWidget
  * @text:   text to set on the layout (can be %NULL)
  * 
- * Create a new #PangoLayout with the appropriate colormap,
+ * Creates a new #PangoLayout with the appropriate colormap,
  * font description, and base direction for drawing text for
  * this widget.
  *
@@ -4044,7 +4602,11 @@ gtk_widget_create_pango_layout (GtkWidget   *widget,
  * such as #GTK_ICON_SIZE_MENU. @detail should be a string that
  * identifies the widget or code doing the rendering, so that
  * theme engines can special-case rendering for that widget or code.
- * 
+ *
+ * The pixels in the returned #GdkPixbuf are shared with the rest of
+ * the application and should not be modified. The pixbuf should be freed
+ * after use with g_object_unref().
+ *
  * Return value: a new pixbuf, or %NULL if the stock ID wasn't known
  **/
 GdkPixbuf*
@@ -4078,17 +4640,13 @@ gtk_widget_render_icon (GtkWidget      *widget,
   return retval;
 }
 
-/*************************************************************
+/**
  * gtk_widget_set_parent_window:
- *     Set a non default parent window for widget
- *
- *   arguments:
- *     widget:
- *     parent_window 
- *     
- *   results:
- *************************************************************/
-
+ * @widget: a #GtkWidget.
+ * @parent_window: the new parent window.
+ *  
+ * Sets a non default parent window for @widget.
+ **/
 void
 gtk_widget_set_parent_window   (GtkWidget           *widget,
                                GdkWindow           *parent_window)
@@ -4097,17 +4655,17 @@ gtk_widget_set_parent_window   (GtkWidget           *widget,
 
   g_return_if_fail (GTK_IS_WIDGET (widget));
   
-  old_parent_window = gtk_object_get_data_by_id (GTK_OBJECT (widget),
-                                                quark_parent_window);
+  old_parent_window = g_object_get_qdata (G_OBJECT (widget),
+                                         quark_parent_window);
 
   if (parent_window != old_parent_window)
     {
-      gtk_object_set_data_by_id (GTK_OBJECT (widget), quark_parent_window, 
-                                parent_window);
+      g_object_set_qdata (G_OBJECT (widget), quark_parent_window, 
+                         parent_window);
       if (old_parent_window)
-       gdk_window_unref (old_parent_window);
+       g_object_unref (old_parent_window);
       if (parent_window)
-       gdk_window_ref (parent_window);
+       g_object_ref (parent_window);
     }
 }
 
@@ -4145,8 +4703,17 @@ gtk_widget_set_child_visible (GtkWidget *widget,
   if (is_visible)
     GTK_PRIVATE_SET_FLAG (widget, GTK_CHILD_VISIBLE);
   else
-    GTK_PRIVATE_UNSET_FLAG (widget, GTK_CHILD_VISIBLE);
-  if (GTK_WIDGET_REALIZED (widget->parent))
+    {
+      GtkWidget *toplevel;
+      
+      GTK_PRIVATE_UNSET_FLAG (widget, GTK_CHILD_VISIBLE);
+
+      toplevel = gtk_widget_get_toplevel (widget);
+      if (toplevel != widget && GTK_WIDGET_TOPLEVEL (toplevel))
+       _gtk_window_unset_focus_and_default (GTK_WINDOW (toplevel), widget);
+    }
+
+  if (widget->parent && GTK_WIDGET_REALIZED (widget->parent))
     {
       if (GTK_WIDGET_MAPPED (widget->parent) &&
          GTK_WIDGET_CHILD_VISIBLE (widget) &&
@@ -4178,17 +4745,143 @@ gtk_widget_get_child_visible (GtkWidget *widget)
   return GTK_WIDGET_CHILD_VISIBLE (widget);
 }
 
-/*************************************************************
- * gtk_widget_get_parent_window:
- *     Get widget's parent window
+static GdkScreen *
+gtk_widget_get_screen_unchecked (GtkWidget *widget)
+{
+  GtkWidget *toplevel;
+  
+  toplevel = gtk_widget_get_toplevel (widget);
+
+  if (GTK_WIDGET_TOPLEVEL (toplevel))
+    {
+      if (GTK_IS_WINDOW (toplevel))
+       return GTK_WINDOW (toplevel)->screen;
+      else if (GTK_IS_INVISIBLE (toplevel))
+       return GTK_INVISIBLE (widget)->screen;
+    }
+
+  return NULL;
+}
+
+/**
+ * gtk_widget_get_screen:
+ * @widget: a #GtkWidget
+ * 
+ * Get the #GdkScreen from the toplevel window associated with
+ * this widget. This function can only be called after the widget
+ * has been added to a widget hierarchy with a #GtkWindow
+ * at the top.
  *
- *   arguments:
- *     widget:
- *     
- *   results:
- *     parent window
- *************************************************************/
+ * In general, you should only create screen specific
+ * resources when a widget has been realized, and you should
+ * free those resources when the widget is unrealized.
+ * 
+ * Return value: the #GdkScreen for the toplevel for this widget.
+ *
+ * Since: 2.2
+ **/
+GdkScreen*
+gtk_widget_get_screen (GtkWidget *widget)
+{
+  GdkScreen *screen;
+  
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+
+  screen = gtk_widget_get_screen_unchecked (widget);
+
+  if (screen)
+    return screen;
+  else
+    {
+#if 0
+      g_warning (G_STRLOC ": Can't get associated screen"
+                " for a widget unless it is inside a toplevel GtkWindow\n"
+                " widget type is %s associated top level type is %s",
+                g_type_name (G_OBJECT_TYPE(G_OBJECT (widget))),
+                g_type_name (G_OBJECT_TYPE(G_OBJECT (toplevel))));
+#endif
+      return gdk_screen_get_default ();
+    }
+}
+
+/**
+ * gtk_widget_has_screen:
+ * @widget: a #GtkWidget
+ * 
+ * Checks whether there is a #GdkScreen is associated with
+ * this widget. All toplevel widgets have an associated
+ * screen, and all widgets added into a heirarchy with a toplevel
+ * window at the top.
+ * 
+ * Return value: %TRUE if there is a #GdkScreen associcated
+ *   with the widget.
+ *
+ * Since: 2.2
+ **/
+gboolean
+gtk_widget_has_screen (GtkWidget *widget)
+{
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+
+  return (gtk_widget_get_screen_unchecked (widget) != NULL);
+}
+
+/**
+ * gtk_widget_get_display:
+ * @widget: a #GtkWidget
+ * 
+ * Get the #GdkDisplay for the toplevel window associated with
+ * this widget. This function can only be called after the widget
+ * has been added to a widget hierarchy with a #GtkWindow at the top.
+ *
+ * In general, you should only create display specific
+ * resources when a widget has been realized, and you should
+ * free those resources when the widget is unrealized.
+ * 
+ * Return value: the #GdkDisplay for the toplevel for this widget.
+ *
+ * Since: 2.2
+ **/
+GdkDisplay*
+gtk_widget_get_display (GtkWidget *widget)
+{
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+  
+  return gdk_screen_get_display (gtk_widget_get_screen (widget));
+}
+
+/**
+ * gtk_widget_get_root_window:
+ * @widget: a #GtkWidget
+ * 
+ * Get the root window where this widget is located. This function can
+ * only be called after the widget has been added to a widget
+ * heirarchy with #GtkWindow at the top.
+ *
+ * The root window is useful for such purposes as creating a popup
+ * #GdkWindow associated with the window. In general, you should only
+ * create display specific resources when a widget has been realized,
+ * and you should free those resources when the widget is unrealized.
+ * 
+ * Return value: the #GdkWindow root window for the toplevel for this widget.
+ *
+ * Since: 2.2
+ **/
+GdkWindow*
+gtk_widget_get_root_window (GtkWidget *widget)
+{
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+
+  return gdk_screen_get_root_window (gtk_widget_get_screen (widget));
+}
 
+/**
+ * gtk_widget_get_parent_window:
+ * @widget: a #GtkWidget.
+ * @returns: the parent window of @widget.
+ * 
+ * Gets @widget's parent window.
+ **/
 GdkWindow *
 gtk_widget_get_parent_window   (GtkWidget           *widget)
 {
@@ -4197,8 +4890,7 @@ gtk_widget_get_parent_window   (GtkWidget           *widget)
   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
   g_return_val_if_fail (widget->parent != NULL, NULL);
   
-  parent_window = gtk_object_get_data_by_id (GTK_OBJECT (widget),
-                                            quark_parent_window);
+  parent_window = g_object_get_qdata (G_OBJECT (widget), quark_parent_window);
 
   return (parent_window != NULL) ? parent_window : widget->parent->window;
 }
@@ -4256,9 +4948,10 @@ gtk_widget_child_focus (GtkWidget       *widget,
       !GTK_WIDGET_CAN_FOCUS (widget))
     return FALSE;
   
-  gtk_signal_emit (GTK_OBJECT (widget),
-                   widget_signals[FOCUS],
-                   direction, &return_val);
+  g_signal_emit (widget,
+                widget_signals[FOCUS],
+                0,
+                direction, &return_val);
 
   return return_val;
 }
@@ -4271,7 +4964,7 @@ gtk_widget_child_focus (GtkWidget       *widget,
  * 
  *
  * Sets the position of a widget. The funny "u" in the name comes from
- * the "user position" hint specified by the X window system, and
+ * the "user position" hint specified by the X Window System, and
  * exists for legacy reasons. This function doesn't work if a widget
  * is inside a container; it's only really useful on #GtkWindow.
  *
@@ -4283,8 +4976,8 @@ gtk_widget_child_focus (GtkWidget       *widget,
  * to set #GTK_WIN_POS_CENTER_ON_PARENT, don't do the centering
  * manually.
  *
- * Note that although x and y can be individually unset, the position
- * is not honoured unless both x and y are set.
+ * Note that although @x and @y can be individually unset, the position
+ * is not honoured unless both @x and @y are set.
  **/
 void
 gtk_widget_set_uposition (GtkWidget *widget,
@@ -4294,6 +4987,8 @@ gtk_widget_set_uposition (GtkWidget *widget,
   /* FIXME this function is the only place that aux_info->x and
    * aux_info->y are even used I believe, and this function is
    * deprecated. Should be cleaned up.
+   *
+   * (Actually, size_allocate uses them) -Yosh
    */
   
   GtkWidgetAuxInfo *aux_info;
@@ -4331,6 +5026,36 @@ gtk_widget_set_uposition (GtkWidget *widget,
     gtk_widget_size_allocate (widget, &widget->allocation);
 }
 
+static void
+gtk_widget_set_usize_internal (GtkWidget *widget,
+                              gint       width,
+                              gint       height)
+{
+  GtkWidgetAuxInfo *aux_info;
+  
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+  
+  g_object_freeze_notify (G_OBJECT (widget));
+
+  aux_info =_gtk_widget_get_aux_info (widget, TRUE);
+  
+  if (width > -2)
+    {
+      g_object_notify (G_OBJECT (widget), "width_request");
+      aux_info->width = width;
+    }
+  if (height > -2)
+    {
+      g_object_notify (G_OBJECT (widget), "height_request");  
+      aux_info->height = height;
+    }
+  
+  if (GTK_WIDGET_VISIBLE (widget))
+    gtk_widget_queue_resize (widget);
+
+  g_object_thaw_notify (G_OBJECT (widget));
+}
+
 /**
  * gtk_widget_set_usize:
  * @widget: a #GtkWidget
@@ -4364,29 +5089,9 @@ gtk_widget_set_usize (GtkWidget *widget,
                      gint       width,
                      gint       height)
 {
-  GtkWidgetAuxInfo *aux_info;
-  
   g_return_if_fail (GTK_IS_WIDGET (widget));
   
-  g_object_freeze_notify (G_OBJECT (widget));
-
-  aux_info =_gtk_widget_get_aux_info (widget, TRUE);
-  
-  if (width > -2)
-    {
-      g_object_notify (G_OBJECT (widget), "width_request");
-      aux_info->width = width;
-    }
-  if (height > -2)
-    {
-      g_object_notify (G_OBJECT (widget), "height_request");  
-      aux_info->height = height;
-    }
-  
-  if (GTK_WIDGET_VISIBLE (widget))
-    gtk_widget_queue_resize (widget);
-
-  g_object_thaw_notify (G_OBJECT (widget));
+  gtk_widget_set_usize_internal (widget, width, height);
 }
 
 /**
@@ -4439,7 +5144,7 @@ gtk_widget_set_size_request (GtkWidget *widget,
   if (height == 0)
     height = 1;
   
-  gtk_widget_set_usize (widget, width, height);
+  gtk_widget_set_usize_internal (widget, width, height);
 }
 
 
@@ -4501,10 +5206,9 @@ gtk_widget_set_events (GtkWidget *widget,
   gint *eventp;
   
   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));
   
-  eventp = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_event_mask);
+  eventp = g_object_get_qdata (G_OBJECT (widget), quark_event_mask);
   
   if (events)
     {
@@ -4512,12 +5216,12 @@ gtk_widget_set_events (GtkWidget *widget,
        eventp = g_new (gint, 1);
       
       *eventp = events;
-      gtk_object_set_data_by_id (GTK_OBJECT (widget), quark_event_mask, eventp);
+      g_object_set_qdata (G_OBJECT (widget), quark_event_mask, eventp);
     }
   else if (eventp)
     {
       g_free (eventp);
-      gtk_object_remove_data_by_id (GTK_OBJECT (widget), quark_event_mask);
+      g_object_set_qdata (G_OBJECT (widget), quark_event_mask, NULL);
     }
 
   g_object_notify (G_OBJECT (widget), "events");
@@ -4539,9 +5243,8 @@ gtk_widget_add_events (GtkWidget *widget,
   gint *eventp;
   
   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), quark_event_mask);
+
+  eventp = g_object_get_qdata (G_OBJECT (widget), quark_event_mask);
   
   if (events)
     {
@@ -4552,18 +5255,38 @@ gtk_widget_add_events (GtkWidget *widget,
        }
       
       *eventp |= events;
-      gtk_object_set_data_by_id (GTK_OBJECT (widget), quark_event_mask, eventp);
+      g_object_set_qdata (G_OBJECT (widget), quark_event_mask, eventp);
     }
   else if (eventp)
     {
       g_free (eventp);
-      gtk_object_remove_data_by_id (GTK_OBJECT (widget), quark_event_mask);
+      g_object_set_qdata (G_OBJECT (widget), quark_event_mask, NULL);
     }
 
   if (GTK_WIDGET_REALIZED (widget))
     {
-      gdk_window_set_events (widget->window,
-                            gdk_window_get_events (widget->window) | events);
+      if (GTK_WIDGET_NO_WINDOW (widget))
+       {
+         GList *children = gdk_window_get_children (widget->window);
+         GList *tmp_list = children;
+
+         while (tmp_list)
+           {
+             GdkWindow *window = tmp_list->data;
+             gpointer user_data;
+
+             gdk_window_get_user_data (window, &user_data);
+             if (user_data == widget)
+               gdk_window_set_events (window, gdk_window_get_events (window) | events);
+             tmp_list = tmp_list->next;
+           }
+
+         g_list_free (children);
+       }
+      else
+       {
+         gdk_window_set_events (widget->window, gdk_window_get_events (widget->window) | events);
+       }
     }
 
   g_object_notify (G_OBJECT (widget), "events");
@@ -4586,13 +5309,13 @@ gtk_widget_set_extension_events (GtkWidget *widget,
   
   g_return_if_fail (GTK_IS_WIDGET (widget));
   
-  modep = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_extension_event_mode);
+  modep = g_object_get_qdata (G_OBJECT (widget), quark_extension_event_mode);
   
   if (!modep)
     modep = g_new (GdkExtensionMode, 1);
   
   *modep = mode;
-  gtk_object_set_data_by_id (GTK_OBJECT (widget), quark_extension_event_mode, modep);
+  g_object_set_qdata (G_OBJECT (widget), quark_extension_event_mode, modep);
   g_object_notify (G_OBJECT (widget), "extension_events");
 }
 
@@ -4606,24 +5329,26 @@ gtk_widget_set_extension_events (GtkWidget *widget,
  * returned widget; it should not be unreferenced.
  *
  * Note the difference in behavior vs. gtk_widget_get_ancestor();
- * gtk_widget_get_ancestor (widget, GTK_TYPE_WINDOW) would return
+ * <literal>gtk_widget_get_ancestor (widget, GTK_TYPE_WINDOW)</literal> 
+ * would return
  * %NULL if @widget wasn't inside a toplevel window, and if the
- * window was inside a GtkWindow-derived widget which was in turn
- * inside the toplevel GtkWindow. While the second case may
- * seem unlikely, it actually happens when a GtkPlug is embedded
- * inside a GtkSocket within the same application
+ * window was inside a #GtkWindow-derived widget which was in turn
+ * inside the toplevel #GtkWindow. While the second case may
+ * seem unlikely, it actually happens when a #GtkPlug is embedded
+ * inside a #GtkSocket within the same application.
  * 
- * To reliably find the toplevel GtkWindow, use
- * gtk_widget_get_toplevel() and check if the TOPLEVEL flags
+ * To reliably find the toplevel #GtkWindow, use
+ * gtk_widget_get_toplevel() and check if the %TOPLEVEL flags
  * is set on the result.
- * 
+ * <informalexample><programlisting>
  *  GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
  *  if (GTK_WIDGET_TOPLEVEL (toplevel))
- *   {
- *     [ Perform action on toplevel. ]
- *   }
+ *    {
+ *      [ Perform action on toplevel. ]
+ *    }
+ * </programlisting></informalexample>
  *
- * Return value: the topmost ancestor of @widget, or @widget itself if there's no ancestor
+ * Return value: the topmost ancestor of @widget, or @widget itself if there's no ancestor.
  **/
 GtkWidget*
 gtk_widget_get_toplevel (GtkWidget *widget)
@@ -4642,23 +5367,27 @@ gtk_widget_get_toplevel (GtkWidget *widget)
  * @widget_type: ancestor type
  * 
  * Gets the first ancestor of @widget with type @widget_type. For example,
- * gtk_widget_get_ancestor (widget, GTK_TYPE_BOX) gets the first #GtkBox that's
+ * <literal>gtk_widget_get_ancestor (widget, GTK_TYPE_BOX)</literal> gets the 
+ * first #GtkBox that's
  * an ancestor of @widget. No reference will be added to the returned widget;
  * it should not be unreferenced. See note about checking for a toplevel
- * GtkWindow in the docs for gtk_widget_get_toplevel().
+ * #GtkWindow in the docs for gtk_widget_get_toplevel().
  * 
+ * Note that unlike gtk_widget_is_ancestor(), gtk_widget_get_ancestor() 
+ * considers @widget to be an ancestor of itself.
+ *
  * Return value: the ancestor widget, or %NULL if not found
  **/
 GtkWidget*
 gtk_widget_get_ancestor (GtkWidget *widget,
-                        GtkType    widget_type)
+                        GType      widget_type)
 {
   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
   
-  while (widget && !gtk_type_is_a (GTK_WIDGET_TYPE (widget), widget_type))
+  while (widget && !g_type_is_a (GTK_WIDGET_TYPE (widget), widget_type))
     widget = widget->parent;
   
-  if (!(widget && gtk_type_is_a (GTK_WIDGET_TYPE (widget), widget_type)))
+  if (!(widget && g_type_is_a (GTK_WIDGET_TYPE (widget), widget_type)))
     return NULL;
   
   return widget;
@@ -4677,27 +5406,29 @@ GdkColormap*
 gtk_widget_get_colormap (GtkWidget *widget)
 {
   GdkColormap *colormap;
+  GtkWidget *tmp_widget;
   
   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
   
   if (widget->window)
     {
-      colormap = gdk_window_get_colormap (widget->window);
+      colormap = gdk_drawable_get_colormap (widget->window);
       /* If window was destroyed previously, we'll get NULL here */
       if (colormap)
        return colormap;
     }
 
-  while (widget)
+  tmp_widget = widget;
+  while (tmp_widget)
     {
-      colormap = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_colormap);
+      colormap = g_object_get_qdata (G_OBJECT (tmp_widget), quark_colormap);
       if (colormap)
        return colormap;
 
-      widget = widget->parent;
+      tmp_widget= tmp_widget->parent;
     }
 
-  return gtk_widget_get_default_colormap ();
+  return gdk_screen_get_default_colormap (gtk_widget_get_screen (widget));
 }
 
 /**
@@ -4720,15 +5451,21 @@ gtk_widget_get_visual (GtkWidget *widget)
  * gtk_widget_get_settings:
  * @widget: a #GtkWidget
  * 
- * Get the settings object holding the settings (global property
+ * Gets the settings object holding the settings (global property
  * settings, RC file information, etc) used for this widget.
+ *
+ * Note that this function can only be called when the #GtkWidget
+ * is attached to a toplevel, since the settings object is specific
+ * to a particular #GdkScreen.
  * 
  * Return value: the relevant #GtkSettings object
  **/
 GtkSettings*
 gtk_widget_get_settings (GtkWidget *widget)
 {
-  return gtk_settings_get_default ();
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+  
+  return gtk_settings_get_for_screen (gtk_widget_get_screen (widget));
 }
 
 /**
@@ -4736,9 +5473,10 @@ gtk_widget_get_settings (GtkWidget *widget)
  * @widget: a #GtkWidget
  * @colormap: a colormap
  *
- * Set the colormap for the widget to the given value. Widget must not
+ * Sets 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 (i.e. from the constructor for the widget).
+ * from an <function>init()</function> function (i.e. from the constructor 
+ * for the widget).
  * 
  **/
 void
@@ -4749,12 +5487,12 @@ gtk_widget_set_colormap (GtkWidget   *widget,
   g_return_if_fail (!GTK_WIDGET_REALIZED (widget));
   g_return_if_fail (GDK_IS_COLORMAP (colormap));
 
-  g_object_ref (G_OBJECT (colormap));
+  g_object_ref (colormap);
   
   g_object_set_qdata_full (G_OBJECT (widget), 
                           quark_colormap,
                           colormap,
-                          (GtkDestroyNotify) g_object_unref);
+                          g_object_unref);
 }
 
 /**
@@ -4774,7 +5512,7 @@ gtk_widget_get_events (GtkWidget *widget)
   
   g_return_val_if_fail (GTK_IS_WIDGET (widget), 0);
   
-  events = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_event_mask);
+  events = g_object_get_qdata (G_OBJECT (widget), quark_event_mask);
   if (events)
     return *events;
   
@@ -4797,7 +5535,7 @@ gtk_widget_get_extension_events (GtkWidget *widget)
   
   g_return_val_if_fail (GTK_IS_WIDGET (widget), 0);
   
-  mode = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_extension_event_mode);
+  mode = g_object_get_qdata (G_OBJECT (widget), quark_extension_event_mode);
   if (mode)
     return *mode;
   
@@ -4812,9 +5550,9 @@ gtk_widget_get_extension_events (GtkWidget *widget)
  *
  * Obtains the location of the mouse pointer in widget coordinates.
  * Widget coordinates are a bit odd; for historical reasons, they are
- * defined as widget->window coordinates for widgets that are not
- * #GTK_NO_WINDOW widgets, and are relative to widget->allocation.x,
- * widget->allocation.y for widgets that are #GTK_NO_WINDOW widgets.
+ * defined as @widget->window coordinates for widgets that are not
+ * #GTK_NO_WINDOW widgets, and are relative to @widget->allocation.x,
+ * @widget->allocation.y for widgets that are #GTK_NO_WINDOW widgets.
  * 
  **/
 void
@@ -4872,6 +5610,14 @@ gtk_widget_is_ancestor (GtkWidget *widget,
 
 static GQuark quark_composite_name = 0;
 
+/**
+ * gtk_widget_set_composite_name:
+ * @widget: a #GtkWidget.
+ * @name: the name to set.
+ * 
+ * Sets a widgets composite name. The widget must be
+ * a composite child of its parent; see gtk_widget_push_composite_child().
+ **/
 void
 gtk_widget_set_composite_name (GtkWidget   *widget,
                               const gchar *name)
@@ -4883,30 +5629,67 @@ gtk_widget_set_composite_name (GtkWidget   *widget,
   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);
+  g_object_set_qdata_full (G_OBJECT (widget),
+                          quark_composite_name,
+                          g_strdup (name),
+                          g_free);
 }
 
+/**
+ * gtk_widget_get_composite_name:
+ * @widget: a #GtkWidget.
+ * @returns: the composite name of @widget, or %NULL if @widget is not
+ *   a composite child. The string should not be freed when it is no 
+ *   longer needed.
+ *
+ * Obtains the composite name of a widget. 
+ **/
 gchar*
 gtk_widget_get_composite_name (GtkWidget *widget)
 {
   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),
+    return _gtk_container_child_composite_name (GTK_CONTAINER (widget->parent),
                                               widget);
   else
     return NULL;
 }
 
+/**
+ * gtk_widget_push_composite_child:
+ * 
+ * Makes all newly-created widgets as composite children until
+ * the corresponding gtk_widget_pop_composite_child() call.
+ * 
+ * A composite child is a child that's an implementation detail of the
+ * container it's inside and should not be visible to people using the
+ * container. Composite children aren't treated differently by GTK (but
+ * see gtk_container_foreach() vs. gtk_container_forall()), but e.g. GUI 
+ * builders might want to treat them in a different way.
+ * 
+ * Here is a simple example:
+ * <informalexample><programlisting>
+ *   gtk_widget_push_composite_child (<!-- -->);
+ *   scrolled_window->hscrollbar = gtk_hscrollbar_new (hadjustment);
+ *   gtk_widget_set_composite_name (scrolled_window->hscrollbar, "hscrollbar");
+ *   gtk_widget_pop_composite_child (<!-- -->);
+ *   gtk_widget_set_parent (scrolled_window->hscrollbar, 
+ *                          GTK_WIDGET (scrolled_window));
+ *   g_object_ref (scrolled_window->hscrollbar);
+ * </programlisting></informalexample>
+ **/
 void
 gtk_widget_push_composite_child (void)
 {
   composite_child_stack++;
 }
 
+/**
+ * gtk_widget_pop_composite_child:
+ *
+ * Cancels the effect of a previous call to gtk_widget_push_composite_child().
+ **/ 
 void
 gtk_widget_pop_composite_child (void)
 {
@@ -4927,7 +5710,7 @@ gtk_widget_pop_composite_child (void)
 void
 gtk_widget_push_colormap (GdkColormap *cmap)
 {
-  g_return_if_fail (cmap != NULL);
+  g_return_if_fail (!cmap || GDK_IS_COLORMAP (cmap));
 
   colormap_stack = g_slist_prepend (colormap_stack, cmap);
 }
@@ -4952,19 +5735,14 @@ gtk_widget_pop_colormap (void)
  * Sets the default colormap to use when creating widgets.
  * gtk_widget_push_colormap() is a better function to use if
  * you only want to affect a few widgets, rather than all widgets.
- * 
  **/
 void
 gtk_widget_set_default_colormap (GdkColormap *colormap)
 {
-  if (default_colormap != colormap)
-    {
-      if (default_colormap)
-       gdk_colormap_unref (default_colormap);
-      default_colormap = colormap;
-      if (default_colormap)
-       gdk_colormap_ref (default_colormap);
-    }
+  g_return_if_fail (GDK_IS_COLORMAP (colormap));
+  
+  gdk_screen_set_default_colormap (gdk_colormap_get_screen (colormap),
+                                  colormap);
 }
 
 /**
@@ -4977,10 +5755,7 @@ gtk_widget_set_default_colormap (GdkColormap *colormap)
 GdkColormap*
 gtk_widget_get_default_colormap (void)
 {
-  if (!default_colormap)
-    gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());
-  
-  return default_colormap;
+  return gdk_screen_get_default_colormap (gdk_screen_get_default ());
 }
 
 /**
@@ -5008,7 +5783,7 @@ gtk_widget_emit_direction_changed (GtkWidget        *widget,
                                gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR ?
                                  PANGO_DIRECTION_LTR : PANGO_DIRECTION_RTL);
   
-  gtk_signal_emit (GTK_OBJECT (widget), widget_signals[DIRECTION_CHANGED], old_dir);
+  g_signal_emit (widget, widget_signals[DIRECTION_CHANGED], 0, old_dir);
 }
 
 /**
@@ -5016,7 +5791,7 @@ gtk_widget_emit_direction_changed (GtkWidget        *widget,
  * @widget: a #GtkWidget
  * @dir:    the new direction
  * 
- * Set the reading direction on a particular widget. This direction
+ * Sets the reading direction on a particular widget. This direction
  * controls the primary direction for widgets containing text,
  * and also the direction in which the children of a container are
  * packed. The ability to set the direction is present in order
@@ -5024,7 +5799,7 @@ gtk_widget_emit_direction_changed (GtkWidget        *widget,
  * reading directions can be done. Generally, applications will
  * let the default reading direction present, except for containers
  * where the containers are arranged in an order that is explicitely
- * visual rather than logical (such as buttons for text justificiation).
+ * visual rather than logical (such as buttons for text justification).
  *
  * If the direction is set to %GTK_TEXT_DIR_NONE, then the value
  * set by gtk_widget_set_default_direction() will be used.
@@ -5059,7 +5834,7 @@ gtk_widget_set_direction (GtkWidget        *widget,
  * gtk_widget_get_direction:
  * @widget: a #GtkWidget
  * 
- * Get the reading direction for a particular widget. See
+ * Gets the reading direction for a particular widget. See
  * gtk_widget_set_direction().
  * 
  * Return value: the reading direction for the widget.
@@ -5080,7 +5855,7 @@ gtk_widget_set_default_direction_recurse (GtkWidget *widget, gpointer data)
 {
   GtkTextDirection old_dir = GPOINTER_TO_UINT (data);
 
-  g_object_ref (G_OBJECT (widget));
+  g_object_ref (widget);
   
   if (!GTK_WIDGET_DIRECTION_SET (widget))
     gtk_widget_emit_direction_changed (widget, old_dir);
@@ -5090,7 +5865,7 @@ gtk_widget_set_default_direction_recurse (GtkWidget *widget, gpointer data)
                          gtk_widget_set_default_direction_recurse,
                          data);
 
-  g_object_unref (G_OBJECT (widget));
+  g_object_unref (widget);
 }
 
 /**
@@ -5098,7 +5873,7 @@ gtk_widget_set_default_direction_recurse (GtkWidget *widget, gpointer data)
  * @dir: the new default direction. This cannot be
  *        %GTK_TEXT_DIR_NONE.
  * 
- * Set the default reading direction for widgets where the
+ * Sets the default reading direction for widgets where the
  * direction has not been explicitly set by gtk_widget_set_direction().
  **/
 void
@@ -5131,8 +5906,10 @@ gtk_widget_set_default_direction (GtkTextDirection dir)
 /**
  * gtk_widget_get_default_direction:
  * 
- * Return value: the current default direction. See
- * gtk_widget_set_direction().
+ * Obtains the current default reading direction. See
+ * gtk_widget_set_default_direction().
+ *
+ * Return value: the current default direction. 
  **/
 GtkTextDirection
 gtk_widget_get_default_direction (void)
@@ -5158,14 +5935,14 @@ gtk_widget_dispose (GObject *object)
 static void
 gtk_widget_real_destroy (GtkObject *object)
 {
-  GtkWidget *widget;
+  /* gtk_object_destroy() will already hold a refcount on object */
+  GtkWidget *widget = GTK_WIDGET (object);
 
-  /* gtk_object_destroy() will already hold a refcount on object
-   */
-  widget = GTK_WIDGET (object);
+  /* wipe accelerator closures (keep order) */
+  g_object_set_qdata (G_OBJECT (widget), quark_accel_path, NULL);
+  g_object_set_qdata (G_OBJECT (widget), quark_accel_closures, NULL);
 
   gtk_grab_remove (widget);
-  gtk_selection_remove_all (widget);
   
   g_object_unref (widget->style);
   widget->style = gtk_widget_get_default_style ();
@@ -5184,7 +5961,6 @@ gtk_widget_finalize (GObject *object)
   GtkAccessible *accessible;
   
   gtk_grab_remove (widget);
-  gtk_selection_remove_all (widget);
 
   g_object_unref (widget->style);
   widget->style = NULL;
@@ -5196,17 +5972,17 @@ gtk_widget_finalize (GObject *object)
   if (aux_info)
     gtk_widget_aux_info_destroy (aux_info);
   
-  events = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_event_mask);
+  events = g_object_get_qdata (G_OBJECT (widget), quark_event_mask);
   if (events)
     g_free (events);
   
-  mode = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_extension_event_mode);
+  mode = g_object_get_qdata (G_OBJECT (widget), quark_extension_event_mode);
   if (mode)
     g_free (mode);
 
-  accessible = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_accessible_object);
+  accessible = g_object_get_qdata (G_OBJECT (widget), quark_accessible_object);
   if (accessible)
-    g_object_unref (G_OBJECT (accessible));
+    g_object_unref (accessible);
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -5222,7 +5998,6 @@ gtk_widget_finalize (GObject *object)
 static void
 gtk_widget_real_map (GtkWidget *widget)
 {
-  g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (GTK_WIDGET_REALIZED (widget) == TRUE);
   
   if (!GTK_WIDGET_MAPPED (widget))
@@ -5245,8 +6020,6 @@ gtk_widget_real_map (GtkWidget *widget)
 static void
 gtk_widget_real_unmap (GtkWidget *widget)
 {
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-  
   if (GTK_WIDGET_MAPPED (widget))
     {
       GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
@@ -5267,14 +6040,13 @@ gtk_widget_real_unmap (GtkWidget *widget)
 static void
 gtk_widget_real_realize (GtkWidget *widget)
 {
-  g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (GTK_WIDGET_NO_WINDOW (widget));
   
   GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
   if (widget->parent)
     {
       widget->window = gtk_widget_get_parent_window (widget);
-      gdk_window_ref (widget->window);
+      g_object_ref (widget->window);
     }
   widget->style = gtk_style_attach (widget->style, widget->window);
 }
@@ -5290,14 +6062,12 @@ gtk_widget_real_realize (GtkWidget *widget)
 static void
 gtk_widget_real_unrealize (GtkWidget *widget)
 {
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-
   if (GTK_WIDGET_MAPPED (widget))
     gtk_widget_real_unmap (widget);
 
   GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
 
-  /* printf ("unrealizing %s\n", gtk_type_name (GTK_OBJECT (widget)->klass->type));
+  /* printf ("unrealizing %s\n", g_type_name (G_TYPE_FROM_INSTANCE (widget)));
    */
 
    /* We must do unrealize child widget BEFORE container widget.
@@ -5320,10 +6090,12 @@ gtk_widget_real_unrealize (GtkWidget *widget)
     }
   else
     {
-      gdk_window_unref (widget->window);
+      g_object_unref (widget->window);
       widget->window = NULL;
     }
 
+  gtk_selection_remove_all (widget);
+  
   GTK_WIDGET_UNSET_FLAGS (widget, GTK_REALIZED);
 }
 
@@ -5331,8 +6103,6 @@ static void
 gtk_widget_real_size_request (GtkWidget         *widget,
                              GtkRequisition    *requisition)
 {
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-
   requisition->width = widget->requisition.width;
   requisition->height = widget->requisition.height;
 }
@@ -5400,20 +6170,19 @@ gtk_widget_propagate_state (GtkWidget           *widget,
     {
       GtkWidget *window;
 
-      window = gtk_widget_get_ancestor (widget, GTK_TYPE_WINDOW);
-      if (window)
+      window = gtk_widget_get_toplevel (widget);
+      if (window && GTK_WIDGET_TOPLEVEL (window))
        gtk_window_set_focus (GTK_WINDOW (window), NULL);
     }
 
   if (old_state != GTK_WIDGET_STATE (widget))
     {
-      gtk_widget_ref (widget);
+      g_object_ref (widget);
       
       if (!GTK_WIDGET_IS_SENSITIVE (widget) && GTK_WIDGET_HAS_GRAB (widget))
        gtk_grab_remove (widget);
       
-      gtk_signal_emit (GTK_OBJECT (widget), widget_signals[STATE_CHANGED], old_state);
-      
+      g_signal_emit (widget, widget_signals[STATE_CHANGED], 0, old_state);
       
       if (GTK_IS_CONTAINER (widget))
        {
@@ -5428,7 +6197,7 @@ gtk_widget_propagate_state (GtkWidget           *widget,
                                   (GtkCallback) gtk_widget_propagate_state,
                                   data);
        }
-      gtk_widget_unref (widget);
+      g_object_unref (widget);
     }
 }
 
@@ -5448,7 +6217,7 @@ _gtk_widget_get_aux_info (GtkWidget *widget,
 {
   GtkWidgetAuxInfo *aux_info;
   
-  aux_info = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_aux_info);
+  aux_info = g_object_get_qdata (G_OBJECT (widget), quark_aux_info);
   if (!aux_info && create)
     {
       if (!aux_info_mem_chunk)
@@ -5463,7 +6232,7 @@ _gtk_widget_get_aux_info (GtkWidget *widget,
       aux_info->y = 0;
       aux_info->x_set = FALSE;
       aux_info->y_set = FALSE;
-      gtk_object_set_data_by_id (GTK_OBJECT (widget), quark_aux_info, aux_info);
+      g_object_set_qdata (G_OBJECT (widget), quark_aux_info, aux_info);
     }
   
   return aux_info;
@@ -5480,28 +6249,27 @@ _gtk_widget_get_aux_info (GtkWidget *widget,
 static void
 gtk_widget_aux_info_destroy (GtkWidgetAuxInfo *aux_info)
 {
-  g_return_if_fail (aux_info != NULL);
-  
   g_mem_chunk_free (aux_info_mem_chunk, aux_info);
 }
 
 static void
 gtk_widget_shape_info_destroy (GtkWidgetShapeInfo *info)
 {
-  gdk_drawable_unref (info->shape_mask);
+  g_object_unref (info->shape_mask);
   g_free (info);
 }
 
-/*****************************************
+/**
  * gtk_widget_shape_combine_mask: 
- *   set a shape for this widgets' gdk window, this allows for
- *   transparent windows etc., see gdk_window_shape_combine_mask
- *   for more information
- *
- *   arguments:
- *
- *   results:
- *****************************************/
+ * @widget: a #GtkWidget.
+ * @shape_mask: shape to be added, or %NULL to remove an existing shape. 
+ * @offset_x: X position of shape mask with respect to @window.
+ * @offset_y: Y position of shape mask with respect to @window.
+ * 
+ * Sets a shape for this widget's GDK window. This allows for
+ * transparent windows etc., see gdk_window_shape_combine_mask()
+ * for more information.
+ **/
 void
 gtk_widget_shape_combine_mask (GtkWidget *widget,
                               GdkBitmap *shape_mask,
@@ -5531,7 +6299,7 @@ gtk_widget_shape_combine_mask (GtkWidget *widget,
       g_object_set_qdata_full (G_OBJECT (widget), quark_shape_info, shape_info,
                               (GDestroyNotify) gtk_widget_shape_info_destroy);
       
-      shape_info->shape_mask = gdk_drawable_ref (shape_mask);
+      shape_info->shape_mask = g_object_ref (shape_mask);
       shape_info->offset_x = offset_x;
       shape_info->offset_y = offset_y;
       
@@ -5560,6 +6328,12 @@ gtk_reset_shapes_recurse (GtkWidget *widget,
     gtk_reset_shapes_recurse (widget, list->data);
 }
 
+/**
+ * gtk_widget_reset_shapes:
+ * @widget: a #GtkWidget.
+ *
+ * Recursively resets the shape on this widget and its descendants.
+ **/
 void
 gtk_widget_reset_shapes (GtkWidget *widget)
 {
@@ -5628,7 +6402,7 @@ gtk_widget_class_install_style_property_parser (GtkWidgetClass     *class,
 
   g_param_spec_ref (pspec);
   g_param_spec_sink (pspec);
-  g_param_spec_set_qdata (pspec, quark_property_parser, parser);
+  g_param_spec_set_qdata (pspec, quark_property_parser, (gpointer) parser);
   g_param_spec_pool_insert (style_property_spec_pool, pspec, G_OBJECT_CLASS_TYPE (class));
 }
 
@@ -5646,6 +6420,63 @@ gtk_widget_class_install_style_property (GtkWidgetClass *class,
   gtk_widget_class_install_style_property_parser (class, pspec, parser);
 }
 
+/**
+ * gtk_widget_class_find_style_property:
+ * @klass: a #GtkWidgetClass
+ * @property_name: the name of the style property to find
+ * @returns: the #GParamSpec of the style property or %NULL if @class has no
+ *   style property with that name.
+ *
+ * Finds a style property of a widget class by name.
+ *
+ * Since: 2.2
+ */
+GParamSpec*
+gtk_widget_class_find_style_property (GtkWidgetClass *klass,
+                                     const gchar    *property_name)
+{
+  g_return_val_if_fail (property_name != NULL, NULL);
+
+  return g_param_spec_pool_lookup (style_property_spec_pool,
+                                  property_name,
+                                  G_OBJECT_CLASS_TYPE (klass),
+                                  TRUE);
+}
+
+/**
+ * gtk_widget_class_list_style_properties:
+ * @klass: a #GtkWidgetClass
+ * @n_properties: location to return the number of style properties found
+ * @returns: an newly allocated array of #GParamSpec*. The array must be freed with g_free().
+ *
+ * Returns all style properties of a widget class.
+ *
+ * Since: 2.2
+ */
+GParamSpec**
+gtk_widget_class_list_style_properties (GtkWidgetClass *klass,
+                                       guint          *n_properties)
+{
+  GParamSpec **pspecs;
+  guint n;
+
+  pspecs = g_param_spec_pool_list (style_property_spec_pool,
+                                  G_OBJECT_CLASS_TYPE (klass),
+                                  &n);
+  if (n_properties)
+    *n_properties = n;
+
+  return pspecs;
+}
+
+/**
+ * gtk_widget_style_get_property:
+ * @widget: a #GtkWidget
+ * @property_name: the name of a style property
+ * @value: location to return the property value 
+ *
+ * Gets the value of a style property of @widget.
+ */
 void
 gtk_widget_style_get_property (GtkWidget   *widget,
                               const gchar *property_name,
@@ -5674,7 +6505,7 @@ gtk_widget_style_get_property (GtkWidget   *widget,
       peek_value = _gtk_style_peek_property_value (widget->style,
                                                   G_OBJECT_TYPE (widget),
                                                   pspec,
-                                                  g_param_spec_get_qdata (pspec, quark_property_parser));
+                                                  (GtkRcPropertyParser) g_param_spec_get_qdata (pspec, quark_property_parser));
       
       /* auto-conversion of the caller's value type
        */
@@ -5683,7 +6514,7 @@ gtk_widget_style_get_property (GtkWidget   *widget,
       else if (g_value_type_transformable (G_PARAM_SPEC_VALUE_TYPE (pspec), G_VALUE_TYPE (value)))
        g_value_transform (peek_value, value);
       else
-       g_warning ("can't retrive style property `%s' of type `%s' as value of type `%s'",
+       g_warning ("can't retrieve style property `%s' of type `%s' as value of type `%s'",
                   pspec->name,
                   g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec)),
                   G_VALUE_TYPE_NAME (value));
@@ -5691,6 +6522,17 @@ gtk_widget_style_get_property (GtkWidget   *widget,
   g_object_unref (widget);
 }
 
+/**
+ * gtk_widget_style_get_valist:
+ * @widget: a #GtkWidget
+ * @first_property_name: the name of the first property to get
+ * @var_args: a <type>va_list</type> of pairs of property names and
+ *     locations to return the property values, starting with the location
+ *     for @first_property_name.
+ * 
+ * Non-vararg variant of gtk_widget_style_get(). Used primarily by language 
+ * bindings.
+ */ 
 void
 gtk_widget_style_get_valist (GtkWidget   *widget,
                             const gchar *first_property_name,
@@ -5726,7 +6568,7 @@ gtk_widget_style_get_valist (GtkWidget   *widget,
       peek_value = _gtk_style_peek_property_value (widget->style,
                                                   G_OBJECT_TYPE (widget),
                                                   pspec,
-                                                  g_param_spec_get_qdata (pspec, quark_property_parser));
+                                                  (GtkRcPropertyParser) g_param_spec_get_qdata (pspec, quark_property_parser));
       G_VALUE_LCOPY (peek_value, var_args, 0, &error);
       if (error)
        {
@@ -5741,6 +6583,16 @@ gtk_widget_style_get_valist (GtkWidget   *widget,
   g_object_unref (widget);
 }
 
+/**
+ * gtk_widget_style_get:
+ * @widget: a #GtkWidget
+ * @first_property_name: the name of the first property to get
+ * @Varargs: pairs of property names and locations to 
+ *   return the property values, starting with the location for 
+ *   @first_property_name, terminated by %NULL.
+ *
+ * Gets the values of a multiple style properties of @widget.
+ */
 void
 gtk_widget_style_get (GtkWidget   *widget,
                      const gchar *first_property_name,
@@ -5758,9 +6610,9 @@ gtk_widget_style_get (GtkWidget   *widget,
 /**
  * gtk_widget_path:
  * @widget: a #GtkWidget
- * @path_length: location to store length of the path
- * @path: location to store allocated path string 
- * @path_reversed: location to store allocated reverse path string
+ * @path_length: location to store length of the path, or %NULL
+ * @path: location to store allocated path string, or %NULL 
+ * @path_reversed: location to store allocated reverse path string, or %NULL
  *
  * Obtains the full path to @widget. The path is simply the name of a
  * widget and all its parents in the container hierarchy, separated by
@@ -5778,12 +6630,12 @@ gtk_widget_style_get (GtkWidget   *widget,
  **/
 void
 gtk_widget_path (GtkWidget *widget,
-                guint     *path_length_p,
-                gchar    **path_p,
-                gchar    **path_reversed_p)
+                guint     *path_length,
+                gchar    **path,
+                gchar    **path_reversed)
 {
   static gchar *rev_path = NULL;
-  static guint  path_len = 0;
+  static guint tmp_path_len = 0;
   guint len;
   
   g_return_if_fail (GTK_IS_WIDGET (widget));
@@ -5798,10 +6650,10 @@ gtk_widget_path (GtkWidget *widget,
       
       string = gtk_widget_get_name (widget);
       l = strlen (string);
-      while (path_len <= len + l + 1)
+      while (tmp_path_len <= len + l + 1)
        {
-         path_len += INIT_PATH_SIZE;
-         rev_path = g_realloc (rev_path, path_len);
+         tmp_path_len += INIT_PATH_SIZE;
+         rev_path = g_realloc (rev_path, tmp_path_len);
        }
       s = string + l - 1;
       d = rev_path + len;
@@ -5818,23 +6670,23 @@ gtk_widget_path (GtkWidget *widget,
     }
   while (widget);
   
-  if (path_length_p)
-    *path_length_p = len - 1;
-  if (path_reversed_p)
-    *path_reversed_p = g_strdup (rev_path);
-  if (path_p)
+  if (path_length)
+    *path_length = len - 1;
+  if (path_reversed)
+    *path_reversed = g_strdup (rev_path);
+  if (path)
     {
-      *path_p = g_strdup (rev_path);
-      g_strreverse (*path_p);
+      *path = g_strdup (rev_path);
+      g_strreverse (*path);
     }
 }
 
 /**
  * gtk_widget_class_path:
  * @widget: a #GtkWidget
- * @path_length: location to store the length of the class path
- * @path: location to store the class path as an allocated string
- * @path_reversed: location to store the reverse class path as an allocated string
+ * @path_length: location to store the length of the class path, or %NULL
+ * @path: location to store the class path as an allocated string, or %NULL
+ * @path_reversed: location to store the reverse class path as an allocated string, or %NULL
  *
  * Same as gtk_widget_path(), but always uses the name of a widget's type,
  * never uses a custom name set with gtk_widget_set_name().
@@ -5842,12 +6694,12 @@ gtk_widget_path (GtkWidget *widget,
  **/
 void
 gtk_widget_class_path (GtkWidget *widget,
-                      guint     *path_length_p,
-                      gchar    **path_p,
-                      gchar    **path_reversed_p)
+                      guint     *path_length,
+                      gchar    **path,
+                      gchar    **path_reversed)
 {
   static gchar *rev_path = NULL;
-  static guint  path_len = 0;
+  static guint tmp_path_len = 0;
   guint len;
   
   g_return_if_fail (GTK_IS_WIDGET (widget));
@@ -5860,12 +6712,12 @@ gtk_widget_class_path (GtkWidget *widget,
       gchar *d;
       guint l;
       
-      string = gtk_type_name (GTK_WIDGET_TYPE (widget));
+      string = g_type_name (GTK_WIDGET_TYPE (widget));
       l = strlen (string);
-      while (path_len <= len + l + 1)
+      while (tmp_path_len <= len + l + 1)
        {
-         path_len += INIT_PATH_SIZE;
-         rev_path = g_realloc (rev_path, path_len);
+         tmp_path_len += INIT_PATH_SIZE;
+         rev_path = g_realloc (rev_path, tmp_path_len);
        }
       s = string + l - 1;
       d = rev_path + len;
@@ -5882,30 +6734,57 @@ gtk_widget_class_path (GtkWidget *widget,
     }
   while (widget);
   
-  if (path_length_p)
-    *path_length_p = len - 1;
-  if (path_reversed_p)
-    *path_reversed_p = g_strdup (rev_path);
-  if (path_p)
+  if (path_length)
+    *path_length = len - 1;
+  if (path_reversed)
+    *path_reversed = g_strdup (rev_path);
+  if (path)
     {
-      *path_p = g_strdup (rev_path);
-      g_strreverse (*path_p);
+      *path = g_strdup (rev_path);
+      g_strreverse (*path);
     }
 }
 
+/**
+ * gtk_requisition_copy:
+ * @requisition: a #GtkRequisition.
+ * @returns: a copy of @requisition.
+ *
+ * Copies a #GtkRequisition.
+ **/
 GtkRequisition *
 gtk_requisition_copy (const GtkRequisition *requisition)
 {
   return (GtkRequisition *)g_memdup (requisition, sizeof (GtkRequisition));
 }
 
+/**
+ * gtk_requisition_free:
+ * @requisition: a #GtkRequisition.
+ * 
+ * Frees a #GtkRequisition.
+ **/
 void
 gtk_requisition_free (GtkRequisition *requisition)
 {
   g_free (requisition);
 }
 
-AtkObject* gtk_widget_get_accessible (GtkWidget *widget)
+GType
+gtk_requisition_get_type (void)
+{
+  static GType our_type = 0;
+  
+  if (our_type == 0)
+    our_type = g_boxed_type_register_static ("GtkRequisition",
+                                            (GBoxedCopyFunc) gtk_requisition_copy,
+                                            (GBoxedFreeFunc) gtk_requisition_free);
+
+  return our_type;
+}
+
+AtkObject* 
+gtk_widget_get_accessible (GtkWidget *widget)
 {
   GtkWidgetClass *klass;
 
@@ -5918,7 +6797,8 @@ AtkObject* gtk_widget_get_accessible (GtkWidget *widget)
   return klass->get_accessible (widget);
 }
 
-AtkObject* gtk_widget_real_get_accessible (GtkWidget *widget)
+static AtkObject* 
+gtk_widget_real_get_accessible (GtkWidget *widget)
 {
   AtkObject* accessible;
 
@@ -5931,7 +6811,7 @@ AtkObject* gtk_widget_real_get_accessible (GtkWidget *widget)
 
     default_registry = atk_get_default_registry ();
     factory = atk_registry_get_factory (default_registry, 
-                                        GTK_OBJECT_TYPE (widget));
+                                        G_TYPE_FROM_INSTANCE (widget));
     accessible =
       atk_object_factory_create_accessible (factory,
                                            G_OBJECT (widget));
@@ -5959,7 +6839,37 @@ gtk_widget_ref_accessible (AtkImplementor *implementor)
 
   accessible = gtk_widget_get_accessible (GTK_WIDGET (implementor));
   if (accessible)
-    g_object_ref (G_OBJECT (accessible));
+    g_object_ref (accessible);
   return accessible;
 }
 
+/**
+ * gtk_widget_get_clipboard:
+ * @widget: a #GtkWidget
+ * @selection: a #GdkAtom which identifies the clipboard
+ *             to use. %GDK_SELECTION_CLIPBOARD gives the
+ *             default clipboard. Another common value
+ *             is %GDK_SELECTION_PRIMARY, which gives
+ *             the primary X selection. 
+ * 
+ * Returns the clipboard object for the given selection to
+ * be used with @widget. @widget must have a #GdkDisplay
+ * associated with it, so must be attached to a toplevel
+ * window.
+ * 
+ * Return value: the appropriate clipboard object. If no
+ *             clipboard already exists, a new one will
+ *             be created. Once a clipboard object has
+ *             been created, it is persistent for all time.
+ *
+ * Since: 2.2
+ **/
+GtkClipboard *
+gtk_widget_get_clipboard (GtkWidget *widget, GdkAtom selection)
+{
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+  g_return_val_if_fail (gtk_widget_has_screen (widget), NULL);
+  
+  return gtk_clipboard_get_for_display (gtk_widget_get_display (widget),
+                                       selection);
+}