]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkwidget.c
Add docs.
[~andy/gtk] / gtk / gtkwidget.c
index 550f5ebda3119a0e54d69a6dd630a1387c5324a3..71bf80ef78dba8551160025504d9d4cefbef82ee 100644 (file)
@@ -29,6 +29,7 @@
 #include <locale.h>
 #include "gtkcontainer.h"
 #include "gtkaccelmap.h"
+#include "gtkclipboard.h"
 #include "gtkiconfactory.h"
 #include "gtkintl.h"
 #include "gtkmain.h"
@@ -37,7 +38,6 @@
 #include "gtkselection.h"
 #include "gtksettings.h"
 #include "gtksizegroup.h"
-#include "gtksignal.h"
 #include "gtkwidget.h"
 #include "gtkwindow.h"
 #include "gtkbindings.h"
@@ -50,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)
@@ -115,6 +116,7 @@ enum {
   POPUP_MENU,
   SHOW_HELP,
   ACCEL_CLOSURES_CHANGED,
+  SCREEN_CHANGED,
   LAST_SIGNAL
 };
 
@@ -129,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,
@@ -212,13 +215,17 @@ 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;
@@ -241,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 =
@@ -267,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) ;
@@ -362,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;
@@ -376,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;
   
@@ -394,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));
 
@@ -403,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,
@@ -412,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,
@@ -452,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",
@@ -470,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));
@@ -499,351 +516,366 @@ 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_WIDGET);
+    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);
+                  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,
@@ -853,7 +885,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  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,
@@ -864,61 +896,65 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  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,
+                 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,
@@ -927,10 +963,10 @@ 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,
+                 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,
@@ -939,7 +975,7 @@ 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,
@@ -951,9 +987,9 @@ 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,
                  G_TYPE_NONE, 6,
@@ -965,63 +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,
+                 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,
                  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,
                  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,
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[POPUP_MENU] =
     g_signal_new ("popup_menu",
-                 G_TYPE_FROM_CLASS (object_class),
+                 G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                 GTK_SIGNAL_OFFSET (GtkWidgetClass, popup_menu),
+                 G_STRUCT_OFFSET (GtkWidgetClass, popup_menu),
                  _gtk_boolean_handled_accumulator, NULL,
-                  _gtk_marshal_BOOLEAN__VOID,
+                 _gtk_marshal_BOOLEAN__VOID,
                  G_TYPE_BOOLEAN, 0);
   widget_signals[SHOW_HELP] =
     g_signal_new ("show_help",
-                 G_TYPE_FROM_CLASS (object_class),
+                 G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                 GTK_SIGNAL_OFFSET (GtkWidgetClass, show_help),
+                 G_STRUCT_OFFSET (GtkWidgetClass, show_help),
                  _gtk_boolean_handled_accumulator, NULL,
-                  _gtk_marshal_BOOLEAN__ENUM,
-                 G_TYPE_BOOLEAN, 1, GTK_TYPE_WIDGET_HELP_TYPE);
+                 _gtk_marshal_BOOLEAN__ENUM,
+                 G_TYPE_BOOLEAN, 1,
+                 GTK_TYPE_WIDGET_HELP_TYPE);
   widget_signals[ACCEL_CLOSURES_CHANGED] =
-    gtk_signal_new ("accel_closures_changed",
-                   0,
-                   GTK_CLASS_TYPE (object_class),
-                   0,
-                    gtk_marshal_NONE__NONE,
-                   GTK_TYPE_NONE, 0);
+    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,
@@ -1049,27 +1096,27 @@ 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."),
+                                                            _("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."),
+                                                               _("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'."),
+                                                            _("Width, in pixels, between focus indicator and the widget 'box'"),
                                                             0, G_MAXINT, 1,
                                                             G_PARAM_READWRITE));
   gtk_widget_class_install_style_property (klass,
@@ -1081,15 +1128,15 @@ gtk_widget_class_init (GtkWidgetClass *klass)
   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."),
+                                                              _("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));
+                                          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
@@ -1111,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))
@@ -1141,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))
@@ -1229,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;
@@ -1245,14 +1299,14 @@ gtk_widget_get_property (GObject         *object,
       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
@@ -1307,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)
 {
@@ -1320,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)
@@ -1356,6 +1431,7 @@ gtk_widget_child_notify (GtkWidget    *widget,
  * @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)
@@ -1388,20 +1464,20 @@ gtk_widget_thaw_child_notify (GtkWidget *widget)
  * its properties in one go. For example you might write:
  * <literal>gtk_widget_new (GTK_TYPE_LABEL, "label", "Hello World", "xalign",
  * 0.0, NULL)</literal> to create a left-aligned label. Equivalent to
- * gtk_object_new(), but returns a widget so you don't have 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);
@@ -1416,8 +1492,8 @@ gtk_widget_new (GtkType      type,
  * @first_property_name: name of first property to set
  * @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,
@@ -1434,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);
 }
 
 /**
@@ -1472,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
@@ -1516,7 +1563,7 @@ gtk_widget_unparent (GtkWidget *widget)
   else
     toplevel = NULL;
 
-  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
@@ -1538,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);
@@ -1550,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);
 }
 
 /**
@@ -1566,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
@@ -1627,16 +1674,14 @@ 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);
     }
 }
 
@@ -1659,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);
 }
 
 /**
@@ -1685,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);
@@ -1710,12 +1757,16 @@ gtk_widget_hide (GtkWidget *widget)
   
   if (GTK_WIDGET_VISIBLE (widget))
     {
-      gtk_widget_ref (widget);
-      gtk_signal_emit (GTK_OBJECT (widget), widget_signals[HIDE]);
+      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);
     }
 }
 
@@ -1814,7 +1865,7 @@ 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))
        gdk_window_invalidate_rect (widget->window, &widget->allocation, FALSE);
@@ -1838,7 +1889,7 @@ gtk_widget_unmap (GtkWidget *widget)
     {
       if (GTK_WIDGET_NO_WINDOW (widget))
        gdk_window_invalidate_rect (widget->window, &widget->allocation, FALSE);
-      gtk_signal_emit (GTK_OBJECT (widget), widget_signals[UNMAP]);
+      g_signal_emit (widget, widget_signals[UNMAP], 0);
     }
 }
 
@@ -1862,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.
  *  
  **/
@@ -1879,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 &&
@@ -1893,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,
@@ -1936,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);
     }
 }
 
@@ -1983,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 */
 
@@ -2053,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)
@@ -2082,6 +2091,65 @@ gtk_widget_queue_clear_area (GtkWidget *widget,
   gdk_window_invalidate_rect (widget->window, &invalid_rect, TRUE);
 }
 
+/**
+ * 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));
+
+  if (widget->allocation.width || widget->allocation.height)
+    {
+      if (GTK_WIDGET_NO_WINDOW (widget))
+       gtk_widget_queue_draw_area (widget, widget->allocation.x,
+                                   widget->allocation.y,
+                                   widget->allocation.width, 
+                                   widget->allocation.height);
+      else
+       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
@@ -2093,18 +2161,7 @@ gtk_widget_queue_clear (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);
-      else
-       gtk_widget_queue_clear_area (widget, 0, 0, 
-                                    widget->allocation.width, 
-                                    widget->allocation.height);
-    }
+  gtk_widget_queue_draw (widget);
 }
 
 /**
@@ -2320,7 +2377,7 @@ gtk_widget_size_allocate (GtkWidget       *widget,
   if (!alloc_needed && !size_changed && !position_changed)
     return;
   
-  gtk_signal_emit (GTK_OBJECT (widget), widget_signals[SIZE_ALLOCATE], &real_allocation);
+  g_signal_emit (widget, widget_signals[SIZE_ALLOCATE], 0, &real_allocation);
 
   if (GTK_WIDGET_MAPPED (widget))
     {
@@ -2481,6 +2538,9 @@ gtk_widget_translate_coordinates (GtkWidget  *src_widget,
       src_y += dy;
       
       window = gdk_window_get_parent (window);
+
+      if (!window)             /* Handle GtkHandleBox */
+       return FALSE;
     }
 
   /* And back */
@@ -2495,6 +2555,9 @@ gtk_widget_translate_coordinates (GtkWidget  *src_widget,
       src_y -= dy;
       
       window = gdk_window_get_parent (window);
+      
+      if (!window)             /* Handle GtkHandleBox */
+       return FALSE;
     }
 
   /* Translate from window relative to allocation relative */
@@ -2822,13 +2885,16 @@ gtk_widget_set_accel_path (GtkWidget     *widget,
 }
 
 const gchar*
-_gtk_widget_get_accel_path (GtkWidget *widget)
+_gtk_widget_get_accel_path (GtkWidget *widget,
+                           gboolean  *locked)
 {
   AccelPath *apath;
 
   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
 
   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;
 }
 
@@ -2844,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[MNEMONIC_ACTIVATE],
-                    group_cycling,
-                    &handled);
+    g_signal_emit (widget,
+                  widget_signals[MNEMONIC_ACTIVATE],
+                  0,
+                  group_cycling,
+                  &handled);
   return handled;
 }
 
@@ -2863,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;
 }
@@ -2977,9 +3044,9 @@ 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);
+  g_signal_emit (widget, widget_signals[EVENT], 0, event, &return_val);
   return_val |= !WIDGET_REALIZED_FOR_EVENT (widget, event);
   if (!return_val)
     {
@@ -3073,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 (WIDGET_REALIZED_FOR_EVENT (widget, event))
-    gtk_signal_emit (GTK_OBJECT (widget), widget_signals[EVENT_AFTER], 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;
 }
@@ -3105,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;
     }
@@ -3141,9 +3208,9 @@ 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
@@ -3187,10 +3254,10 @@ gtk_widget_reparent_fixup_child (GtkWidget *widget,
   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),
@@ -3225,10 +3292,10 @@ 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))
        {
@@ -3335,10 +3402,10 @@ gtk_widget_grab_focus (GtkWidget *widget)
   if (!GTK_WIDGET_IS_SENSITIVE (widget))
     return;
   
-  g_object_ref (G_OBJECT (widget));
-  gtk_signal_emit (GTK_OBJECT (widget), widget_signals[GRAB_FOCUS]);
+  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
@@ -3499,10 +3566,7 @@ gtk_widget_grab_default (GtkWidget *widget)
   window = gtk_widget_get_toplevel (widget);
   
   if (window && GTK_WIDGET_TOPLEVEL (window))
-    {
-       gtk_window_set_default (GTK_WINDOW (window), widget);
-       g_object_notify (G_OBJECT (widget), "has_default");
-    }
+    gtk_window_set_default (GTK_WINDOW (window), widget);
   else
     g_warning (G_STRLOC ": widget not within a GtkWindow");
 }
@@ -3538,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)
@@ -3551,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));
 }
 
 /**
@@ -3590,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);
     }
 }
 
@@ -3610,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");
     }
@@ -3726,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");
 }
@@ -3758,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;
 
@@ -3774,7 +3838,7 @@ gtk_widget_set_parent (GtkWidget *widget,
   
   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");
@@ -3878,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));
@@ -3887,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 ();
 
@@ -3944,13 +4009,12 @@ gtk_widget_modify_style (GtkWidget      *widget,
   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.
@@ -3988,16 +4052,15 @@ gtk_widget_get_modifier_style (GtkWidget      *widget)
   
   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
 
-  rc_style = gtk_object_get_data_by_id (GTK_OBJECT (widget),
-                                       quark_rc_style);
+  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;
@@ -4011,25 +4074,30 @@ 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);
 }
@@ -4038,7 +4106,9 @@ gtk_widget_modify_color_component (GtkWidget     *widget,
  * gtk_widget_modify_fg:
  * @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().
  * 
  * Sets the foreground color for a widget in a particular state.  All
  * other style values are left untouched. See also
@@ -4051,7 +4121,6 @@ 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);
 }
@@ -4060,7 +4129,9 @@ gtk_widget_modify_fg (GtkWidget   *widget,
  * gtk_widget_modify_bg:
  * @widget: a #GtkWidget.
  * @state: the state for which to set the background 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_bg().
  * 
  * Sets the background color for a widget in a particular state.  All
  * other style values are left untouched. See also
@@ -4073,7 +4144,6 @@ 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);
 }
@@ -4082,7 +4152,9 @@ gtk_widget_modify_bg (GtkWidget   *widget,
  * 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).
+ * @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
@@ -4097,7 +4169,6 @@ 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);
 }
@@ -4106,7 +4177,9 @@ gtk_widget_modify_text (GtkWidget   *widget,
  * gtk_widget_modify_base:
  * @widget: a #GtkWidget.
  * @state: the state for which to set the base 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_base().
  * 
  * Sets the base color for a widget in a particular state.
  * All other style values are left untouched. The base color
@@ -4121,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);
 }
@@ -4129,7 +4201,8 @@ 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().
  * 
  * Sets the font to use for a widget.  All other style values are left
  * untouched. See also gtk_widget_modify_style().
@@ -4141,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);
 }
 
@@ -4174,7 +4249,7 @@ gtk_widget_set_style_internal (GtkWidget *widget,
                               GtkStyle  *style,
                               gboolean   initial_emission)
 {
-  g_object_ref (G_OBJECT (widget));
+  g_object_ref (widget);
   g_object_freeze_notify (G_OBJECT (widget));
 
   if (widget->style != style || initial_emission)
@@ -4201,21 +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)
        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
+do_screen_change (GtkWidget *widget,
+                 GdkScreen *old_screen,
+                 GdkScreen *new_screen)
+{
+  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
@@ -4223,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);
     }
 }
 
@@ -4261,13 +4363,72 @@ 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
@@ -4313,7 +4474,7 @@ 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);
 }
 
 /**
@@ -4323,8 +4484,9 @@ gtk_widget_peek_pango_context (GtkWidget *widget)
  * 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()
@@ -4340,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;
@@ -4364,11 +4528,21 @@ gtk_widget_get_pango_context (GtkWidget *widget)
 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,
@@ -4428,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*
@@ -4477,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);
     }
 }
 
@@ -4525,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) &&
@@ -4558,6 +4745,136 @@ gtk_widget_get_child_visible (GtkWidget *widget)
   return GTK_WIDGET_CHILD_VISIBLE (widget);
 }
 
+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.
+ *
+ * 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.
@@ -4573,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;
 }
@@ -4632,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;
 }
@@ -4670,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;
@@ -4707,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
@@ -4740,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);
 }
 
 /**
@@ -4815,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);
 }
 
 
@@ -4879,7 +5208,7 @@ gtk_widget_set_events (GtkWidget *widget,
   g_return_if_fail (GTK_IS_WIDGET (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)
     {
@@ -4887,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");
@@ -4915,7 +5244,7 @@ gtk_widget_add_events (GtkWidget *widget,
   
   g_return_if_fail (GTK_IS_WIDGET (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)
     {
@@ -4926,12 +5255,12 @@ 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))
@@ -4980,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");
 }
 
@@ -5011,13 +5340,13 @@ gtk_widget_set_extension_events (GtkWidget *widget,
  * 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. ]
- *  <!> }
- *  </programlisting></informalexample>
+ * <informalexample><programlisting>
+ *  GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
+ *  if (GTK_WIDGET_TOPLEVEL (toplevel))
+ *    {
+ *      [ Perform action on toplevel. ]
+ *    }
+ * </programlisting></informalexample>
  *
  * Return value: the topmost ancestor of @widget, or @widget itself if there's no ancestor.
  **/
@@ -5044,18 +5373,21 @@ gtk_widget_get_toplevel (GtkWidget *widget)
  * it should not be unreferenced. See note about checking for a 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;
@@ -5074,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));
 }
 
 /**
@@ -5119,13 +5453,19 @@ gtk_widget_get_visual (GtkWidget *widget)
  * 
  * 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));
 }
 
 /**
@@ -5147,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);
 }
 
 /**
@@ -5172,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;
   
@@ -5195,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;
   
@@ -5289,10 +5629,10 @@ 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);
 }
 
 /**
@@ -5330,13 +5670,13 @@ gtk_widget_get_composite_name (GtkWidget *widget)
  * 
  * 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));
- * <!>  gtk_widget_ref (scrolled_window->hscrollbar);
+ *   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
@@ -5370,7 +5710,7 @@ gtk_widget_pop_composite_child (void)
 void
 gtk_widget_push_colormap (GdkColormap *cmap)
 {
-  g_return_if_fail (GDK_IS_COLORMAP (cmap));
+  g_return_if_fail (!cmap || GDK_IS_COLORMAP (cmap));
 
   colormap_stack = g_slist_prepend (colormap_stack, cmap);
 }
@@ -5395,21 +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)
 {
   g_return_if_fail (GDK_IS_COLORMAP (colormap));
-
-  if (default_colormap != colormap)
-    {
-      if (default_colormap)
-       gdk_colormap_unref (default_colormap);
-      default_colormap = colormap;
-      if (default_colormap)
-       gdk_colormap_ref (default_colormap);
-    }
+  
+  gdk_screen_set_default_colormap (gdk_colormap_get_screen (colormap),
+                                  colormap);
 }
 
 /**
@@ -5422,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 ());
 }
 
 /**
@@ -5453,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);
 }
 
 /**
@@ -5525,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);
@@ -5535,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);
 }
 
 /**
@@ -5642,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);
 }
@@ -5716,7 +6046,7 @@ gtk_widget_real_realize (GtkWidget *widget)
   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);
 }
@@ -5737,7 +6067,7 @@ gtk_widget_real_unrealize (GtkWidget *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.
@@ -5760,7 +6090,7 @@ gtk_widget_real_unrealize (GtkWidget *widget)
     }
   else
     {
-      gdk_window_unref (widget->window);
+      g_object_unref (widget->window);
       widget->window = NULL;
     }
 
@@ -5847,13 +6177,12 @@ gtk_widget_propagate_state (GtkWidget           *widget,
 
   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))
        {
@@ -5868,7 +6197,7 @@ gtk_widget_propagate_state (GtkWidget           *widget,
                                   (GtkCallback) gtk_widget_propagate_state,
                                   data);
        }
-      gtk_widget_unref (widget);
+      g_object_unref (widget);
     }
 }
 
@@ -5888,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)
@@ -5903,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;
@@ -5926,7 +6255,7 @@ gtk_widget_aux_info_destroy (GtkWidgetAuxInfo *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);
 }
 
@@ -5970,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;
       
@@ -6073,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));
 }
 
@@ -6091,6 +6420,55 @@ 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
@@ -6127,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
        */
@@ -6190,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)
        {
@@ -6334,7 +6712,7 @@ 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 (tmp_path_len <= len + l + 1)
        {
@@ -6398,7 +6776,7 @@ gtk_requisition_get_type (void)
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GtkTypeRequisition",
+    our_type = g_boxed_type_register_static ("GtkRequisition",
                                             (GBoxedCopyFunc) gtk_requisition_copy,
                                             (GBoxedFreeFunc) gtk_requisition_free);
 
@@ -6433,7 +6811,7 @@ 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));
@@ -6461,6 +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);
+}