]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkwidget.c
Switch style of stamp file usage.
[~andy/gtk] / gtk / gtkwidget.c
index 3ff70a81c03ed0627f397ee02996117ab64d06c2..3c7369b529adb0b87fbfec2aa644336c586766a0 100644 (file)
 #include <string.h>
 #include <locale.h>
 #include "gtkcontainer.h"
+#include "gtkaccelmap.h"
 #include "gtkiconfactory.h"
 #include "gtkintl.h"
 #include "gtkmain.h"
+#include "gtkmarshalers.h"
 #include "gtkrc.h"
 #include "gtkselection.h"
 #include "gtksettings.h"
@@ -69,9 +71,7 @@ enum {
   DIRECTION_CHANGED,
   GRAB_NOTIFY,
   CHILD_NOTIFY,
-  ADD_ACCELERATOR,
-  REMOVE_ACCELERATOR,
-  ACTIVATE_MNEMONIC,
+  MNEMONIC_ACTIVATE,
   GRAB_FOCUS,
   FOCUS,
   EVENT,
@@ -114,6 +114,7 @@ enum {
   WINDOW_STATE_EVENT,
   POPUP_MENU,
   SHOW_HELP,
+  ACCEL_CLOSURES_CHANGED,
   LAST_SIGNAL
 };
 
@@ -121,10 +122,8 @@ enum {
   PROP_0,
   PROP_NAME,
   PROP_PARENT,
-  PROP_X,
-  PROP_Y,
-  PROP_WIDTH,
-  PROP_HEIGHT,
+  PROP_WIDTH_REQUEST,
+  PROP_HEIGHT_REQUEST,
   PROP_VISIBLE,
   PROP_SENSITIVE,
   PROP_APP_PAINTABLE,
@@ -161,7 +160,7 @@ static void gtk_widget_get_property          (GObject           *object,
                                                  guint              prop_id,
                                                  GValue            *value,
                                                  GParamSpec        *pspec);
-static void    gtk_widget_shutdown              (GObject           *object);
+static void    gtk_widget_dispose               (GObject           *object);
 static void    gtk_widget_real_destroy          (GtkObject         *object);
 static void    gtk_widget_finalize              (GObject           *object);
 static void    gtk_widget_real_show             (GtkWidget         *widget);
@@ -180,7 +179,7 @@ static void gtk_widget_direction_changed     (GtkWidget         *widget,
                                                  GtkTextDirection   previous_direction);
 
 static void    gtk_widget_real_grab_focus       (GtkWidget         *focus_widget);
-static void     gtk_widget_real_show_help        (GtkWidget         *widget,
+static gboolean gtk_widget_real_show_help        (GtkWidget         *widget,
                                                   GtkWidgetHelpType  help_type);
 
 static void    gtk_widget_dispatch_child_properties_changed    (GtkWidget        *object,
@@ -196,29 +195,26 @@ static gboolean           gtk_widget_real_focus_out_event         (GtkWidget        *widget,
                                                                 GdkEventFocus    *event);
 static gboolean                gtk_widget_real_focus                   (GtkWidget        *widget,
                                                                 GtkDirectionType  direction);
-static GdkColormap*    gtk_widget_peek_colormap                (void);
-static GtkStyle*       gtk_widget_peek_style                   (void);
 static PangoContext*   gtk_widget_peek_pango_context           (GtkWidget        *widget);
 static void            gtk_widget_reparent_container_child     (GtkWidget        *widget,
                                                                 gpointer          client_data);
 static void            gtk_widget_propagate_state              (GtkWidget        *widget,
                                                                 GtkStateData     *data);
+static void             gtk_widget_reset_rc_style               (GtkWidget        *widget);
 static void            gtk_widget_set_style_internal           (GtkWidget        *widget,
                                                                 GtkStyle         *style,
                                                                 gboolean          initial_emission);
-static void            gtk_widget_set_style_recurse            (GtkWidget        *widget,
-                                                                gpointer          client_data);
 static gint            gtk_widget_event_internal               (GtkWidget        *widget,
                                                                 GdkEvent         *event);
-static void            gtk_widget_propagate_hierarchy_changed  (GtkWidget        *widget,
-                                                                gpointer          client_data);
 static gboolean                gtk_widget_real_mnemonic_activate       (GtkWidget        *widget,
                                                                 gboolean          group_cycling);
 static void            gtk_widget_aux_info_destroy             (GtkWidgetAuxInfo *aux_info);
-static void            gtk_widget_do_uposition                 (GtkWidget        *widget);
 static AtkObject*      gtk_widget_real_get_accessible          (GtkWidget        *widget);
 static void            gtk_widget_accessible_interface_init    (AtkImplementorIface *iface);
 static AtkObject*      gtk_widget_ref_accessible               (AtkImplementor *implementor);
+static void             gtk_widget_invalidate_widget_windows    (GtkWidget        *widget,
+                                                                GdkRegion        *region);
+
 
 /* --- variables --- */
 static gpointer         parent_class = NULL;
@@ -227,17 +223,17 @@ static GMemChunk       *aux_info_mem_chunk = NULL;
 static GdkColormap     *default_colormap = NULL;
 static GtkStyle        *gtk_default_style = NULL;
 static GSList          *colormap_stack = NULL;
-static GSList          *style_stack = NULL;
 static guint            composite_child_stack = 0;
 static GtkTextDirection gtk_default_direction = GTK_TEXT_DIR_LTR;
 static GParamSpecPool  *style_property_spec_pool = NULL;
 
 static GQuark          quark_property_parser = 0;
 static GQuark          quark_aux_info = 0;
+static GQuark          quark_accel_path = 0;
+static GQuark          quark_accel_closures = 0;
 static GQuark          quark_event_mask = 0;
 static GQuark          quark_extension_event_mode = 0;
 static GQuark          quark_parent_window = 0;
-static GQuark          quark_saved_default_style = 0;
 static GQuark          quark_shape_info = 0;
 static GQuark          quark_colormap = 0;
 static GQuark          quark_pango_context = 0;
@@ -304,10 +300,11 @@ gtk_widget_class_init (GtkWidgetClass *klass)
 
   quark_property_parser = g_quark_from_static_string ("gtk-rc-property-parser");
   quark_aux_info = g_quark_from_static_string ("gtk-aux-info");
+  quark_accel_path = g_quark_from_static_string ("gtk-accel-path");
+  quark_accel_closures = g_quark_from_static_string ("gtk-accel-closures");
   quark_event_mask = g_quark_from_static_string ("gtk-event-mask");
   quark_extension_event_mode = g_quark_from_static_string ("gtk-extension-event-mode");
   quark_parent_window = g_quark_from_static_string ("gtk-parent-window");
-  quark_saved_default_style = g_quark_from_static_string ("gtk-saved-default-style");
   quark_shape_info = g_quark_from_static_string ("gtk-shape-info");
   quark_colormap = g_quark_from_static_string ("gtk-colormap");
   quark_pango_context = g_quark_from_static_string ("gtk-pango-context");
@@ -320,7 +317,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
   cpn_context.dispatcher = child_property_notify_dispatcher;
   _gtk_widget_child_property_notify_context = &cpn_context;
 
-  gobject_class->shutdown = gtk_widget_shutdown;
+  gobject_class->dispose = gtk_widget_dispose;
   gobject_class->finalize = gtk_widget_finalize;
   gobject_class->set_property = gtk_widget_set_property;
   gobject_class->get_property = gtk_widget_get_property;
@@ -347,8 +344,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
   klass->direction_changed = gtk_widget_direction_changed;
   klass->grab_notify = NULL;
   klass->child_notify = NULL;
-  klass->add_accelerator = (void*) gtk_accel_group_handle_add;
-  klass->remove_accelerator = (void*) gtk_accel_group_handle_remove;
   klass->mnemonic_activate = gtk_widget_real_mnemonic_activate;
   klass->grab_focus = gtk_widget_real_grab_focus;
   klass->focus = gtk_widget_real_focus;
@@ -405,38 +400,21 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                                                        _("The parent widget of this widget. Must be a Container widget."),
                                                        GTK_TYPE_CONTAINER,
                                                        G_PARAM_READWRITE));
+
   g_object_class_install_property (gobject_class,
-                                  PROP_X,
-                                  g_param_spec_int ("x",
-                                                    _("x coordinate"),
-                                                    _("The x coordinate of the top-left corner of the widget, or -1 if not set"),
-                                                    -G_MAXINT,
-                                                    G_MAXINT,
-                                                    -1,
-                                                    G_PARAM_READWRITE));
-  g_object_class_install_property (gobject_class,
-                                  PROP_Y,
-                                  g_param_spec_int ("y",
-                                                    _("y coordinate"),
-                                                    _("The y coordinate of the top-left corner of the widget, or -1 if not set"),
-                                                    -G_MAXINT,
-                                                    G_MAXINT,
-                                                    -1,
-                                                    G_PARAM_READWRITE));
-  g_object_class_install_property (gobject_class,
-                                  PROP_WIDTH,
-                                  g_param_spec_int ("width",
-                                                    _("Width"),
-                                                    _("The width of the widget, or -1 if unset."),
+                                  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."),
                                                     -1,
                                                     G_MAXINT,
                                                     -1,
                                                     G_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
-                                  PROP_HEIGHT,
-                                  g_param_spec_int ("height",
-                                                    _("Height"),
-                                                    _("The height of the widget, or -1 if unset."),
+                                  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."),
                                                     -1,
                                                     G_MAXINT,
                                                     -1,
@@ -532,50 +510,50 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, show),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_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_marshal_VOID__VOID,
                    GTK_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_marshal_VOID__VOID,
                    GTK_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_marshal_VOID__VOID,
                    GTK_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_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   widget_signals[UNREALIZE] =
     gtk_signal_new ("unrealize",
-                   GTK_RUN_FIRST,
+                   GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, unrealize),
-                   gtk_marshal_VOID__VOID,
+                   _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   widget_signals[SIZE_REQUEST] =
-    g_signal_newc ("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_marshal_VOID__BOXED,
                   GTK_TYPE_NONE, 1,
                   GTK_TYPE_REQUISITION | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[SIZE_ALLOCATE] = 
@@ -583,7 +561,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, size_allocate),
-                   gtk_marshal_VOID__BOXED,
+                   _gtk_marshal_VOID__BOXED,
                    GTK_TYPE_NONE, 1,
                    GDK_TYPE_RECTANGLE | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[STATE_CHANGED] =
@@ -591,7 +569,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, state_changed),
-                   gtk_marshal_VOID__ENUM,
+                   _gtk_marshal_VOID__ENUM,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_STATE_TYPE);
   widget_signals[PARENT_SET] =
@@ -599,22 +577,23 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, parent_set),
-                   gtk_marshal_VOID__OBJECT,
+                   _gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
-                   GTK_TYPE_OBJECT);
+                   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_NONE__NONE,
-                   GTK_TYPE_NONE, 0);
+                   _gtk_marshal_VOID__OBJECT,
+                   GTK_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_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_STYLE);
   widget_signals[DIRECTION_CHANGED] =
@@ -622,7 +601,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, direction_changed),
-                   gtk_marshal_VOID__ENUM,
+                   _gtk_marshal_VOID__ENUM,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_TEXT_DIRECTION);
   widget_signals[GRAB_NOTIFY] =
@@ -630,11 +609,11 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkWidgetClass, grab_notify),
-                   gtk_marshal_VOID__BOOLEAN,
+                   _gtk_marshal_VOID__BOOLEAN,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_BOOL);
   widget_signals[CHILD_NOTIFY] =
-    g_signal_newc ("child_notify",
+    g_signal_new ("child_notify",
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE | G_SIGNAL_DETAILED | G_SIGNAL_NO_HOOKS,
                   G_STRUCT_OFFSET (GtkWidgetClass, child_notify),
@@ -642,277 +621,273 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   g_cclosure_marshal_VOID__PARAM,
                   G_TYPE_NONE,
                   1, G_TYPE_PARAM);
-  widget_signals[ADD_ACCELERATOR] =
-    gtk_accel_group_create_add (GTK_CLASS_TYPE (object_class), GTK_RUN_LAST,
-                               GTK_SIGNAL_OFFSET (GtkWidgetClass, add_accelerator));
-  widget_signals[REMOVE_ACCELERATOR] =
-    gtk_accel_group_create_remove (GTK_CLASS_TYPE (object_class), GTK_RUN_LAST,
-                                  GTK_SIGNAL_OFFSET (GtkWidgetClass, remove_accelerator));
-  widget_signals[ACTIVATE_MNEMONIC] =
-    g_signal_newc ("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);
+  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);
   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_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   widget_signals[FOCUS] =
-    g_signal_newc ("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_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);
   widget_signals[EVENT] =
-    g_signal_newc ("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_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);
   widget_signals[EVENT_AFTER] =
-    g_signal_newc ("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_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);
   widget_signals[BUTTON_PRESS_EVENT] =
-    g_signal_newc ("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_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);
   widget_signals[BUTTON_RELEASE_EVENT] =
-    g_signal_newc ("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_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);
   widget_signals[SCROLL_EVENT] =
-    g_signal_newc ("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_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);
   widget_signals[MOTION_NOTIFY_EVENT] =
-    g_signal_newc ("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_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);
   widget_signals[DELETE_EVENT] =
-    g_signal_newc ("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_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);
   widget_signals[DESTROY_EVENT] =
-    g_signal_newc ("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_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);
   widget_signals[EXPOSE_EVENT] =
-    g_signal_newc ("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_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);
   widget_signals[KEY_PRESS_EVENT] =
-    g_signal_newc ("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_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);
   widget_signals[KEY_RELEASE_EVENT] =
-    g_signal_newc ("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_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);
   widget_signals[ENTER_NOTIFY_EVENT] =
-    g_signal_newc ("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_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);
   widget_signals[LEAVE_NOTIFY_EVENT] =
-    g_signal_newc ("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_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);
   widget_signals[CONFIGURE_EVENT] =
-    g_signal_newc ("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_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);
   widget_signals[FOCUS_IN_EVENT] =
-    g_signal_newc ("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,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT);
+                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[FOCUS_OUT_EVENT] =
-    g_signal_newc ("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,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT);
+                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[MAP_EVENT] =
-    g_signal_newc ("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,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT);
+                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[UNMAP_EVENT] =
-    g_signal_newc ("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,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT);
+                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[PROPERTY_NOTIFY_EVENT] =
-    g_signal_newc ("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,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT);
+                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[SELECTION_CLEAR_EVENT] =
-    g_signal_newc ("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,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT);
+                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[SELECTION_REQUEST_EVENT] =
-    g_signal_newc ("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,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT);
+                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[SELECTION_NOTIFY_EVENT] =
-    g_signal_newc ("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,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT);
+                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[SELECTION_RECEIVED] =
-    gtk_signal_new ("selection_received",
-                   GTK_RUN_LAST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, selection_received),
-                   gtk_marshal_VOID__BOXED_UINT,
-                   GTK_TYPE_NONE, 2,
-                   GTK_TYPE_SELECTION_DATA,
-                   GTK_TYPE_UINT);
+    g_signal_new ("selection_received",
+                 G_TYPE_FROM_CLASS (object_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, selection_received),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__BOXED_UINT,
+                 G_TYPE_NONE, 2,
+                 GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE,
+                 G_TYPE_UINT);
   widget_signals[SELECTION_GET] =
-    gtk_signal_new ("selection_get",
-                   GTK_RUN_LAST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, selection_get),
-                   gtk_marshal_VOID__BOXED_UINT_UINT,
-                   GTK_TYPE_NONE, 3,
-                   GTK_TYPE_SELECTION_DATA,
-                   GTK_TYPE_UINT,
-                   GTK_TYPE_UINT);
+    g_signal_new ("selection_get",
+                 G_TYPE_FROM_CLASS (object_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, selection_get),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__BOXED_UINT_UINT,
+                 G_TYPE_NONE, 3,
+                 GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE,
+                 G_TYPE_UINT,
+                 G_TYPE_UINT);
   widget_signals[PROXIMITY_IN_EVENT] =
-    g_signal_newc ("proximity_in_event",
-                  G_TYPE_FROM_CLASS(object_class),
+    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,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT);
+                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[PROXIMITY_OUT_EVENT] =
-    g_signal_newc ("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,
+                  _gtk_marshal_BOOLEAN__BOXED,
                   G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT);
+                  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_marshal_VOID__OBJECT_UINT,
                    GTK_TYPE_NONE, 2,
                    GDK_TYPE_DRAG_CONTEXT,
                    GTK_TYPE_UINT);
@@ -921,7 +896,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_begin),
-                   gtk_marshal_VOID__OBJECT,
+                   _gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                    GDK_TYPE_DRAG_CONTEXT);
   widget_signals[DRAG_END] =
@@ -929,7 +904,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_end),
-                   gtk_marshal_VOID__OBJECT,
+                   _gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                    GDK_TYPE_DRAG_CONTEXT);
   widget_signals[DRAG_DATA_DELETE] =
@@ -937,107 +912,118 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_data_delete),
-                   gtk_marshal_VOID__OBJECT,
+                   _gtk_marshal_VOID__OBJECT,
                    GTK_TYPE_NONE, 1,
                    GDK_TYPE_DRAG_CONTEXT);
   widget_signals[DRAG_MOTION] =
-    g_signal_newc ("drag_motion",
+    g_signal_new ("drag_motion",
                   G_TYPE_FROM_CLASS(object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWidgetClass, drag_motion),
                   _gtk_boolean_handled_accumulator, NULL,
-                 gtk_marshal_BOOLEAN__OBJECT_INT_INT_UINT,
+                 _gtk_marshal_BOOLEAN__OBJECT_INT_INT_UINT,
                  G_TYPE_BOOLEAN, 4,
                  GDK_TYPE_DRAG_CONTEXT,
                  G_TYPE_INT,
                  G_TYPE_INT,
                  G_TYPE_UINT);
   widget_signals[DRAG_DROP] =
-    g_signal_newc ("drag_drop",
+    g_signal_new ("drag_drop",
                   G_TYPE_FROM_CLASS(object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWidgetClass, drag_drop),
                   _gtk_boolean_handled_accumulator, NULL,
-                 gtk_marshal_BOOLEAN__OBJECT_INT_INT_UINT,
+                 _gtk_marshal_BOOLEAN__OBJECT_INT_INT_UINT,
                  G_TYPE_BOOLEAN, 4,
                  GDK_TYPE_DRAG_CONTEXT,
                  G_TYPE_INT,
                  G_TYPE_INT,
                  G_TYPE_UINT);
   widget_signals[DRAG_DATA_GET] =
-    gtk_signal_new ("drag_data_get",
-                   GTK_RUN_LAST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_data_get),
-                   gtk_marshal_VOID__OBJECT_BOXED_UINT_UINT,
-                   GTK_TYPE_NONE, 4,
-                   GDK_TYPE_DRAG_CONTEXT,
-                   GTK_TYPE_SELECTION_DATA,
-                   GTK_TYPE_UINT,
-                   GTK_TYPE_UINT);
+    g_signal_new ("drag_data_get",
+                 G_TYPE_FROM_CLASS (object_class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkWidgetClass, drag_data_get),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__OBJECT_BOXED_UINT_UINT,
+                 G_TYPE_NONE, 4,
+                 GDK_TYPE_DRAG_CONTEXT,
+                 GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE,
+                 G_TYPE_UINT,
+                 G_TYPE_UINT);
   widget_signals[DRAG_DATA_RECEIVED] =
-    gtk_signal_new ("drag_data_received",
-                   GTK_RUN_LAST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_data_received),
-                   gtk_marshal_VOID__OBJECT_INT_INT_BOXED_UINT_UINT,
-                   GTK_TYPE_NONE, 6,
-                   GDK_TYPE_DRAG_CONTEXT,
-                   GTK_TYPE_INT,
-                   GTK_TYPE_INT,
-                   GTK_TYPE_SELECTION_DATA,
-                   GTK_TYPE_UINT,
-                   GTK_TYPE_UINT);
+    g_signal_new ("drag_data_received",
+                 G_TYPE_FROM_CLASS (object_class),
+                 G_SIGNAL_RUN_LAST,
+                 GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_data_received),
+                 NULL, NULL,
+                 _gtk_marshal_VOID__OBJECT_INT_INT_BOXED_UINT_UINT,
+                 G_TYPE_NONE, 6,
+                 GDK_TYPE_DRAG_CONTEXT,
+                 G_TYPE_INT,
+                 G_TYPE_INT,
+                 GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE,
+                 G_TYPE_UINT,
+                 G_TYPE_UINT);
   widget_signals[VISIBILITY_NOTIFY_EVENT] =
-    g_signal_newc ("visibility_notify_event",
+    g_signal_new ("visibility_notify_event",
                  G_TYPE_FROM_CLASS(object_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET(GtkWidgetClass, visibility_notify_event),
                   _gtk_boolean_handled_accumulator, NULL,
-                 gtk_marshal_BOOLEAN__BOXED,
+                 _gtk_marshal_BOOLEAN__BOXED,
                  G_TYPE_BOOLEAN, 1,
-                  GDK_TYPE_EVENT);
+                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[CLIENT_EVENT] =
-    g_signal_newc ("client_event",
+    g_signal_new ("client_event",
                  G_TYPE_FROM_CLASS(object_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET(GtkWidgetClass, client_event),
                  _gtk_boolean_handled_accumulator, NULL,
-                 gtk_marshal_BOOLEAN__BOXED,
+                 _gtk_marshal_BOOLEAN__BOXED,
                  G_TYPE_BOOLEAN, 1,
-                 GDK_TYPE_EVENT);
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[NO_EXPOSE_EVENT] =
-    g_signal_newc ("no_expose_event",
+    g_signal_new ("no_expose_event",
                  G_TYPE_FROM_CLASS(object_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET(GtkWidgetClass, no_expose_event),
                  _gtk_boolean_handled_accumulator, NULL,
-                 gtk_marshal_BOOLEAN__BOXED,
+                 _gtk_marshal_BOOLEAN__BOXED,
                  G_TYPE_BOOLEAN, 1,
-                 GDK_TYPE_EVENT);
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[WINDOW_STATE_EVENT] =
-    g_signal_newc ("window_state_event",
+    g_signal_new ("window_state_event",
                  G_TYPE_FROM_CLASS(object_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET(GtkWidgetClass, window_state_event),
                  _gtk_boolean_handled_accumulator, NULL,
-                 gtk_marshal_BOOLEAN__BOXED,
+                 _gtk_marshal_BOOLEAN__BOXED,
                  G_TYPE_BOOLEAN, 1,
-                 GDK_TYPE_EVENT);
+                 GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[POPUP_MENU] =
-    gtk_signal_new ("popup_menu",
-                   GTK_RUN_LAST | GTK_RUN_ACTION,
+    g_signal_new ("popup_menu",
+                 G_TYPE_FROM_CLASS (object_class),
+                 G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                 GTK_SIGNAL_OFFSET (GtkWidgetClass, popup_menu),
+                 _gtk_boolean_handled_accumulator, NULL,
+                  _gtk_marshal_BOOLEAN__VOID,
+                 G_TYPE_BOOLEAN, 0);
+  widget_signals[SHOW_HELP] =
+    g_signal_new ("show_help",
+                 G_TYPE_FROM_CLASS (object_class),
+                 G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                 GTK_SIGNAL_OFFSET (GtkWidgetClass, show_help),
+                 _gtk_boolean_handled_accumulator, NULL,
+                  _gtk_marshal_BOOLEAN__ENUM,
+                 G_TYPE_BOOLEAN, 1, GTK_TYPE_WIDGET_HELP_TYPE);
+  widget_signals[ACCEL_CLOSURES_CHANGED] =
+    gtk_signal_new ("accel_closures_changed",
+                   0,
                    GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, popup_menu),
+                   0,
                     gtk_marshal_NONE__NONE,
                    GTK_TYPE_NONE, 0);
-  widget_signals[SHOW_HELP] =
-    gtk_signal_new ("show_help",
-                   GTK_RUN_LAST | GTK_RUN_ACTION,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkWidgetClass, show_help),
-                    gtk_marshal_NONE__ENUM,
-                   GTK_TYPE_NONE, 1, GTK_TYPE_WIDGET_HELP_TYPE);
   
   binding_set = gtk_binding_set_by_class (klass);
   gtk_binding_entry_add_signal (binding_set, GDK_F10, GDK_SHIFT_MASK,
@@ -1053,7 +1039,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                                 "show_help", 1,
                                 GTK_TYPE_WIDGET_HELP_TYPE,
                                 GTK_WIDGET_HELP_TOOLTIP);
-  
   gtk_binding_entry_add_signal (binding_set, GDK_F1, GDK_SHIFT_MASK,
                                 "show_help", 1,
                                 GTK_TYPE_WIDGET_HELP_TYPE,
@@ -1069,6 +1054,38 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                                                                 _("Whether to draw the focus indicator inside widgets."),
                                                                 TRUE,
                                                                 G_PARAM_READABLE));
+
+  gtk_widget_class_install_style_property (klass,
+                                          g_param_spec_int ("focus-line-width",
+                                                            _("Focus linewidth"),
+                                                            _("Width, in pixels, of the focus indicator line."),
+                                                            0, G_MAXINT, 1,
+                                                            G_PARAM_READWRITE));
+
+  gtk_widget_class_install_style_property (klass,
+                                          g_param_spec_string ("focus-line-pattern",
+                                                               _("Focus line dash pattern"),
+                                                               _("Dash pattern used to draw the focus indicator."),
+                                                               "\1\1",
+                                                               G_PARAM_READWRITE));
+  gtk_widget_class_install_style_property (klass,
+                                          g_param_spec_int ("focus-padding",
+                                                            _("Focus padding"),
+                                                            _("Width, in pixels, between focus indicator and the widget 'box'."),
+                                                            0, G_MAXINT, 1,
+                                                            G_PARAM_READWRITE));
+  gtk_widget_class_install_style_property (klass,
+                                          g_param_spec_boxed ("cursor-color",
+                                                              _("Cursor color"),
+                                                              _("Color with which to draw insertion cursor"),
+                                                              GDK_TYPE_COLOR,
+                                                              G_PARAM_READABLE));
+  gtk_widget_class_install_style_property (klass,
+                                           g_param_spec_float ("cursor-aspect-ratio",
+                                                               _("Cursor line aspect ratio"),
+                                                               _("Aspect ratio with which to draw insertion cursor"),
+                                                               0.0, 1.0, 0.033,
+                                                               G_PARAM_READABLE));
 }
 
 static void
@@ -1077,10 +1094,7 @@ gtk_widget_set_property (GObject         *object,
                         const GValue    *value,
                         GParamSpec      *pspec)
 {
-  GtkWidget *widget;
-  GtkWidgetAuxInfo *aux_info;
-
-  widget = GTK_WIDGET (object);
+  GtkWidget *widget = GTK_WIDGET (object);
 
   switch (prop_id)
     {
@@ -1092,32 +1106,10 @@ gtk_widget_set_property (GObject         *object,
     case PROP_PARENT:
       gtk_container_add (GTK_CONTAINER (g_value_get_object (value)), widget);
       break;
-    case PROP_X:
-      aux_info = _gtk_widget_get_aux_info (widget, TRUE);
-      if (g_value_get_int (value) == -1)
-       aux_info->x_set = FALSE;
-      else
-       {
-         aux_info->x_set = TRUE;
-         aux_info->x = g_value_get_int (value);
-       }
-      gtk_widget_do_uposition (widget);
-      break;
-    case PROP_Y:
-      aux_info = _gtk_widget_get_aux_info (widget, TRUE);
-      if (g_value_get_int (value) == -1)
-       aux_info->y_set = FALSE;
-      else
-       {
-         aux_info->y_set = TRUE;
-         aux_info->y = g_value_get_int (value);
-       }
-      gtk_widget_do_uposition (widget);
-      break;
-    case PROP_WIDTH:
+    case PROP_WIDTH_REQUEST:
       gtk_widget_set_usize (widget, g_value_get_int (value), -2);
       break;
-    case PROP_HEIGHT:
+    case PROP_HEIGHT_REQUEST:
       gtk_widget_set_usize (widget, -2, g_value_get_int (value));
       break;
     case PROP_VISIBLE:
@@ -1185,13 +1177,10 @@ gtk_widget_get_property (GObject         *object,
                         GValue          *value,
                         GParamSpec      *pspec)
 {
-  GtkWidget *widget;
-
-  widget = GTK_WIDGET (object);
+  GtkWidget *widget = GTK_WIDGET (object);
   
   switch (prop_id)
     {
-      GtkWidgetAuxInfo *aux_info;
       gint *eventp;
       GdkExtensionMode *modep;
 
@@ -1203,37 +1192,23 @@ gtk_widget_get_property (GObject         *object,
       break;
     case PROP_PARENT:
       if (widget->parent)
-       g_value_set_object (value, G_OBJECT (widget->parent));
+       g_value_set_object (value, widget->parent);
       else
        g_value_set_object (value, NULL);
       break;
-    case PROP_X:
-      aux_info =_gtk_widget_get_aux_info (widget, FALSE);
-      if (!aux_info || !aux_info->x_set)
-       g_value_set_int (value, -1);
-      else
-       g_value_set_int (value, aux_info->x);
-      break;
-    case PROP_Y:
-      aux_info =_gtk_widget_get_aux_info (widget, FALSE);
-      if (!aux_info || !aux_info->y_set)
-       g_value_set_int (value, -1);
-      else
-       g_value_set_int (value, aux_info->y);
-      break;
-    case PROP_WIDTH:
-      aux_info =_gtk_widget_get_aux_info (widget, FALSE);
-      if (!aux_info)
-       g_value_set_int (value, -1);
-      else
-       g_value_set_int (value, aux_info->width);
+    case PROP_WIDTH_REQUEST:
+      {
+        int w;
+        gtk_widget_get_size_request (widget, &w, NULL);
+        g_value_set_int (value, w);
+      }
       break;
-    case PROP_HEIGHT:
-      aux_info =_gtk_widget_get_aux_info (widget, FALSE);
-      if (!aux_info)
-       g_value_set_int (value, -1);
-      else
-       g_value_set_int (value, aux_info->height);
+    case PROP_HEIGHT_REQUEST:
+      {
+        int h;
+        gtk_widget_get_size_request (widget, NULL, &h);
+        g_value_set_int (value, h);
+      }
       break;
     case PROP_VISIBLE:
       g_value_set_boolean (value, (GTK_WIDGET_VISIBLE (widget) != FALSE));
@@ -1263,7 +1238,7 @@ gtk_widget_get_property (GObject         *object,
       g_value_set_boolean (value, (GTK_WIDGET_COMPOSITE_CHILD (widget) != FALSE));
       break;
     case PROP_STYLE:
-      g_value_set_object (value, G_OBJECT (gtk_widget_get_style (widget)));
+      g_value_set_object (value, gtk_widget_get_style (widget));
       break;
     case PROP_EVENTS:
       eventp = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_event_mask);
@@ -1288,9 +1263,7 @@ gtk_widget_get_property (GObject         *object,
 static void
 gtk_widget_init (GtkWidget *widget)
 {
-  GdkColormap *colormap;
-  
-  GTK_PRIVATE_FLAGS (widget) = 0;
+  GTK_PRIVATE_FLAGS (widget) = PRIVATE_GTK_CHILD_VISIBLE;
   widget->state = GTK_STATE_NORMAL;
   widget->saved_state = GTK_STATE_NORMAL;
   widget->name = NULL;
@@ -1309,13 +1282,12 @@ gtk_widget_init (GtkWidget *widget)
                        (composite_child_stack ? GTK_COMPOSITE_CHILD : 0) |
                        GTK_DOUBLE_BUFFERED);
 
-  widget->style = gtk_widget_peek_style ();
-  gtk_style_ref (widget->style);
-  
-  colormap = gtk_widget_peek_colormap ();
-  
-  if (colormap != gtk_widget_get_default_colormap ())
-    gtk_widget_set_colormap (widget, colormap);
+  GTK_PRIVATE_SET_FLAG (widget, GTK_REDRAW_ON_ALLOC);
+  GTK_PRIVATE_SET_FLAG (widget, GTK_REQUEST_NEEDED);
+  GTK_PRIVATE_SET_FLAG (widget, GTK_ALLOC_NEEDED);
+
+  widget->style = gtk_widget_get_default_style ();
+  g_object_ref (widget->style);
 }
 
 
@@ -1375,6 +1347,12 @@ gtk_widget_child_notify (GtkWidget    *widget,
   g_object_unref (widget);
 }
 
+/**
+ * gtk_widget_thaw_child_notify:
+ * @widget: a #GtkWidget
+ *
+ * Reverts the effect of a previous call to gtk_widget_freeze_child_notify().
+ */ 
 void
 gtk_widget_thaw_child_notify (GtkWidget *widget)
 {
@@ -1400,12 +1378,12 @@ gtk_widget_thaw_child_notify (GtkWidget *widget)
  * gtk_widget_new:
  * @type: type ID of the widget to create
  * @first_property_name: name of first property to set
- * @Varargs: value of first property, followed by more properties, NULL-terminated
+ * @Varargs: value of first property, followed by more properties, %NULL-terminated
  * 
  * This is a convenience function for creating a widget and setting
  * its properties in one go. For example you might write:
- * gtk_widget_new (GTK_TYPE_LABEL, "label", "Hello World", "xalign",
- * 0.0, NULL) to create a left-aligned label. Equivalent to
+ * <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
  * cast the object yourself.
  * 
@@ -1422,7 +1400,7 @@ gtk_widget_new (GtkType      type,
   g_return_val_if_fail (gtk_type_is_a (type, GTK_TYPE_WIDGET), NULL);
   
   va_start (var_args, first_property_name);
-  widget = g_object_new_valist (type, first_property_name, var_args);
+  widget = (GtkWidget *)g_object_new_valist (type, first_property_name, var_args);
   va_end (var_args);
 
   return widget;
@@ -1432,7 +1410,7 @@ gtk_widget_new (GtkType      type,
  * gtk_widget_set:
  * @widget: a #GtkWidget
  * @first_property_name: name of first property to set
- * @Varargs: value of first property, followed by more properties, NULL-terminated
+ * @Varargs: value of first property, followed by more properties, %NULL-terminated
  * 
  * Like gtk_object_set() - there's no reason to use this instead of
  * gtk_object_set().
@@ -1480,7 +1458,6 @@ gtk_widget_unparent (GtkWidget *widget)
   GtkWidget *toplevel;
   GtkWidget *old_parent;
   
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
   if (widget->parent == NULL)
     return;
@@ -1501,7 +1478,7 @@ gtk_widget_unparent (GtkWidget *widget)
     {
       gtk_container_set_focus_child (GTK_CONTAINER (widget->parent), NULL);
 
-      if (GTK_IS_WINDOW (toplevel))
+      if (GTK_WIDGET_TOPLEVEL (toplevel))
        {
          GtkWidget *child;
       
@@ -1514,7 +1491,7 @@ gtk_widget_unparent (GtkWidget *widget)
            gtk_window_set_focus (GTK_WINDOW (toplevel), NULL);
        }
     }
-  if (GTK_IS_WINDOW (toplevel))
+  if (GTK_WIDGET_TOPLEVEL (toplevel))
     {
       GtkWidget *child;
       
@@ -1527,63 +1504,13 @@ gtk_widget_unparent (GtkWidget *widget)
        gtk_window_set_default (GTK_WINDOW (toplevel), NULL);
     }
 
-  if (GTK_IS_RESIZE_CONTAINER (widget))
-    gtk_container_clear_resize_widgets (GTK_CONTAINER (widget));
-  
-  /* Remove the widget and all its children from any ->resize_widgets list
-   * of all the parents in our branch. This code should move into gtkcontainer.c
-   * somwhen, since we mess around with ->resize_widgets, which is
-   * actually not of our business.
-   *
-   * Two ways to make this prettier:
-   *   Write a g_slist_conditional_remove (GSList, gboolean (*)(gpointer))
-   *   Change resize_widgets to a GList
+  /* If we are unanchoring the child, we save around the toplevel
+   * to emit hierarchy changed
    */
-  toplevel = widget->parent;
-  while (toplevel)
-    {
-      GSList *slist;
-      GSList *prev;
-
-      if (!GTK_CONTAINER (toplevel)->resize_widgets)
-       {
-         toplevel = toplevel->parent;
-         continue;
-       }
-
-      prev = NULL;
-      slist = GTK_CONTAINER (toplevel)->resize_widgets;
-      while (slist)
-       {
-         GtkWidget *child;
-         GtkWidget *parent;
-         GSList *last;
-
-         last = slist;
-         slist = last->next;
-         child = last->data;
-         
-         parent = child;
-         while (parent && (parent != widget))
-           parent = parent->parent;
-         
-         if (parent == widget)
-           {
-             GTK_PRIVATE_UNSET_FLAG (child, GTK_RESIZE_NEEDED);
-             
-             if (prev)
-               prev->next = slist;
-             else
-               GTK_CONTAINER (toplevel)->resize_widgets = slist;
-             
-             g_slist_free_1 (last);
-           }
-         else
-           prev = last;
-       }
-
-      toplevel = toplevel->parent;
-    }
+  if (GTK_WIDGET_ANCHORED (widget->parent))
+    g_object_ref (toplevel);
+  else
+    toplevel = NULL;
 
   gtk_widget_queue_clear_child (widget);
 
@@ -1598,11 +1525,22 @@ gtk_widget_unparent (GtkWidget *widget)
   if (GTK_WIDGET_REALIZED (widget) && !GTK_WIDGET_IN_REPARENT (widget))
     gtk_widget_unrealize (widget);
 
+  /* Removing a widget from a container restores the child visible
+   * flag to the default state, so it doesn't affect the child
+   * in the next parent.
+   */
+  GTK_PRIVATE_SET_FLAG (widget, GTK_CHILD_VISIBLE);
+    
   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);
-  gtk_widget_propagate_hierarchy_changed (widget, NULL);
+  if (toplevel)
+    {
+      _gtk_widget_propagate_hierarchy_changed (widget, toplevel);
+      g_object_unref (toplevel);
+    }
+      
   g_object_notify (G_OBJECT (widget), "parent");
   g_object_thaw_notify (G_OBJECT (widget));
   if (!widget->parent)
@@ -1634,7 +1572,6 @@ gtk_widget_unparent (GtkWidget *widget)
 void
 gtk_widget_destroy (GtkWidget *widget)
 {
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
   gtk_object_destroy ((GtkObject*) widget);
@@ -1645,12 +1582,12 @@ gtk_widget_destroy (GtkWidget *widget)
  * @widget: a #GtkWidget
  * @widget_pointer: address of a variable that contains @widget
  *
- * This function sets *@widget_pointer to NULL if @widget_pointer !=
- * NULL.  It's intended to be used as a callback connected to the
+ * This function sets *@widget_pointer to %NULL if @widget_pointer !=
+ * %NULL.  It's intended to be used as a callback connected to the
  * "destroy" signal of a widget. You connect gtk_widget_destroyed()
  * as a signal handler, and pass the address of your widget variable
  * as user data. Then when the widget is destroyed, the variable will
- * be set to NULL. Useful for example to avoid multiple copies
+ * be set to %NULL. Useful for example to avoid multiple copies
  * of the same dialog.
  * 
  **/
@@ -1686,7 +1623,6 @@ gtk_widget_destroyed (GtkWidget      *widget,
 void
 gtk_widget_show (GtkWidget *widget)
 {
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
   
   if (!GTK_WIDGET_VISIBLE (widget))
@@ -1703,15 +1639,13 @@ gtk_widget_show (GtkWidget *widget)
 static void
 gtk_widget_real_show (GtkWidget *widget)
 {
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-  
   if (!GTK_WIDGET_VISIBLE (widget))
     {
       GTK_WIDGET_SET_FLAGS (widget, GTK_VISIBLE);
 
       if (widget->parent &&
          GTK_WIDGET_MAPPED (widget->parent) &&
+         GTK_WIDGET_CHILD_VISIBLE (widget) &&
          !GTK_WIDGET_MAPPED (widget))
        gtk_widget_map (widget);
     }
@@ -1739,7 +1673,6 @@ gtk_widget_show_now (GtkWidget *widget)
 {
   gint flag = FALSE;
   
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
   /* make sure we will get event */
@@ -1769,14 +1702,13 @@ gtk_widget_show_now (GtkWidget *widget)
 void
 gtk_widget_hide (GtkWidget *widget)
 {
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
   
   if (GTK_WIDGET_VISIBLE (widget))
     {
       gtk_widget_ref (widget);
       gtk_signal_emit (GTK_OBJECT (widget), widget_signals[HIDE]);
-      if (!GTK_WIDGET_TOPLEVEL (widget) && GTK_WIDGET_REALIZED (widget))
+      if (!GTK_WIDGET_TOPLEVEL (widget))
        gtk_widget_queue_resize (widget);
       g_object_notify (G_OBJECT (widget), "visible");
       gtk_widget_unref (widget);
@@ -1786,9 +1718,6 @@ gtk_widget_hide (GtkWidget *widget)
 static void
 gtk_widget_real_hide (GtkWidget *widget)
 {
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-  
   if (GTK_WIDGET_VISIBLE (widget))
     {
       GTK_WIDGET_UNSET_FLAGS (widget, GTK_VISIBLE);
@@ -1804,17 +1733,17 @@ gtk_widget_real_hide (GtkWidget *widget)
  * 
  * Utility function; intended to be connected to the "delete_event"
  * signal on a #GtkWindow. The function calls gtk_widget_hide() on its
- * argument, then returns %TRUE. If connected to "delete_event",
- * the result is that clicking the window manager close button for
- * will hide but not destroy the window. By default, GTK+ destroys
- * windows when "delete_event" is received.
+ * argument, then returns %TRUE. If connected to "delete_event", the
+ * result is that clicking the close button for a window (on the
+ * window frame, top right corner usually) will hide but not destroy
+ * the window. By default, GTK+ destroys windows when "delete_event"
+ * is received.
  * 
  * Return value: %TRUE
  **/
 gboolean
 gtk_widget_hide_on_delete (GtkWidget      *widget)
 {
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
   
   gtk_widget_hide (widget);
@@ -1834,7 +1763,6 @@ gtk_widget_show_all (GtkWidget *widget)
 {
   GtkWidgetClass *class;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
   class = GTK_WIDGET_GET_CLASS (widget);
@@ -1854,7 +1782,6 @@ gtk_widget_hide_all (GtkWidget *widget)
 {
   GtkWidgetClass *class;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
   class = GTK_WIDGET_GET_CLASS (widget);
@@ -1875,7 +1802,8 @@ void
 gtk_widget_map (GtkWidget *widget)
 {
   g_return_if_fail (GTK_IS_WIDGET (widget));
-  g_return_if_fail (GTK_WIDGET_VISIBLE (widget) == TRUE);
+  g_return_if_fail (GTK_WIDGET_VISIBLE (widget));
+  g_return_if_fail (GTK_WIDGET_CHILD_VISIBLE (widget));
   
   if (!GTK_WIDGET_MAPPED (widget))
     {
@@ -1885,7 +1813,7 @@ gtk_widget_map (GtkWidget *widget)
       gtk_signal_emit (GTK_OBJECT (widget), widget_signals[MAP]);
 
       if (GTK_WIDGET_NO_WINDOW (widget))
-       gtk_widget_queue_draw (widget);
+       gdk_window_invalidate_rect (widget->window, &widget->allocation, FALSE);
     }
 }
 
@@ -1900,13 +1828,12 @@ gtk_widget_map (GtkWidget *widget)
 void
 gtk_widget_unmap (GtkWidget *widget)
 {
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
   
   if (GTK_WIDGET_MAPPED (widget))
     {
       if (GTK_WIDGET_NO_WINDOW (widget))
-       gtk_widget_queue_clear_child (widget);
+       gdk_window_invalidate_rect (widget->window, &widget->allocation, FALSE);
       gtk_signal_emit (GTK_OBJECT (widget), widget_signals[UNMAP]);
     }
 }
@@ -1916,7 +1843,7 @@ gtk_widget_unmap (GtkWidget *widget)
  * @widget: a #GtkWidget
  * 
  * Creates the GDK (windowing system) resources associated with a
- * widget.  For example, widget->window will be created when a widget
+ * widget.  For example, @widget->window will be created when a widget
  * is realized.  Normally realization happens implicitly; if you show
  * a widget and all its parent containers, then the widget will be
  * realized and mapped automatically.
@@ -1942,7 +1869,6 @@ gtk_widget_realize (GtkWidget *widget)
   GdkExtensionMode mode;
   GtkWidgetShapeInfo *shape_info;
   
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
   
   if (!GTK_WIDGET_REALIZED (widget))
@@ -1993,13 +1919,12 @@ gtk_widget_realize (GtkWidget *widget)
  *
  * This function is only useful in widget implementations.
  * Causes a widget to be unrealized (frees all GDK resources
- * associated with the widget, such as widget->window).
+ * associated with the widget, such as @widget->window).
  * 
  **/
 void
 gtk_widget_unrealize (GtkWidget *widget)
 {
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
   if (GTK_WIDGET_HAS_SHAPE_MASK (widget))
@@ -2055,7 +1980,6 @@ gtk_widget_queue_draw_area (GtkWidget *widget,
                            gint       width,
                            gint       height)
 {
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
   gtk_widget_queue_clear_area (widget, x, y, width, height);
@@ -2072,7 +1996,6 @@ gtk_widget_queue_draw_area (GtkWidget *widget,
 void      
 gtk_widget_queue_draw (GtkWidget *widget)
 {
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
   gtk_widget_queue_clear (widget);
@@ -2093,7 +2016,7 @@ gtk_widget_queue_draw (GtkWidget *widget)
  * 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
+ * background for %GTK_NO_WINDOW widgets, and
  * gtk_widget_queue_draw_area() would not. Now both functions ensure
  * the background will be redrawn.
  * 
@@ -2107,7 +2030,6 @@ gtk_widget_queue_clear_area (GtkWidget *widget,
 {
   GdkRectangle invalid_rect;
   
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
   if (!(widget->window && gdk_window_is_viewable (widget->window)))
@@ -2165,7 +2087,6 @@ gtk_widget_queue_clear_area (GtkWidget *widget,
 void      
 gtk_widget_queue_clear (GtkWidget *widget)
 {
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
   if (widget->allocation.width || widget->allocation.height)
@@ -2196,11 +2117,17 @@ gtk_widget_queue_clear (GtkWidget *widget)
 void
 gtk_widget_queue_resize (GtkWidget *widget)
 {
-  g_return_if_fail (widget != NULL);
+  GdkRegion *region;
+  
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
-  gtk_widget_queue_clear (widget);
-
+  if (GTK_WIDGET_REALIZED (widget))
+    {
+      region = gdk_region_rectangle (&widget->allocation);
+      gtk_widget_invalidate_widget_windows (widget, region);
+      gdk_region_destroy (region);
+    }
+      
   _gtk_size_group_queue_resize (widget);
 }
 
@@ -2223,7 +2150,6 @@ void
 gtk_widget_draw (GtkWidget    *widget,
                 GdkRectangle *area)
 {
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
   if (GTK_WIDGET_DRAWABLE (widget))
@@ -2244,16 +2170,25 @@ gtk_widget_draw (GtkWidget    *widget,
  * @widget: a #GtkWidget
  * @requisition: a #GtkRequisition to be filled in
  * 
- * This function is only used when implementing a #GtkContainer subclass.
- * Obtains the preferred size of a widget. The container uses this
- * information to arrange its child widgets and decide what size allocations
- * to give them with gtk_widget_size_allocate().
+ * This function is typically used when implementing a #GtkContainer
+ * subclass.  Obtains the preferred size of a widget. The container
+ * uses this information to arrange its child widgets and decide what
+ * size allocations to give them with gtk_widget_size_allocate().
+ *
+ * You can also call this function from an application, with some
+ * caveats. Most notably, getting a size request requires the widget
+ * to be associated with a screen, because font information may be
+ * needed. Multihead-aware applications should keep this in mind.
+ *
+ * Also remember that the size request is not necessarily the size
+ * a widget will actually be allocated.
+ *
+ * See also gtk_widget_get_child_requisition().
  **/
 void
 gtk_widget_size_request (GtkWidget     *widget,
                         GtkRequisition *requisition)
 {
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
 #ifdef G_ENABLE_DEBUG
@@ -2262,13 +2197,6 @@ gtk_widget_size_request (GtkWidget       *widget,
 #endif /* G_ENABLE_DEBUG */
 
   _gtk_size_group_compute_requisition (widget, requisition);
-
-#if 0  
-  if (requisition)
-    gtk_widget_get_child_requisition (widget, requisition);
-
-  gtk_widget_unref (widget);
-#endif  
 }
 
 /**
@@ -2280,6 +2208,19 @@ gtk_widget_size_request (GtkWidget       *widget,
  * @widget->requisition, unless someone has forced a particular
  * geometry on the widget (e.g. with gtk_widget_set_usize()), in which
  * case it returns that geometry instead of the widget's requisition.
+ *
+ * This function differs from gtk_widget_size_request() in that
+ * it retrieves the last size request value from @widget->requisition,
+ * while gtk_widget_size_request() actually calls the "size_request" method
+ * on @widget to compute the size request and fill in @widget->requisition,
+ * and only then returns @widget->requisition.
+ *
+ * Because this function does not call the "size_request" method, it
+ * can only be used when you know that @widget->requisition is
+ * up-to-date, that is, gtk_widget_size_request() has been called
+ * since the last time a resize was queued. In general, only container
+ * implementations have this information; applications should use
+ * gtk_widget_size_request().
  **/
 void
 gtk_widget_get_child_requisition (GtkWidget     *widget,
@@ -2288,6 +2229,38 @@ gtk_widget_get_child_requisition (GtkWidget       *widget,
   _gtk_size_group_get_child_requisition (widget, requisition);
 }
 
+static gboolean
+invalidate_predicate (GdkWindow *window,
+                     gpointer   data)
+{
+  gpointer user_data;
+
+  gdk_window_get_user_data (window, &user_data);
+
+  return (user_data == data);
+}
+
+/* Invalidate @region in widget->window and all children
+ * of widget->window owned by widget. @region is in the
+ * same coordinates as widget->allocation and will be
+ * modified by this call.
+ */
+static void
+gtk_widget_invalidate_widget_windows (GtkWidget *widget,
+                                     GdkRegion *region)
+{
+  if (!GTK_WIDGET_NO_WINDOW (widget))
+    {
+      int x, y;
+      
+      gdk_window_get_position (widget->window, &x, &y);
+      gdk_region_offset (region, -x, -y);
+    }
+
+  gdk_window_invalidate_maybe_recurse (widget->window, region,
+                                      invalidate_predicate, widget);
+}
+
 /**
  * gtk_widget_size_allocate:
  * @widget: a #GtkWidget
@@ -2302,12 +2275,18 @@ gtk_widget_size_allocate (GtkWidget     *widget,
                          GtkAllocation *allocation)
 {
   GtkWidgetAuxInfo *aux_info;
-  GtkAllocation real_allocation;
-  gboolean needs_draw = FALSE;
+  GdkRectangle real_allocation;
+  GdkRectangle old_allocation;
+  gboolean alloc_needed;
+  gboolean size_changed;
+  gboolean position_changed;
   
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
-  
+
+  alloc_needed = GTK_WIDGET_ALLOC_NEEDED (widget);
+  GTK_PRIVATE_UNSET_FLAG (widget, GTK_ALLOC_NEEDED);
+
+  old_allocation = widget->allocation;
   real_allocation = *allocation;
   aux_info =_gtk_widget_get_aux_info (widget, FALSE);
   
@@ -2329,43 +2308,218 @@ gtk_widget_size_allocate (GtkWidget    *widget,
   real_allocation.width = MAX (real_allocation.width, 1);
   real_allocation.height = MAX (real_allocation.height, 1);
 
-  if (GTK_WIDGET_NO_WINDOW (widget))
+  size_changed = (old_allocation.width != real_allocation.width ||
+                 old_allocation.height != real_allocation.height);
+  position_changed = (old_allocation.x != real_allocation.x ||
+                     old_allocation.y != real_allocation.y);
+
+  if (!alloc_needed && !size_changed && !position_changed)
+    return;
+  
+  gtk_signal_emit (GTK_OBJECT (widget), widget_signals[SIZE_ALLOCATE], &real_allocation);
+
+  if (GTK_WIDGET_MAPPED (widget))
     {
-      if (widget->allocation.x != real_allocation.x ||
-         widget->allocation.y != real_allocation.y ||
-         widget->allocation.width != real_allocation.width ||
-         widget->allocation.height != real_allocation.height)
+      if (GTK_WIDGET_NO_WINDOW (widget) && GTK_WIDGET_REDRAW_ON_ALLOC (widget) && position_changed)
+       {
+         /* Invalidate union(old_allaction,widget->allocation) in widget->window
+          */
+         GdkRegion *invalidate = gdk_region_rectangle (&widget->allocation);
+         gdk_region_union_with_rect (invalidate, &old_allocation);
+
+         gdk_window_invalidate_region (widget->window, invalidate, FALSE);
+         gdk_region_destroy (invalidate);
+       }
+      
+      if (size_changed)
        {
-         gtk_widget_queue_clear_child (widget);
-         needs_draw = TRUE;
+         if (GTK_WIDGET_REDRAW_ON_ALLOC (widget))
+           {
+             /* Invalidate union(old_allaction,widget->allocation) in widget->window and descendents owned by widget
+              */
+             GdkRegion *invalidate = gdk_region_rectangle (&widget->allocation);
+             gdk_region_union_with_rect (invalidate, &old_allocation);
+
+             gtk_widget_invalidate_widget_windows (widget, invalidate);
+             gdk_region_destroy (invalidate);
+           }
        }
     }
-  else if (widget->allocation.width != real_allocation.width ||
-          widget->allocation.height != real_allocation.height)
+
+  if ((size_changed || position_changed) && widget->parent &&
+      GTK_WIDGET_REALIZED (widget->parent) && GTK_CONTAINER (widget->parent)->reallocate_redraws)
     {
-      needs_draw = TRUE;
+      GdkRegion *invalidate = gdk_region_rectangle (&widget->parent->allocation);
+      gtk_widget_invalidate_widget_windows (widget->parent, invalidate);
+      gdk_region_destroy (invalidate);
     }
+}
 
-  if (GTK_IS_RESIZE_CONTAINER (widget))
-    gtk_container_clear_resize_widgets (GTK_CONTAINER (widget));
+/**
+ * gtk_widget_common_ancestor:
+ * @widget_a: a #GtkWidget
+ * @widget_b: a #GtkWidget
+ * 
+ * Find the common ancestor of @widget_a and @widget_b that
+ * is closest to the two widgets.
+ * 
+ * Return value: the closest common ancestor of @widget_a and
+ *   @widget_b or %NULL if @widget_a and @widget_b do not
+ *   share a common ancestor.
+ **/
+static GtkWidget *
+gtk_widget_common_ancestor (GtkWidget *widget_a,
+                           GtkWidget *widget_b)
+{
+  GtkWidget *parent_a;
+  GtkWidget *parent_b;
+  gint depth_a = 0;
+  gint depth_b = 0;
 
-  gtk_signal_emit (GTK_OBJECT (widget), widget_signals[SIZE_ALLOCATE], &real_allocation);
+  parent_a = widget_a;
+  while (parent_a->parent)
+    {
+      parent_a = parent_a->parent;
+      depth_a++;
+    }
+
+  parent_b = widget_b;
+  while (parent_b->parent)
+    {
+      parent_b = parent_b->parent;
+      depth_b++;
+    }
+
+  if (parent_a != parent_b)
+    return NULL;
+
+  while (depth_a > depth_b)
+    {
+      widget_a = widget_a->parent;
+      depth_a--;
+    }
+
+  while (depth_b > depth_a)
+    {
+      widget_b = widget_b->parent;
+      depth_b--;
+    }
+
+  while (widget_a != widget_b)
+    {
+      widget_a = widget_a->parent;
+      widget_b = widget_b->parent;
+    }
+
+  return widget_a;
+}
+
+/**
+ * gtk_widget_translate_coordinates:
+ * @src_widget:  a #GtkWidget
+ * @dest_widget: a #GtkWidget
+ * @src_x: X position relative to @src_widget
+ * @src_y: Y position relative to @src_widget
+ * @dest_x: location to store X position relative to @dest_widget
+ * @dest_y: location to store Y position relative to @dest_widget
+ * 
+ * Translate coordinates relative to @src_widget's allocation to coordinates
+ * relative to @dest_widget's allocations. In order to perform this
+ * operation, both widgets must be realized, and must share a common
+ * toplevel.
+ * 
+ * Return value: %FALSE if either widget was not realized, or there
+ *   was no common ancestor. In this case, nothing is stored in
+ *   *@dest_x and *@dest_y. Otherwise %TRUE.
+ **/
+gboolean
+gtk_widget_translate_coordinates (GtkWidget  *src_widget,
+                                 GtkWidget  *dest_widget,
+                                 gint        src_x,
+                                 gint        src_y,
+                                 gint       *dest_x,
+                                 gint       *dest_y)
+{
+  GtkWidget *ancestor;
+  GdkWindow *window;
+
+  g_return_val_if_fail (GTK_IS_WIDGET (src_widget), FALSE);
+  g_return_val_if_fail (GTK_IS_WIDGET (dest_widget), FALSE);
+
+  ancestor = gtk_widget_common_ancestor (src_widget, dest_widget);
+  if (!ancestor || !GTK_WIDGET_REALIZED (src_widget) || !GTK_WIDGET_REALIZED (dest_widget))
+    return FALSE;
+
+  /* Translate from allocation relative to window relative */
+  if (!GTK_WIDGET_NO_WINDOW (src_widget) && src_widget->parent)
+    {
+      gint wx, wy;
+      gdk_window_get_position (src_widget->window, &wx, &wy);
+
+      src_x -= wx - src_widget->allocation.x;
+      src_y -= wy - src_widget->allocation.y;
+    }
+  else
+    {
+      src_x += src_widget->allocation.x;
+      src_y += src_widget->allocation.y;
+    }
+
+  /* Translate to the common ancestor */
+  window = src_widget->window;
+  while (window != ancestor->window)
+    {
+      gint dx, dy;
+      
+      gdk_window_get_position (window, &dx, &dy);
+      
+      src_x += dx;
+      src_y += dy;
+      
+      window = gdk_window_get_parent (window);
+    }
 
-  if (needs_draw)
+  /* And back */
+  window = dest_widget->window;
+  while (window != ancestor->window)
     {
-      gtk_widget_queue_draw (widget);
-      if (widget->parent && GTK_CONTAINER (widget->parent)->reallocate_redraws)
-       gtk_widget_queue_draw (widget->parent);
+      gint dx, dy;
+      
+      gdk_window_get_position (window, &dx, &dy);
+      
+      src_x -= dx;
+      src_y -= dy;
+      
+      window = gdk_window_get_parent (window);
+    }
+
+  /* Translate from window relative to allocation relative */
+  if (!GTK_WIDGET_NO_WINDOW (dest_widget) && dest_widget->parent)
+    {
+      gint wx, wy;
+      gdk_window_get_position (dest_widget->window, &wx, &wy);
+
+      src_x += wx - dest_widget->allocation.x;
+      src_y += wy - dest_widget->allocation.y;
     }
+  else
+    {
+      src_x -= dest_widget->allocation.x;
+      src_y -= dest_widget->allocation.y;
+    }
+
+  if (dest_x)
+    *dest_x = src_x;
+  if (dest_y)
+    *dest_y = src_y;
+
+  return TRUE;
 }
 
 static void
 gtk_widget_real_size_allocate (GtkWidget     *widget,
                               GtkAllocation *allocation)
 {
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-
   widget->allocation = *allocation;
   
   if (GTK_WIDGET_REALIZED (widget) &&
@@ -2377,156 +2531,301 @@ gtk_widget_real_size_allocate (GtkWidget     *widget,
      }
 }
 
+typedef struct {
+  GClosure   closure;
+  guint      signal_id;
+} AccelClosure;
+
 static void
-gtk_widget_stop_add_accelerator (GtkWidget *widget)
+closure_accel_activate (GClosure     *closure,
+                       GValue       *return_value,
+                       guint         n_param_values,
+                       const GValue *param_values,
+                       gpointer      invocation_hint,
+                       gpointer      marshal_data)
 {
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (widget));
+  AccelClosure *aclosure = (AccelClosure*) closure;
+
+  if (GTK_WIDGET_IS_SENSITIVE (closure->data))
+    g_signal_emit (closure->data, aclosure->signal_id, 0);
 
-  gtk_signal_emit_stop (GTK_OBJECT (widget), widget_signals[ADD_ACCELERATOR]);
+  /* we handled the accelerator */
+  g_value_set_boolean (return_value, TRUE);
 }
 
 static void
-gtk_widget_stop_remove_accelerator (GtkWidget *widget)
+closures_destroy (gpointer data)
 {
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (widget));
+  GSList *slist, *closures = data;
 
-  gtk_signal_emit_stop (GTK_OBJECT (widget), widget_signals[REMOVE_ACCELERATOR]);
+  for (slist = closures; slist; slist = slist->next)
+    {
+      g_closure_invalidate (slist->data);
+      g_closure_unref (slist->data);
+    }
+  g_slist_free (closures);
 }
 
-void
-gtk_widget_lock_accelerators (GtkWidget *widget)
+static GClosure*
+widget_new_accel_closure (GtkWidget *widget,
+                         guint      signal_id)
 {
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-  
-  if (!gtk_widget_accelerators_locked (widget))
+  AccelClosure *aclosure;
+  GClosure *closure = NULL;
+  GSList *slist, *closures;
+
+  closures = g_object_steal_qdata (G_OBJECT (widget), quark_accel_closures);
+  for (slist = closures; slist; slist = slist->next)
+    if (!gtk_accel_group_from_accel_closure (slist->data))
+      {
+       /* reuse this closure */
+       closure = slist->data;
+       break;
+      }
+  if (!closure)
     {
-      gtk_signal_connect (GTK_OBJECT (widget),
-                         "add_accelerator",
-                         GTK_SIGNAL_FUNC (gtk_widget_stop_add_accelerator),
-                         NULL);
-      gtk_signal_connect (GTK_OBJECT (widget),
-                         "remove_accelerator",
-                         GTK_SIGNAL_FUNC (gtk_widget_stop_remove_accelerator),
-                         NULL);
+      closure = g_closure_new_object (sizeof (AccelClosure), G_OBJECT (widget));
+      closures = g_slist_prepend (closures, g_closure_ref (closure));
+      g_closure_sink (closure);
+      g_closure_set_marshal (closure, closure_accel_activate);
     }
+  g_object_set_qdata_full (G_OBJECT (widget), quark_accel_closures, closures, closures_destroy);
+  
+  aclosure = (AccelClosure*) closure;
+  g_assert (closure->data == widget);
+  g_assert (closure->marshal == closure_accel_activate);
+  aclosure->signal_id = signal_id;
+
+  return closure;
 }
 
+/**
+ * gtk_widget_add_accelerator
+ * @widget:       widget to install an accelerator on
+ * @accel_signal: widget signal to emit on accelerator activation
+ * @accel_group:  accel group for this widget, added to its toplevel
+ * @accel_key:    GDK keyval of the accelerator
+ * @accel_mods:   modifier key combination of the accelerator
+ * @accel_flags:  flag accelerators, e.g. %GTK_ACCEL_VISIBLE
+ *
+ * Installs an accelerator for this @widget in @accel_group that causes
+ * @accel_signal to be emitted if the accelerator is activated.
+ * The @accel_group needs to be added to the widget's toplevel via
+ * gtk_window_add_accel_group(), and the signal must be of type %G_RUN_ACTION.
+ * Accelerators added through this function are not user changeable during
+ * runtime. If you want to support accelerators that can be changed by the
+ * user, use gtk_accel_map_add_entry() and gtk_widget_set_accel_path() or
+ * gtk_menu_item_set_accel_path() instead.
+ */
 void
-gtk_widget_unlock_accelerators (GtkWidget *widget)
+gtk_widget_add_accelerator (GtkWidget      *widget,
+                           const gchar    *accel_signal,
+                           GtkAccelGroup  *accel_group,
+                           guint           accel_key,
+                           GdkModifierType accel_mods,
+                           GtkAccelFlags   accel_flags)
 {
-  g_return_if_fail (widget != NULL);
+  GClosure *closure;
+  GSignalQuery query;
+
   g_return_if_fail (GTK_IS_WIDGET (widget));
-  
-  if (gtk_widget_accelerators_locked (widget))
+  g_return_if_fail (accel_signal != NULL);
+  g_return_if_fail (GTK_IS_ACCEL_GROUP (accel_group));
+
+  g_signal_query (g_signal_lookup (accel_signal, G_OBJECT_TYPE (widget)), &query);
+  if (!query.signal_id ||
+      !(query.signal_flags & G_SIGNAL_ACTION) ||
+      query.return_type != G_TYPE_NONE ||
+      query.n_params)
     {
-      gtk_signal_disconnect_by_func (GTK_OBJECT (widget),
-                                    GTK_SIGNAL_FUNC (gtk_widget_stop_add_accelerator),
-                                    NULL);
-      gtk_signal_disconnect_by_func (GTK_OBJECT (widget),
-                                    GTK_SIGNAL_FUNC (gtk_widget_stop_remove_accelerator),
-                                    NULL);
+      /* hmm, should be elaborate enough */
+      g_warning (G_STRLOC ": widget `%s' has no activatable signal \"%s\" without arguments",
+                G_OBJECT_TYPE_NAME (widget), accel_signal);
+      return;
     }
+
+  closure = widget_new_accel_closure (widget, query.signal_id);
+
+  g_object_ref (widget);
+
+  /* install the accelerator. since we don't map this onto an accel_path,
+   * the accelerator will automatically be locked.
+   */
+  gtk_accel_group_connect (accel_group,
+                          accel_key,
+                          accel_mods,
+                          accel_flags | GTK_ACCEL_LOCKED,
+                          closure);
+
+  g_signal_emit (widget, widget_signals[ACCEL_CLOSURES_CHANGED], 0);
+
+  g_object_unref (widget);
 }
 
+/**
+ * gtk_widget_remove_accelerator:
+ * @widget:       widget to install an accelerator on
+ * @accel_group:  accel group for this widget
+ * @accel_key:    GDK keyval of the accelerator
+ * @accel_mods:   modifier key combination of the accelerator
+ * @returns:      whether an accelerator was installed and could be removed
+ *
+ * Removes an accelerator from @widget, previously installed with
+ * gtk_widget_add_accelerator().
+ */
 gboolean
-gtk_widget_accelerators_locked (GtkWidget *widget)
+gtk_widget_remove_accelerator (GtkWidget      *widget,
+                              GtkAccelGroup  *accel_group,
+                              guint           accel_key,
+                              GdkModifierType accel_mods)
 {
-  g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+  GtkAccelGroupEntry *ag_entry;
+  GList *slist, *clist;
+  guint n;
   
-  return gtk_signal_handler_pending_by_func (GTK_OBJECT (widget),
-                                            widget_signals[ADD_ACCELERATOR],
-                                            TRUE,
-                                            GTK_SIGNAL_FUNC (gtk_widget_stop_add_accelerator),
-                                            NULL) > 0;
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+  g_return_val_if_fail (GTK_IS_ACCEL_GROUP (accel_group), FALSE);
+
+  ag_entry = gtk_accel_group_query (accel_group, accel_key, accel_mods, &n);
+  clist = gtk_widget_list_accel_closures (widget);
+  for (slist = clist; slist; slist = slist->next)
+    {
+      guint i;
+
+      for (i = 0; i < n; i++)
+       if (slist->data == (gpointer) ag_entry[i].closure)
+         {
+           gboolean is_removed = gtk_accel_group_disconnect (accel_group, slist->data);
+
+           g_signal_emit (widget, widget_signals[ACCEL_CLOSURES_CHANGED], 0);
+
+           g_list_free (clist);
+
+           return is_removed;
+         }
+    }
+  g_list_free (clist);
+
+  g_warning (G_STRLOC ": no accelerator (%u,%u) installed in accel group (%p) for %s (%p)",
+            accel_key, accel_mods, accel_group,
+            G_OBJECT_TYPE_NAME (widget), widget);
+
+  return FALSE;
 }
 
-void
-gtk_widget_add_accelerator (GtkWidget           *widget,
-                           const gchar         *accel_signal,
-                           GtkAccelGroup       *accel_group,
-                           guint                accel_key,
-                           guint                accel_mods,
-                           GtkAccelFlags        accel_flags)
-{
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-  g_return_if_fail (accel_group != NULL);
+/**
+ * gtk_widget_list_accel_closures
+ * @widget:  widget to list accelerator closures for
+ * @returns: a newly allocated #GList of closures
+ *
+ * Lists the closures used by @widget for accelerator group connections
+ * with gtk_accel_group_connect_by_path() or gtk_accel_group_connect().
+ * The closures can be used to monitor accelerator changes on @widget,
+ * by connecting to the ::accel_changed signal of the #GtkAccelGroup of a 
+ * closure which can be found out with gtk_accel_group_from_accel_closure().
+ */
+GList*
+gtk_widget_list_accel_closures (GtkWidget *widget)
+{
+  GSList *slist;
+  GList *clist = NULL;
+
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
 
-  gtk_accel_group_add (accel_group,
-                      accel_key,
-                      accel_mods,
-                      accel_flags,
-                      (GtkObject*) widget,
-                      accel_signal);
+  for (slist = g_object_get_qdata (G_OBJECT (widget), quark_accel_closures); slist; slist = slist->next)
+    if (gtk_accel_group_from_accel_closure (slist->data))
+      clist = g_list_prepend (clist, slist->data);
+  return clist;
 }
 
-void
-gtk_widget_remove_accelerator (GtkWidget           *widget,
-                              GtkAccelGroup       *accel_group,
-                              guint                accel_key,
-                              guint                accel_mods)
+typedef struct {
+  GQuark         path_quark;
+  GtkWidget     *widget;
+  GtkAccelGroup *accel_group;
+  GClosure      *closure;
+} AccelPath;
+
+static void
+destroy_accel_path (gpointer data)
 {
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-  g_return_if_fail (accel_group != NULL);
+  AccelPath *apath = data;
 
-  gtk_accel_group_remove (accel_group,
-                         accel_key,
-                         accel_mods,
-                         (GtkObject*) widget);
+  gtk_accel_group_disconnect (apath->accel_group, apath->closure);
+
+  /* closures_destroy takes care of unrefing the closure */
+  g_object_unref (apath->accel_group);
+  
+  g_free (apath);
 }
 
+
+/**
+ * gtk_widget_set_accel_path:
+ * @widget: a #GtkWidget
+ * @accel_path: path used to look up the the accelerator
+ * @accel_group: a #GtkAccelGroup.
+ * 
+ * Given an accelerator group, @accel_group, and an accelerator path,
+ * @accel_path, sets up an accelerator in @accel_group so whenever the
+ * key binding that is defined for @accel_path is pressed, @widget
+ * will be activated.  This removes any accelerators (for any
+ * accelerator group) installed by previous calls to
+ * gtk_widget_set_accel_path(). Associating accelerators with
+ * paths allows them to be modified by the user and the modifications
+ * to be saved for future use. (See gtk_accel_map_save().)
+ *
+ * This function is a low level function that would most likely
+ * be used by a menu creation system like #GtkItemFactory. If you
+ * use #GtkItemFactory, setting up accelerator paths will be done
+ * automatically.
+ *
+ * Even when you you aren't using #GtkItemFactory, if you only want to
+ * set up accelerators on menu items gtk_menu_item_set_accel_path()
+ * provides a somewhat more convenient interface.
+ **/
 void
-gtk_widget_remove_accelerators (GtkWidget           *widget,
-                               const gchar         *accel_signal,
-                               gboolean             visible_only)
+gtk_widget_set_accel_path (GtkWidget     *widget,
+                          const gchar   *accel_path,
+                          GtkAccelGroup *accel_group)
 {
-  GSList *slist;
-  guint signal_id;
-  
-  g_return_if_fail (widget != NULL);
+  AccelPath *apath;
+
   g_return_if_fail (GTK_IS_WIDGET (widget));
-  g_return_if_fail (accel_signal != NULL);
-  
-  signal_id = gtk_signal_lookup (accel_signal, GTK_OBJECT_TYPE (widget));
-  g_return_if_fail (signal_id != 0);
-  
-  slist = gtk_accel_group_entries_from_object (GTK_OBJECT (widget));
-  while (slist)
+  g_return_if_fail (GTK_WIDGET_GET_CLASS (widget)->activate_signal != 0);
+
+  if (accel_path)
     {
-      GtkAccelEntry *ac_entry;
-      
-      ac_entry = slist->data;
-      slist = slist->next;
-      if (ac_entry->accel_flags & GTK_ACCEL_VISIBLE &&
-         ac_entry->signal_id == signal_id)
-       gtk_widget_remove_accelerator (GTK_WIDGET (widget),
-                                      ac_entry->accel_group,
-                                      ac_entry->accelerator_key,
-                                      ac_entry->accelerator_mods);
+      g_return_if_fail (GTK_IS_ACCEL_GROUP (accel_group));
+      g_return_if_fail (_gtk_accel_path_is_valid (accel_path));
+
+      gtk_accel_map_add_entry (accel_path, 0, 0);
+      apath = g_new (AccelPath, 1);
+      apath->widget = widget;
+      apath->accel_group = g_object_ref (accel_group);
+      apath->path_quark = g_quark_from_string (accel_path);
+      apath->closure = widget_new_accel_closure (apath->widget, GTK_WIDGET_GET_CLASS (apath->widget)->activate_signal);
     }
+  else
+    apath = NULL;
+
+  /* also removes possible old settings */
+  g_object_set_qdata_full (G_OBJECT (widget), quark_accel_path, apath, destroy_accel_path);
+
+  if (apath)
+    gtk_accel_group_connect_by_path (apath->accel_group, g_quark_to_string (apath->path_quark), apath->closure);
+
+  g_signal_emit (widget, widget_signals[ACCEL_CLOSURES_CHANGED], 0);
 }
 
-guint
-gtk_widget_accelerator_signal (GtkWidget           *widget,
-                              GtkAccelGroup       *accel_group,
-                              guint                accel_key,
-                              guint                accel_mods)
+const gchar*
+_gtk_widget_get_accel_path (GtkWidget *widget)
 {
-  GtkAccelEntry *ac_entry;
-
-  g_return_val_if_fail (widget != NULL, 0);
-  g_return_val_if_fail (GTK_IS_WIDGET (widget), 0);
-  g_return_val_if_fail (accel_group != NULL, 0);
+  AccelPath *apath;
 
-  ac_entry = gtk_accel_group_get_entry (accel_group, accel_key, accel_mods);
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
 
-  if (ac_entry && ac_entry->object == (GtkObject*) widget)
-    return ac_entry->signal_id;
-  return 0;
+  apath = g_object_get_qdata (G_OBJECT (widget), quark_accel_path);
+  return apath ? g_quark_to_string (apath->path_quark) : NULL;
 }
 
 gboolean
@@ -2542,7 +2841,7 @@ gtk_widget_mnemonic_activate (GtkWidget *widget,
     handled = TRUE;
   else
     gtk_signal_emit (GTK_OBJECT (widget),
-                    widget_signals[ACTIVATE_MNEMONIC],
+                    widget_signals[MNEMONIC_ACTIVATE],
                     group_cycling,
                     &handled);
   return handled;
@@ -2569,43 +2868,20 @@ static gboolean
 gtk_widget_real_key_press_event (GtkWidget         *widget,
                                 GdkEventKey       *event)
 {
-  gboolean handled = FALSE;
-
-  g_return_val_if_fail (widget != NULL, handled);
-  g_return_val_if_fail (GTK_IS_WIDGET (widget), handled);
-  g_return_val_if_fail (event != NULL, handled);
-
-  if (!handled)
-    handled = gtk_bindings_activate (GTK_OBJECT (widget),
-                                    event->keyval,
-                                    event->state);
-
-  return handled;
+  return _gtk_bindings_activate_event (GTK_OBJECT (widget), event);
 }
 
 static gboolean
 gtk_widget_real_key_release_event (GtkWidget         *widget,
                                   GdkEventKey       *event)
 {
-  gboolean handled = FALSE;
-
-  g_return_val_if_fail (widget != NULL, handled);
-  g_return_val_if_fail (GTK_IS_WIDGET (widget), handled);
-  g_return_val_if_fail (event != NULL, handled);
-
-  if (!handled)
-    handled = gtk_bindings_activate (GTK_OBJECT (widget),
-                                    event->keyval,
-                                    event->state | GDK_RELEASE_MASK);
-
-  return handled;
+  return _gtk_bindings_activate_event (GTK_OBJECT (widget), event);
 }
 
 static gboolean
 gtk_widget_real_focus_in_event (GtkWidget     *widget,
                                 GdkEventFocus *event)
 {
-  GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
   gtk_widget_queue_draw (widget);
 
   return FALSE;
@@ -2615,12 +2891,14 @@ static gboolean
 gtk_widget_real_focus_out_event (GtkWidget     *widget,
                                  GdkEventFocus *event)
 {
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
   gtk_widget_queue_draw (widget);
 
   return FALSE;
 }
 
+#define WIDGET_REALIZED_FOR_EVENT(widget, event) \
+     (event->type == GDK_FOCUS_CHANGE || GTK_WIDGET_REALIZED(widget))
+
 /**
  * gtk_widget_event:
  * @widget: a #GtkWidget
@@ -2642,7 +2920,7 @@ gtk_widget_event (GtkWidget *widget,
                  GdkEvent  *event)
 {
   g_return_val_if_fail (GTK_IS_WIDGET (widget), TRUE);
-  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), TRUE);
+  g_return_val_if_fail (WIDGET_REALIZED_FOR_EVENT (widget, event), TRUE);
 
   if (event->type == GDK_EXPOSE)
     {
@@ -2664,13 +2942,13 @@ gtk_widget_event (GtkWidget *widget,
  * Very rarely-used function. This function is used to emit
  * an expose event signals on a widget. This function is not
  * normally used directly. The only time it is used is when
- * propagating an expose event to a child NO_WINDOW widget, and
- * that is normally done using gtk_container_propagate_expose.
+ * propagating an expose event to a child %NO_WINDOW widget, and
+ * that is normally done using gtk_container_propagate_expose().
  *
  * If you want to force an area of a window to be redrawn, 
  * use gdk_window_invalidate_rect() or gdk_window_invalidate_region().
  * To cause the redraw to be done immediately, follow that call
- * with a call to gdk_window_procss_updates().
+ * with a call to gdk_window_process_updates().
  * 
  * Return value: return from the event signal emission (%TRUE if the event was handled)
  **/
@@ -2698,7 +2976,7 @@ gtk_widget_event_internal (GtkWidget *widget,
   gtk_widget_ref (widget);
 
   gtk_signal_emit (GTK_OBJECT (widget), widget_signals[EVENT], event, &return_val);
-  return_val |= !GTK_WIDGET_REALIZED (widget);
+  return_val |= !WIDGET_REALIZED_FOR_EVENT (widget, event);
   if (!return_val)
     {
       gint signal_num;
@@ -2793,7 +3071,7 @@ gtk_widget_event_internal (GtkWidget *widget,
       if (signal_num != -1)
        gtk_signal_emit (GTK_OBJECT (widget), widget_signals[signal_num], event, &return_val);
     }
-  if (GTK_WIDGET_REALIZED (widget))
+  if (WIDGET_REALIZED_FOR_EVENT (widget, event))
     gtk_signal_emit (GTK_OBJECT (widget), widget_signals[EVENT_AFTER], event);
   else
     return_val = TRUE;
@@ -2818,7 +3096,6 @@ gtk_widget_event_internal (GtkWidget *widget,
 gboolean
 gtk_widget_activate (GtkWidget *widget)
 {
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
   
   if (WIDGET_CLASS (widget)->activate_signal)
@@ -2851,7 +3128,6 @@ gtk_widget_set_scroll_adjustments (GtkWidget     *widget,
                                   GtkAdjustment *hadjustment,
                                   GtkAdjustment *vadjustment)
 {
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
   if (hadjustment)
     g_return_val_if_fail (GTK_IS_ADJUSTMENT (hadjustment), FALSE);
@@ -2883,8 +3159,6 @@ static void
 gtk_widget_reparent_container_child (GtkWidget *widget,
                                     gpointer   client_data)
 {
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (client_data != NULL);
   
   if (GTK_WIDGET_NO_WINDOW (widget))
@@ -2918,9 +3192,7 @@ void
 gtk_widget_reparent (GtkWidget *widget,
                     GtkWidget *new_parent)
 {
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
-  g_return_if_fail (new_parent != NULL);
   g_return_if_fail (GTK_IS_CONTAINER (new_parent));
   g_return_if_fail (widget->parent != NULL);
   
@@ -2945,6 +3217,8 @@ gtk_widget_reparent (GtkWidget *widget,
          gtk_widget_reparent_container_child (widget,
                                               gtk_widget_get_parent_window (widget));
        }
+
+      g_object_notify (G_OBJECT (widget), "parent");
     }
 }
 
@@ -2970,7 +3244,6 @@ gtk_widget_intersect (GtkWidget      *widget,
   GdkRectangle tmp;
   gint return_val;
   
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
   g_return_val_if_fail (area != NULL, FALSE);
   
@@ -2994,17 +3267,17 @@ gtk_widget_intersect (GtkWidget    *widget,
  * gtk_widget_region_intersect:
  * @widget: a #GtkWidget
  * @region: a #GdkRegion, in the same coordinate system as 
- *          widget->allocation. That is, relative to widget->window
- *          for NO_WINDOW widgets; relative to the parent window
- *          of widget->window for widgets with their own window.
+ *          @widget->allocation. That is, relative to @widget->window
+ *          for %NO_WINDOW widgets; relative to the parent window
+ *          of @widget->window for widgets with their own window.
  * @returns: A newly allocated region holding the intersection of @widget
  *           and @region. The coordinates of the return value are
- *           relative to widget->window for NO_WINDOW widgets, and
- *           relative to the parent window of widget->window for
+ *           relative to @widget->window for %NO_WINDOW widgets, and
+ *           relative to the parent window of @widget->window for
  *           widgets with their own window.
  * 
  * Computes the intersection of a @widget's area and @region, returning
- * the intersection. The result may be empty, use #gdk_region_empty to
+ * the intersection. The result may be empty, use gdk_region_empty() to
  * check.
  **/
 GdkRegion *
@@ -3013,7 +3286,6 @@ gtk_widget_region_intersect (GtkWidget *widget,
 {
   GdkRegion *dest;
   
-  g_return_val_if_fail (widget != NULL, NULL);
   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
   g_return_val_if_fail (region != NULL, NULL);
   
@@ -3031,15 +3303,17 @@ gtk_widget_region_intersect (GtkWidget *widget,
  * Causes @widget to have the keyboard focus for the #GtkWindow it's
  * inside. @widget must be a focusable widget, such as a #GtkEntry;
  * something like #GtkFrame won't work. (More precisely, it must have the
- * #GTK_CAN_FOCUS flag set.)
+ * %GTK_CAN_FOCUS flag set.)
  * 
  **/
 void
 gtk_widget_grab_focus (GtkWidget *widget)
 {
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (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_notify (G_OBJECT (widget), "has_focus");
@@ -3066,9 +3340,6 @@ reset_focus_recurse (GtkWidget *widget,
 static void
 gtk_widget_real_grab_focus (GtkWidget *focus_widget)
 {
-  g_return_if_fail (focus_widget != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (focus_widget));
-  
   if (GTK_WIDGET_CAN_FOCUS (focus_widget))
     {
       GtkWidget *toplevel;
@@ -3079,18 +3350,18 @@ gtk_widget_real_grab_focus (GtkWidget *focus_widget)
        * be set by the next loop.
        */
       toplevel = gtk_widget_get_toplevel (focus_widget);
-      if (GTK_IS_WINDOW (toplevel))
+      if (GTK_WIDGET_TOPLEVEL (toplevel))
        {
          widget = GTK_WINDOW (toplevel)->focus_widget;
          
          if (widget == focus_widget)
            {
-             /* We call gtk_window_set_focus() here so that the
+             /* We call _gtk_window_internal_set_focus() here so that the
               * toplevel window can request the focus if necessary.
               * This is needed when the toplevel is a GtkPlug
               */
              if (!GTK_WIDGET_HAS_FOCUS (widget))
-               gtk_window_set_focus (GTK_WINDOW (toplevel), focus_widget);
+               _gtk_window_internal_set_focus (GTK_WINDOW (toplevel), focus_widget);
 
              return;
            }
@@ -3125,16 +3396,21 @@ gtk_widget_real_grab_focus (GtkWidget *focus_widget)
          widget = widget->parent;
        }
       if (GTK_IS_WINDOW (widget))
-       gtk_window_set_focus (GTK_WINDOW (widget), focus_widget);
+       _gtk_window_internal_set_focus (GTK_WINDOW (widget), focus_widget);
     }
 }
 
-static void
+static gboolean
 gtk_widget_real_show_help (GtkWidget        *widget,
                            GtkWidgetHelpType help_type)
 {
   if (help_type == GTK_WIDGET_HELP_TOOLTIP)
-    _gtk_tooltips_show_tip (widget);
+    {
+      _gtk_tooltips_toggle_keyboard_mode (widget);
+      return TRUE;
+    }
+  else
+    return FALSE;
 }
 
 static gboolean
@@ -3144,7 +3420,7 @@ gtk_widget_real_focus (GtkWidget         *widget,
   if (!GTK_WIDGET_CAN_FOCUS (widget))
     return FALSE;
   
-  if (!GTK_WIDGET_HAS_FOCUS (widget))
+  if (!gtk_widget_is_focus (widget))
     {
       gtk_widget_grab_focus (widget);
       return TRUE;
@@ -3158,8 +3434,8 @@ gtk_widget_real_focus (GtkWidget         *widget,
  * @widget: a #GtkWidget
  * 
  * Determines if the widget is the focus widget within its
- * toplevel. (This does not mean that the HAS_FOCUS flag is
- * necessarily set; HAS_FOCUS will only be set if the
+ * toplevel. (This does not mean that the %HAS_FOCUS flag is
+ * necessarily set; %HAS_FOCUS will only be set if the
  * toplevel widget additionally has the global input focus.)
  * 
  * Return value: %TRUE if the widget is the focus widget.
@@ -3184,9 +3460,9 @@ gtk_widget_is_focus (GtkWidget *widget)
  * @widget: a #GtkWidget
  *
  * Causes @widget to become the default widget. @widget must have the
- * #GTK_CAN_DEFAULT flag set; typically you have to set this flag
- * yourself by calling GTK_WIDGET_SET_FLAGS (@widget,
- * GTK_CAN_DEFAULT).  The default widget is activated when the user
+ * %GTK_CAN_DEFAULT flag set; typically you have to set this flag
+ * yourself by calling <literal>GTK_WIDGET_SET_FLAGS (@widget,
+ * GTK_CAN_DEFAULT)</literal>.  The default widget is activated when the user
  * presses Enter in a window.  Default widgets must be activatable,
  * that is, gtk_widget_activate() should affect them.
  * 
@@ -3195,22 +3471,16 @@ void
 gtk_widget_grab_default (GtkWidget *widget)
 {
   GtkWidget *window;
-  GtkType window_type;
   
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (GTK_WIDGET_CAN_DEFAULT (widget));
   
-  window_type = GTK_TYPE_WINDOW;
-  window = widget->parent;
+  window = gtk_widget_get_toplevel (widget);
   
-  while (window && !gtk_type_is_a (GTK_WIDGET_TYPE (window), window_type))
-    window = window->parent;
-  
-  if (window && gtk_type_is_a (GTK_WIDGET_TYPE (window), window_type))
+  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);
+       g_object_notify (G_OBJECT (widget), "has_default");
     }
   else
     g_warning (G_STRLOC ": widget not within a GtkWindow");
@@ -3231,7 +3501,6 @@ void
 gtk_widget_set_name (GtkWidget  *widget,
                     const gchar *name)
 {
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
   
   if (widget->name)
@@ -3239,7 +3508,7 @@ gtk_widget_set_name (GtkWidget     *widget,
   widget->name = g_strdup (name);
 
   if (GTK_WIDGET_RC_STYLE (widget))
-    gtk_widget_set_rc_style (widget);
+    gtk_widget_reset_rc_style (widget);
 
   g_object_notify (G_OBJECT (widget), "name");
 }
@@ -3257,7 +3526,6 @@ gtk_widget_set_name (GtkWidget     *widget,
 G_CONST_RETURN gchar*
 gtk_widget_get_name (GtkWidget *widget)
 {
-  g_return_val_if_fail (widget != NULL, NULL);
   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
   
   if (widget->name)
@@ -3279,7 +3547,6 @@ void
 gtk_widget_set_state (GtkWidget           *widget,
                      GtkStateType         state)
 {
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
   if (state == GTK_WIDGET_STATE (widget))
@@ -3310,7 +3577,6 @@ void
 gtk_widget_set_app_paintable (GtkWidget *widget,
                              gboolean   app_paintable)
 {
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
   app_paintable = (app_paintable != FALSE);
@@ -3353,7 +3619,6 @@ void
 gtk_widget_set_double_buffered (GtkWidget *widget,
                                gboolean   double_buffered)
 {
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
   if (double_buffered)
@@ -3362,15 +3627,49 @@ gtk_widget_set_double_buffered (GtkWidget *widget,
     GTK_WIDGET_UNSET_FLAGS (widget, GTK_DOUBLE_BUFFERED);
 }
 
+/**
+ * gtk_widget_set_redraw_on_allocate:
+ * @widget: a #GtkWidget
+ * @redraw_on_allocate: if %TRUE, the entire widget will be redrawn
+ *   when it is allocated to a new size. Otherwise, only the
+ *   new portion of the widget will be redrawn.
+ *
+ * Sets whether a when a widgets size allocation changes, the entire
+ * widget is queued for drawing. By default, this setting is %TRUE and
+ * the entire widget is redrawn on every size change. If your widget
+ * leaves the upper left are unchanged when made bigger, turning this
+ * setting on will improve performance.
+
+ * Note that for %NO_WINDOW widgets setting this flag to %FALSE turns
+ * off all allocation on resizing: the widget will not even redraw if
+ * its position changes; this is to allow containers that don't draw
+ * anything to avoid excess invalidations. If you set this flag on a
+ * %NO_WINDOW widget that <emphasis>does</emphasis> draw on @widget->window, 
+ * you are responsible for invalidating both the old and new allocation 
+ * of the widget when the widget is moved and responsible for invalidating
+ * regions newly when the widget increases size.
+ **/
+void
+gtk_widget_set_redraw_on_allocate (GtkWidget *widget,
+                                  gboolean   redraw_on_allocate)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  if (redraw_on_allocate)
+    GTK_PRIVATE_SET_FLAG (widget, GTK_REDRAW_ON_ALLOC);
+  else
+    GTK_PRIVATE_UNSET_FLAG (widget, GTK_REDRAW_ON_ALLOC);
+}
+
 /**
  * gtk_widget_set_sensitive:
- * @widget: a @widget
+ * @widget: a #GtkWidget
  * @sensitive: %TRUE to make the widget sensitive
  *
  * Sets the sensitivity of a widget. A widget is sensitive if the user
  * can interact with it. Insensitive widgets are "grayed out" and the
  * user can't interact with them. Insensitive widgets are known as
- * "inactive" in some other toolkits.
+ * "inactive", "disabled", or "ghosted" in some other toolkits.
  * 
  **/
 void
@@ -3379,7 +3678,6 @@ gtk_widget_set_sensitive (GtkWidget *widget,
 {
   GtkStateData data;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
   sensitive = (sensitive != FALSE);
@@ -3430,11 +3728,9 @@ gtk_widget_set_parent (GtkWidget *widget,
 {
   GtkStateData data;
   
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (widget->parent == NULL);
   g_return_if_fail (!GTK_WIDGET_TOPLEVEL (widget));
-  g_return_if_fail (parent != NULL);
   g_return_if_fail (GTK_IS_WIDGET (parent));
   g_return_if_fail (widget != parent);
 
@@ -3455,11 +3751,27 @@ gtk_widget_set_parent (GtkWidget *widget,
 
   gtk_widget_propagate_state (widget, &data);
   
-  gtk_widget_set_style_recurse (widget, NULL);
+  gtk_widget_reset_rc_styles (widget);
 
   gtk_signal_emit (GTK_OBJECT (widget), widget_signals[PARENT_SET], NULL);
-  gtk_widget_propagate_hierarchy_changed (widget, NULL);
+  if (GTK_WIDGET_ANCHORED (widget->parent))
+    _gtk_widget_propagate_hierarchy_changed (widget, NULL);
   g_object_notify (G_OBJECT (widget), "parent");
+
+  /* Enforce realized/mapped invariants
+   */
+  if (GTK_WIDGET_REALIZED (widget->parent))
+    gtk_widget_realize (widget);
+
+  if (GTK_WIDGET_VISIBLE (widget->parent) &&
+      GTK_WIDGET_VISIBLE (widget))
+    {
+      if (GTK_WIDGET_CHILD_VISIBLE (widget) &&
+         GTK_WIDGET_MAPPED (widget->parent))
+       gtk_widget_map (widget);
+
+      gtk_widget_queue_resize (widget);
+    }
 }
 
 /**
@@ -3486,9 +3798,10 @@ gtk_widget_get_parent (GtkWidget *widget)
 /**
  * gtk_widget_set_style:
  * @widget: a #GtkWidget
- * @style: a #GtkStyle
+ * @style: a #GtkStyle, or %NULL to remove the effect of a previous
+ *         gtk_widget_set_style() and go back to the default style
  *
- * Sets the #GtkStyle for a widget (widget->style). You probably don't
+ * Sets the #GtkStyle for a widget (@widget->style). You probably don't
  * want to use this function; it interacts badly with themes, because
  * themes work by replacing the #GtkStyle. Instead, use
  * gtk_widget_modify_style().
@@ -3498,33 +3811,31 @@ void
 gtk_widget_set_style (GtkWidget *widget,
                      GtkStyle  *style)
 {
-  GtkStyle *default_style;
-  gboolean initial_emission;
-
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
-  g_return_if_fail (style != NULL);
-
-  initial_emission = !GTK_WIDGET_RC_STYLE (widget) && !GTK_WIDGET_USER_STYLE (widget);
 
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_RC_STYLE);
-  GTK_PRIVATE_SET_FLAG (widget, GTK_USER_STYLE);
+  if (style)
+    {
+      gboolean initial_emission;
 
-  default_style = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_saved_default_style);
-  if (!default_style)
+      initial_emission = !GTK_WIDGET_RC_STYLE (widget) && !GTK_WIDGET_USER_STYLE (widget);
+      
+      GTK_WIDGET_UNSET_FLAGS (widget, GTK_RC_STYLE);
+      GTK_PRIVATE_SET_FLAG (widget, GTK_USER_STYLE);
+      
+      gtk_widget_set_style_internal (widget, style, initial_emission);
+    }
+  else
     {
-      gtk_style_ref (widget->style);
-      gtk_object_set_data_by_id (GTK_OBJECT (widget), quark_saved_default_style, widget->style);
+      if (GTK_WIDGET_USER_STYLE (widget))
+       gtk_widget_reset_rc_style (widget);
     }
-
-  gtk_widget_set_style_internal (widget, style, initial_emission);
 }
 
 /**
  * gtk_widget_ensure_style:
  * @widget: a #GtkWidget
  *
- * Ensures that @widget has a style (widget->style). Not a very useful
+ * Ensures that @widget has a style (@widget->style). Not a very useful
  * function; most of the time, if you want the style, the widget is
  * realized, and realized widgets are guaranteed to have a style
  * already.
@@ -3533,28 +3844,22 @@ gtk_widget_set_style (GtkWidget *widget,
 void
 gtk_widget_ensure_style (GtkWidget *widget)
 {
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
   if (!GTK_WIDGET_USER_STYLE (widget) &&
       !GTK_WIDGET_RC_STYLE (widget))
-    gtk_widget_set_rc_style (widget);
+    gtk_widget_reset_rc_style (widget);
 }
 
-/**
- * gtk_widget_set_rc_style:
- * @widget: a #GtkWidget
- * 
- * 
+/* Look up the RC style for this widget, unsetting any user style that
+ * may be in effect currently
  **/
-void
-gtk_widget_set_rc_style (GtkWidget *widget)
+static void
+gtk_widget_reset_rc_style (GtkWidget *widget)
 {
-  GtkStyle *saved_style;
   GtkStyle *new_style;
   gboolean initial_emission;
   
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
   initial_emission = !GTK_WIDGET_RC_STYLE (widget) && !GTK_WIDGET_USER_STYLE (widget);
@@ -3562,66 +3867,25 @@ gtk_widget_set_rc_style (GtkWidget *widget)
   GTK_PRIVATE_UNSET_FLAG (widget, GTK_USER_STYLE);
   GTK_WIDGET_SET_FLAGS (widget, GTK_RC_STYLE);
 
-  saved_style = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_saved_default_style);
   new_style = gtk_rc_get_style (widget);
-  if (new_style)
-    {
-      if (!saved_style)
-       {
-         gtk_style_ref (widget->style);
-         gtk_object_set_data_by_id (GTK_OBJECT (widget), quark_saved_default_style, widget->style);
-       }
-      gtk_widget_set_style_internal (widget, new_style, initial_emission);
-    }
-  else
-    {
-      if (saved_style)
-       {
-         g_assert (initial_emission == FALSE); /* FIXME: remove this line */
+  if (!new_style)
+    new_style = gtk_widget_get_default_style ();
 
-         gtk_object_remove_data_by_id (GTK_OBJECT (widget), quark_saved_default_style);
-         gtk_widget_set_style_internal (widget, saved_style, initial_emission);
-         gtk_style_unref (saved_style);
-       }
-      else
-       {
-         if (initial_emission)
-           gtk_widget_set_style_internal (widget, widget->style, TRUE);
-       }
-    }
-}
-
-void
-gtk_widget_restore_default_style (GtkWidget *widget)
-{
-  GtkStyle *default_style;
-
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-
-  GTK_PRIVATE_UNSET_FLAG (widget, GTK_USER_STYLE);
-
-  default_style = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_saved_default_style);
-  if (default_style)
-    {
-      gtk_object_remove_data_by_id (GTK_OBJECT (widget), quark_saved_default_style);
-      gtk_widget_set_style_internal (widget, default_style, FALSE);
-      gtk_style_unref (default_style);
-    }
+  if (initial_emission || new_style != widget->style)
+    gtk_widget_set_style_internal (widget, new_style, initial_emission);
 }
 
 /**
  * gtk_widget_get_style:
  * @widget: a #GtkWidget
  * 
- * Simply an accessor function that returns widget->style.
+ * Simply an accessor function that returns @widget->style.
  * 
  * Return value: the widget's #GtkStyle
  **/
 GtkStyle*
 gtk_widget_get_style (GtkWidget *widget)
 {
-  g_return_val_if_fail (widget != NULL, NULL);
   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
   
   return widget->style;
@@ -3632,8 +3896,8 @@ gtk_widget_get_style (GtkWidget *widget)
  * @widget: a #GtkWidget
  * @style: the #GtkRcStyle holding the style modifications
  * 
- * Modify style values on the widget. Modifications made using this
- * technique take precendence over style values set via an RC file,
+ * Modifies style values on the widget. Modifications made using this
+ * technique take precedence over style values set via an RC file,
  * however, they will be overriden if a style is explicitely set on
  * the widget using gtk_widget_set_style(). The #GtkRcStyle structure
  * is designed so each field can either be set or unset, so it is
@@ -3647,8 +3911,8 @@ gtk_widget_get_style (GtkWidget *widget)
  * make your modifications to the returned style, then call
  * gtk_widget_modify_style() with that style. On the other hand,
  * if you first call gtk_widget_modify_style(), subsequent calls
- * to such functions gtk_widget_modify_fg() will be have a cumulative
- * effect with the inital modifications.
+ * to such functions gtk_widget_modify_fg() will have a cumulative
+ * effect with the initial modifications.
  **/
 void       
 gtk_widget_modify_style (GtkWidget      *widget,
@@ -3656,6 +3920,7 @@ gtk_widget_modify_style (GtkWidget      *widget,
 {
   GtkRcStyle *old_style;
 
+  g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (GTK_IS_RC_STYLE (style));
   
   old_style = gtk_object_get_data_by_id (GTK_OBJECT (widget),
@@ -3671,14 +3936,14 @@ gtk_widget_modify_style (GtkWidget      *widget,
    */
   
   if (GTK_WIDGET_RC_STYLE (widget))
-    gtk_widget_set_rc_style (widget);
+    gtk_widget_reset_rc_style (widget);
 }
 
 /**
  * gtk_widget_get_modifier_style:
  * @widget: a #GtkWidget
  * 
- * Return the current modifier style for the widget. (As set by
+ * Returns the current modifier style for the widget. (As set by
  * gtk_widget_modify_style().) If no style has previously set, a new
  * #GtkRcStyle will be created with all values unset, and set as the
  * modifier style for the widget. If you make changes to this rc
@@ -3700,12 +3965,14 @@ gtk_widget_get_modifier_style (GtkWidget      *widget)
 {
   GtkRcStyle *rc_style;
   
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+
   rc_style = gtk_object_get_data_by_id (GTK_OBJECT (widget),
                                        quark_rc_style);
 
   if (!rc_style)
     {
-      rc_style = gtk_rc_style_new();
+      rc_style = gtk_rc_style_new ();
       gtk_object_set_data_by_id_full (GTK_OBJECT (widget),
                                      quark_rc_style,
                                      rc_style,
@@ -3748,11 +4015,11 @@ gtk_widget_modify_color_component (GtkWidget     *widget,
 
 /**
  * gtk_widget_modify_fg:
- * @widget: a #GtkWidget
+ * @widget: a #GtkWidget.
  * @state: the state for which to set the foreground color.
- * @color: the color to assign (does not need to be allocated)
+ * @color: the color to assign (does not need to be allocated).
  * 
- * Set the foreground color for a widget in a particular state.  All
+ * Sets the foreground color for a widget in a particular state.  All
  * other style values are left untouched. See also
  * gtk_widget_modify_style().
  **/
@@ -3770,11 +4037,11 @@ gtk_widget_modify_fg (GtkWidget   *widget,
 
 /**
  * gtk_widget_modify_bg:
- * @widget: a #GtkWidget
- * @state: the state for which to set the foreground color.
- * @color: the color to assign (does not need to be allocated)
+ * @widget: a #GtkWidget.
+ * @state: the state for which to set the background color.
+ * @color: the color to assign (does not need to be allocated).
  * 
- * Set the background color for a widget in a particular state.  All
+ * Sets the background color for a widget in a particular state.  All
  * other style values are left untouched. See also
  * gtk_widget_modify_style().
  **/
@@ -3791,14 +4058,14 @@ gtk_widget_modify_bg (GtkWidget   *widget,
 }
 
 /**
- * gtk_widget_modify_base:
- * @widget: a #GtkWidget
- * @state: the state for which to set the foreground color.
- * @color: the color to assign (does not need to be allocated)
+ * 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).
  * 
- * Set the text color for a widget in a particular state.  All other
+ * Sets the text color for a widget in a particular state.  All other
  * style values are left untouched. The text color is the foreground
- * color used along with the base color (see gtk_widget_modify_base)
+ * color used along with the base color (see gtk_widget_modify_base())
  * for widgets such as #GtkEntry and #GtkTextView. See also
  * gtk_widget_modify_style().
  **/
@@ -3816,14 +4083,14 @@ gtk_widget_modify_text (GtkWidget   *widget,
 
 /**
  * gtk_widget_modify_base:
- * @widget: a #GtkWidget
- * @state: the state for which to set the foreground color.
- * @color: the color to assign (does not need to be allocated)
+ * @widget: a #GtkWidget.
+ * @state: the state for which to set the base color.
+ * @color: the color to assign (does not need to be allocated).
  * 
- * Set the text color for a widget in a particular state.
+ * Sets the base color for a widget in a particular state.
  * All other style values are left untouched. The base color
  * is the background color used along with the text color
- * (see gtk_widget_modify_text) for widgets such as #GtkEntry
+ * (see gtk_widget_modify_text()) for widgets such as #GtkEntry
  * and #GtkTextView. See also gtk_widget_modify_style().
  **/
 void
@@ -3843,7 +4110,7 @@ gtk_widget_modify_base (GtkWidget  *widget,
  * @widget: a #GtkWidget
  * @font_desc: the font description to use
  * 
- * Set the font to use for a widget.  All other style values are left
+ * Sets the font to use for a widget.  All other style values are left
  * untouched. See also gtk_widget_modify_style().
  **/
 void
@@ -3886,10 +4153,6 @@ gtk_widget_set_style_internal (GtkWidget *widget,
                               GtkStyle  *style,
                               gboolean   initial_emission)
 {
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-  g_return_if_fail (style != NULL);
-
   g_object_ref (G_OBJECT (widget));
   g_object_freeze_notify (G_OBJECT (widget));
 
@@ -3912,7 +4175,7 @@ gtk_widget_set_style_internal (GtkWidget *widget,
       
       previous_style = widget->style;
       widget->style = style;
-      gtk_style_ref (widget->style);
+      g_object_ref (widget->style);
       
       if (GTK_WIDGET_REALIZED (widget))
        widget->style = gtk_style_attach (widget->style, widget->window);
@@ -3920,21 +4183,10 @@ gtk_widget_set_style_internal (GtkWidget *widget,
       gtk_signal_emit (GTK_OBJECT (widget),
                       widget_signals[STYLE_SET],
                       initial_emission ? NULL : previous_style);
-      gtk_style_unref (previous_style);
+      g_object_unref (previous_style);
 
       if (widget->parent && !initial_emission)
-       {
-         GtkRequisition old_requisition;
-         
-         old_requisition = widget->requisition;
-         gtk_widget_size_request (widget, NULL);
-         
-         if ((old_requisition.width != widget->requisition.width) ||
-             (old_requisition.height != widget->requisition.height))
-           gtk_widget_queue_resize (widget);
-         else if (GTK_WIDGET_DRAWABLE (widget))
-           gtk_widget_queue_clear (widget);
-       }
+       gtk_widget_queue_resize (widget);
     }
   else if (initial_emission)
     gtk_signal_emit (GTK_OBJECT (widget),
@@ -3946,25 +4198,13 @@ gtk_widget_set_style_internal (GtkWidget *widget,
 }
 
 static void
-gtk_widget_set_style_recurse (GtkWidget *widget,
-                             gpointer   client_data)
-{
-  if (GTK_WIDGET_RC_STYLE (widget))
-    gtk_widget_set_rc_style (widget);
-  
-  if (GTK_IS_CONTAINER (widget))
-    gtk_container_forall (GTK_CONTAINER (widget),
-                         gtk_widget_set_style_recurse,
-                         NULL);
-}
-
-static void
-gtk_widget_propagate_hierarchy_changed (GtkWidget      *widget,
-                                       gpointer         client_data)
+gtk_widget_propagate_hierarchy_changed_recurse (GtkWidget *widget,
+                                               gpointer   client_data)
 {
   gboolean new_anchored;
 
-  new_anchored = widget->parent && GTK_WIDGET_ANCHORED (widget->parent);
+  new_anchored = GTK_WIDGET_TOPLEVEL (widget) ||
+                 (widget->parent && GTK_WIDGET_ANCHORED (widget->parent));
 
   if (GTK_WIDGET_ANCHORED (widget) != new_anchored)
     {
@@ -3975,83 +4215,80 @@ gtk_widget_propagate_hierarchy_changed (GtkWidget       *widget,
       else
        GTK_PRIVATE_UNSET_FLAG (widget, GTK_ANCHORED);
       
-      g_signal_emit (GTK_OBJECT (widget), widget_signals[HIERARCHY_CHANGED], 0);
+      g_signal_emit (GTK_OBJECT (widget), widget_signals[HIERARCHY_CHANGED],
+                    0, client_data);
+  
+      if (GTK_IS_CONTAINER (widget))
+       gtk_container_forall (GTK_CONTAINER (widget),
+                             gtk_widget_propagate_hierarchy_changed_recurse,
+                             client_data);
+      
+      gtk_widget_unref (widget);
+    }
+}
+
+/**
+ * _gtk_widget_propagate_hierarchy_changed:
+ * @widget: a #GtkWidget
+ * @previous_toplevel: Previous toplevel
+ * 
+ * Propagates changes in the anchored state to a widget and all
+ * children, unsetting or setting the %ANCHORED flag, and
+ * emitting ::hierarchy_changed.
+ **/
+void
+_gtk_widget_propagate_hierarchy_changed (GtkWidget    *widget,
+                                        GtkWidget    *previous_toplevel)
+{
+  if (previous_toplevel)
+    g_object_ref (previous_toplevel);
+
+  gtk_widget_propagate_hierarchy_changed_recurse (widget, previous_toplevel);
   
-      if (GTK_IS_CONTAINER (widget))
-       gtk_container_forall (GTK_CONTAINER (widget),
-                             gtk_widget_propagate_hierarchy_changed,
-                             NULL);
-      
-      gtk_widget_unref (widget);
-    }
+  if (previous_toplevel)
+    g_object_unref (previous_toplevel);
 }
 
-void
-gtk_widget_reset_rc_styles (GtkWidget *widget)
+static void
+reset_rc_styles_recurse (GtkWidget *widget, gpointer data)
 {
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-
-  gtk_widget_set_style_recurse (widget, NULL);
+  if (GTK_WIDGET_RC_STYLE (widget))
+    gtk_widget_reset_rc_style (widget);
+  
+  if (GTK_IS_CONTAINER (widget))
+    gtk_container_forall (GTK_CONTAINER (widget),
+                         reset_rc_styles_recurse,
+                         NULL);
 }
 
 void
-gtk_widget_set_default_style (GtkStyle *style)
+gtk_widget_reset_rc_styles (GtkWidget *widget)
 {
-  if (style != gtk_default_style)
-     {
-       if (gtk_default_style)
-        gtk_style_unref (gtk_default_style);
-       gtk_default_style = style;
-       if (gtk_default_style)
-        gtk_style_ref (gtk_default_style);
-     }
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+
+  reset_rc_styles_recurse (widget, NULL);
 }
 
+/**
+ * gtk_widget_get_default_style:
+ * 
+ * Returns the default style used by all widgets initially.
+ * 
+ * Returns: the default style. This #GtkStyle object is owned by GTK+ and
+ * should not be modified or freed.
+ */ 
 GtkStyle*
 gtk_widget_get_default_style (void)
 {
   if (!gtk_default_style)
     {
       gtk_default_style = gtk_style_new ();
-      gtk_style_ref (gtk_default_style);
+      g_object_ref (gtk_default_style);
     }
   
   return gtk_default_style;
 }
 
-void
-gtk_widget_push_style (GtkStyle *style)
-{
-  g_return_if_fail (style != NULL);
-
-  gtk_style_ref (style);
-  style_stack = g_slist_prepend (style_stack, style);
-}
-
-static GtkStyle*
-gtk_widget_peek_style (void)
-{
-  if (style_stack)
-    return (GtkStyle*) style_stack->data;
-  else
-    return gtk_widget_get_default_style ();
-}
-
-void
-gtk_widget_pop_style (void)
-{
-  GSList *tmp;
-  
-  if (style_stack)
-    {
-      tmp = style_stack;
-      style_stack = style_stack->next;
-      gtk_style_unref ((GtkStyle*) tmp->data);
-      g_slist_free_1 (tmp);
-    }
-}
-
 static PangoContext *
 gtk_widget_peek_pango_context (GtkWidget *widget)
 {
@@ -4062,7 +4299,7 @@ gtk_widget_peek_pango_context (GtkWidget *widget)
  * gtk_widget_get_pango_context:
  * @widget: a #GtkWidget
  * 
- * Get a #PangoContext with the appropriate colormap, font description
+ * Gets a #PangoContext with the appropriate colormap, font description
  * and base direction for this widget. Unlike the context returned
  * by gtk_widget_create_pango_context(), this context is owned by
  * the widget (it can be used as long as widget exists), and will
@@ -4095,11 +4332,11 @@ gtk_widget_get_pango_context (GtkWidget *widget)
 
 /**
  * gtk_widget_create_pango_context:
- * @widget: a #PangoWidget
+ * @widget: a #GtkWidget
  * 
- * Create a new pango context with the appropriate colormap,
+ * Creates a new #PangoContext with the appropriate colormap,
  * font description, and base direction for drawing text for
- * this widget. See also gtk_widget_get_pango_context()
+ * this widget. See also gtk_widget_get_pango_context().
  * 
  * Return value: the new #PangoContext
  **/
@@ -4124,10 +4361,10 @@ gtk_widget_create_pango_context (GtkWidget *widget)
 
 /**
  * gtk_widget_create_pango_layout:
- * @widget: a #PangoWidget
+ * @widget: a #GtkWidget
  * @text:   text to set on the layout (can be %NULL)
  * 
- * Create a new #PangoLayout with the appropriate colormap,
+ * Creates a new #PangoLayout with the appropriate colormap,
  * font description, and base direction for drawing text for
  * this widget.
  *
@@ -4204,24 +4441,19 @@ gtk_widget_render_icon (GtkWidget      *widget,
   return retval;
 }
 
-/*************************************************************
+/**
  * gtk_widget_set_parent_window:
- *     Set a non default parent window for widget
- *
- *   arguments:
- *     widget:
- *     parent_window 
- *     
- *   results:
- *************************************************************/
-
+ * @widget: a #GtkWidget.
+ * @parent_window: the new parent window.
+ *  
+ * Sets a non default parent window for @widget.
+ **/
 void
 gtk_widget_set_parent_window   (GtkWidget           *widget,
                                GdkWindow           *parent_window)
 {
   GdkWindow *old_parent_window;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
   
   old_parent_window = gtk_object_get_data_by_id (GTK_OBJECT (widget),
@@ -4238,23 +4470,85 @@ gtk_widget_set_parent_window   (GtkWidget           *widget,
     }
 }
 
-/*************************************************************
- * gtk_widget_get_parent_window:
- *     Get widget's parent window
+
+/**
+ * gtk_widget_set_child_visible:
+ * @widget: a #GtkWidget
+ * @is_visible: if %TRUE, @widget should be mapped along with its parent.
  *
- *   arguments:
- *     widget:
- *     
- *   results:
- *     parent window
- *************************************************************/
+ * Sets whether @widget should be mapped along with its when its parent
+ * is mapped and @widget has been shown with gtk_widget_show(). 
+ *
+ * The child visibility can be set for widget before it is added to
+ * a container with gtk_widget_set_parent(), to avoid mapping
+ * children unnecessary before immediately unmapping them. However
+ * it will be reset to its default state of %TRUE when the widget
+ * is removed from a container.
+ * 
+ * Note that changing the child visibility of a widget does not
+ * queue a resize on the widget. Most of the time, the size of
+ * a widget is computed from all visible children, whether or
+ * not they are mapped. If this is not the case, the container
+ * can queue a resize itself.
+ *
+ * This function is only useful for container implementations and
+ * never should be called by an application.
+ **/
+void
+gtk_widget_set_child_visible (GtkWidget *widget,
+                             gboolean   is_visible)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+  g_return_if_fail (!GTK_WIDGET_TOPLEVEL (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))
+    {
+      if (GTK_WIDGET_MAPPED (widget->parent) &&
+         GTK_WIDGET_CHILD_VISIBLE (widget) &&
+         GTK_WIDGET_VISIBLE (widget))
+       gtk_widget_map (widget);
+      else
+       gtk_widget_unmap (widget);
+    }
+}
+
+/**
+ * gtk_widget_get_child_visible:
+ * @widget: a #GtkWidget
+ * 
+ * Gets the value set with gtk_widget_set_child_visible().
+ * If you feel a need to use this function, your code probably
+ * needs reorganization. 
+ *
+ * This function is only useful for container implementations and
+ * never should be called by an application.
+ *
+ * Return value: %TRUE if the widget is mapped with the parent.
+ **/
+gboolean
+gtk_widget_get_child_visible (GtkWidget *widget)
+{
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+  
+  return GTK_WIDGET_CHILD_VISIBLE (widget);
+}
 
+/**
+ * gtk_widget_get_parent_window:
+ * @widget: a #GtkWidget.
+ * @returns: the parent window of @widget.
+ * 
+ * Gets @widget's parent window.
+ **/
 GdkWindow *
 gtk_widget_get_parent_window   (GtkWidget           *widget)
 {
   GdkWindow *parent_window;
 
-  g_return_val_if_fail (widget != NULL, NULL);
   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
   g_return_val_if_fail (widget->parent != NULL, NULL);
   
@@ -4324,28 +4618,6 @@ gtk_widget_child_focus (GtkWidget       *widget,
   return return_val;
 }
 
-/* Update the position from aux_info. Used from gtk_widget_set_uposition
- * and gtk_widget_set_property().
- */
-static void
-gtk_widget_do_uposition (GtkWidget *widget)
-{
-  GtkWidgetAuxInfo *aux_info =_gtk_widget_get_aux_info (widget, FALSE);
-
-  if (GTK_IS_WINDOW (widget) && aux_info->x_set && aux_info->y_set)
-    _gtk_window_reposition (GTK_WINDOW (widget), aux_info->x, aux_info->y);
-  
-  if (GTK_WIDGET_VISIBLE (widget) && widget->parent)
-    gtk_widget_size_allocate (widget, &widget->allocation);
-
-  g_object_freeze_notify (G_OBJECT (widget));
-  if (aux_info->x_set)
-    g_object_notify (G_OBJECT (widget), "x");
-  if (aux_info->y_set)
-    g_object_notify (G_OBJECT (widget), "y");
-  g_object_thaw_notify (G_OBJECT (widget));
-}
-
 /**
  * gtk_widget_set_uposition:
  * @widget: a #GtkWidget
@@ -4354,7 +4626,7 @@ gtk_widget_do_uposition (GtkWidget *widget)
  * 
  *
  * Sets the position of a widget. The funny "u" in the name comes from
- * the "user position" hint specified by the X window system, and
+ * the "user position" hint specified by the X Window System, and
  * exists for legacy reasons. This function doesn't work if a widget
  * is inside a container; it's only really useful on #GtkWindow.
  *
@@ -4366,17 +4638,21 @@ gtk_widget_do_uposition (GtkWidget *widget)
  * to set #GTK_WIN_POS_CENTER_ON_PARENT, don't do the centering
  * manually.
  *
- * Note that although x and y can be individually unset, the position
- * is not honoured unless both x and y are set.
+ * Note that although @x and @y can be individually unset, the position
+ * is not honoured unless both @x and @y are set.
  **/
 void
 gtk_widget_set_uposition (GtkWidget *widget,
                          gint       x,
                          gint       y)
 {
+  /* 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.
+   */
+  
   GtkWidgetAuxInfo *aux_info;
   
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
   
   aux_info =_gtk_widget_get_aux_info (widget, TRUE);
@@ -4403,7 +4679,11 @@ gtk_widget_set_uposition (GtkWidget *widget,
        }
     }
 
-  gtk_widget_do_uposition (widget);
+  if (GTK_IS_WINDOW (widget) && aux_info->x_set && aux_info->y_set)
+    _gtk_window_reposition (GTK_WINDOW (widget), aux_info->x, aux_info->y);
+  
+  if (GTK_WIDGET_VISIBLE (widget) && widget->parent)
+    gtk_widget_size_allocate (widget, &widget->allocation);
 }
 
 /**
@@ -4412,6 +4692,9 @@ gtk_widget_set_uposition (GtkWidget *widget,
  * @width: minimum width, or -1 to unset
  * @height: minimum height, or -1 to unset
  *
+ * This function is deprecated; use gtk_widget_set_size_request()
+ * instead.
+ * 
  * Sets the minimum size of a widget; that is, the widget's size
  * request will be @width by @height. You can use this function to
  * force a widget to be either larger or smaller than it is. The
@@ -4438,7 +4721,6 @@ gtk_widget_set_usize (GtkWidget *widget,
 {
   GtkWidgetAuxInfo *aux_info;
   
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
   
   g_object_freeze_notify (G_OBJECT (widget));
@@ -4447,12 +4729,12 @@ gtk_widget_set_usize (GtkWidget *widget,
   
   if (width > -2)
     {
-      g_object_notify (G_OBJECT (widget), "width");
+      g_object_notify (G_OBJECT (widget), "width_request");
       aux_info->width = width;
     }
   if (height > -2)
     {
-      g_object_notify (G_OBJECT (widget), "height");  
+      g_object_notify (G_OBJECT (widget), "height_request");  
       aux_info->height = height;
     }
   
@@ -4463,21 +4745,79 @@ gtk_widget_set_usize (GtkWidget *widget,
 }
 
 /**
- * gtk_widget_get_usize:
+ * gtk_widget_set_size_request:
+ * @widget: a #GtkWidget
+ * @width: width @widget should request, or -1 to unset
+ * @height: height @widget should request, or -1 to unset
+ *
+ * Sets the minimum size of a widget; that is, the widget's size
+ * request will be @width by @height. You can use this function to
+ * force a widget to be either larger or smaller than it normally
+ * would be.
+ *
+ * In most cases, gtk_window_set_default_size() is a better choice for
+ * toplevel windows than this function; setting the default size will
+ * still allow users to shrink the window. Setting the size request
+ * will force them to leave the window at least as large as the size
+ * request. When dealing with window sizes,
+ * gtk_window_set_geometry_hints() can be a useful function as well.
+ * 
+ * Note the inherent danger of setting any fixed size - themes,
+ * translations into other languages, different fonts, and user action
+ * can all change the appropriate size for a given widget. So, it's
+ * basically impossible to hardcode a size that will always be
+ * correct.
+ *
+ * The size request of a widget is the smallest size a widget can
+ * accept while still functioning well and drawing itself correctly.
+ * However in some strange cases a widget may be allocated less than
+ * its requested size, and in many cases a widget may be allocated more
+ * space than it requested.
+ *
+ * If the size request in a given direction is -1 (unset), then
+ * the "natural" size request of the widget will be used instead.
+ *
+ * Widgets can't actually be allocated a size less than 1 by 1, but
+ * you can pass 0,0 to this function to mean "as small as possible."
+ **/
+void
+gtk_widget_set_size_request (GtkWidget *widget,
+                             gint       width,
+                             gint       height)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+  g_return_if_fail (width >= -1);
+  g_return_if_fail (height >= -1);
+
+  if (width == 0)
+    width = 1;
+  if (height == 0)
+    height = 1;
+  
+  gtk_widget_set_usize (widget, width, height);
+}
+
+
+/**
+ * gtk_widget_get_size_request:
  * @widget: a #GtkWidget
- * @width: location to store the width, or %NULL
- * @height: location to store the height, or %NULL
+ * @width: return location for width, or %NULL
+ * @height: return location for height, or %NULL
  *
- * Gets the size that has explicitely set for the widget to request,
- * if any. A value of -1 stored in @width or @height indicates that
- * that dimension has not been set explicitely and the natural
- * requisition of the widget will be used intead. See
- * gtk_widget_set_usize().
+ * Gets the size request that was explicitly set for the widget using
+ * gtk_widget_set_size_request().  A value of -1 stored in @width or
+ * @height indicates that that dimension has not been set explicitly
+ * and the natural requisition of the widget will be used intead. See
+ * gtk_widget_set_size_request(). To get the size a widget will
+ * actually use, call gtk_widget_size_request() instead of
+ * this function.
+ * 
  **/
 void
-gtk_widget_get_usize (GtkWidget *widget,
-                     gint      *width,
-                     gint      *height)
+gtk_widget_get_size_request (GtkWidget *widget,
+                             gint      *width,
+                             gint      *height)
 {
   GtkWidgetAuxInfo *aux_info;
 
@@ -4515,9 +4855,7 @@ gtk_widget_set_events (GtkWidget *widget,
 {
   gint *eventp;
   
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
-  g_return_if_fail (!GTK_WIDGET_NO_WINDOW (widget));
   g_return_if_fail (!GTK_WIDGET_REALIZED (widget));
   
   eventp = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_event_mask);
@@ -4554,10 +4892,8 @@ gtk_widget_add_events (GtkWidget *widget,
 {
   gint *eventp;
   
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
-  g_return_if_fail (!GTK_WIDGET_NO_WINDOW (widget));
-  
+
   eventp = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_event_mask);
   
   if (events)
@@ -4579,8 +4915,28 @@ gtk_widget_add_events (GtkWidget *widget,
 
   if (GTK_WIDGET_REALIZED (widget))
     {
-      gdk_window_set_events (widget->window,
-                            gdk_window_get_events (widget->window) | events);
+      if (GTK_WIDGET_NO_WINDOW (widget))
+       {
+         GList *children = gdk_window_get_children (widget->window);
+         GList *tmp_list = children;
+
+         while (tmp_list)
+           {
+             GdkWindow *window = tmp_list->data;
+             gpointer user_data;
+
+             gdk_window_get_user_data (window, &user_data);
+             if (user_data == widget)
+               gdk_window_set_events (window, gdk_window_get_events (window) | events);
+             tmp_list = tmp_list->next;
+           }
+
+         g_list_free (children);
+       }
+      else
+       {
+         gdk_window_set_events (widget->window, gdk_window_get_events (widget->window) | events);
+       }
     }
 
   g_object_notify (G_OBJECT (widget), "events");
@@ -4601,7 +4957,6 @@ gtk_widget_set_extension_events (GtkWidget *widget,
 {
   GdkExtensionMode *modep;
   
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
   
   modep = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_extension_event_mode);
@@ -4624,15 +4979,30 @@ gtk_widget_set_extension_events (GtkWidget *widget,
  * returned widget; it should not be unreferenced.
  *
  * Note the difference in behavior vs. gtk_widget_get_ancestor();
- * gtk_widget_get_ancestor (widget, GTK_TYPE_WINDOW) would return
- * %NULL if @widget wasn't inside a toplevel window.
+ * <literal>gtk_widget_get_ancestor (widget, GTK_TYPE_WINDOW)</literal> 
+ * would return
+ * %NULL if @widget wasn't inside a toplevel window, and if the
+ * window was inside a #GtkWindow-derived widget which was in turn
+ * inside the toplevel #GtkWindow. While the second case may
+ * seem unlikely, it actually happens when a #GtkPlug is embedded
+ * inside a #GtkSocket within the same application.
  * 
- * Return value: the topmost ancestor of @widget, or @widget itself if there's no ancestor
+ * 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>
+ *
+ * Return value: the topmost ancestor of @widget, or @widget itself if there's no ancestor.
  **/
 GtkWidget*
 gtk_widget_get_toplevel (GtkWidget *widget)
 {
-  g_return_val_if_fail (widget != NULL, NULL);
   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
   
   while (widget->parent)
@@ -4647,9 +5017,11 @@ gtk_widget_get_toplevel (GtkWidget *widget)
  * @widget_type: ancestor type
  * 
  * Gets the first ancestor of @widget with type @widget_type. For example,
- * gtk_widget_get_ancestor (widget, GTK_TYPE_BOX) gets the first #GtkBox that's
+ * <literal>gtk_widget_get_ancestor (widget, GTK_TYPE_BOX)</literal> gets the 
+ * first #GtkBox that's
  * an ancestor of @widget. No reference will be added to the returned widget;
- * it should not be unreferenced.
+ * it should not be unreferenced. See note about checking for a toplevel
+ * #GtkWindow in the docs for gtk_widget_get_toplevel().
  * 
  * Return value: the ancestor widget, or %NULL if not found
  **/
@@ -4657,7 +5029,6 @@ GtkWidget*
 gtk_widget_get_ancestor (GtkWidget *widget,
                         GtkType    widget_type)
 {
-  g_return_val_if_fail (widget != NULL, NULL);
   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
   
   while (widget && !gtk_type_is_a (GTK_WIDGET_TYPE (widget), widget_type))
@@ -4683,7 +5054,6 @@ gtk_widget_get_colormap (GtkWidget *widget)
 {
   GdkColormap *colormap;
   
-  g_return_val_if_fail (widget != NULL, NULL);
   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
   
   if (widget->window)
@@ -4693,10 +5063,15 @@ gtk_widget_get_colormap (GtkWidget *widget)
       if (colormap)
        return colormap;
     }
-  
-  colormap = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_colormap);
-  if (colormap)
-    return colormap;
+
+  while (widget)
+    {
+      colormap = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_colormap);
+      if (colormap)
+       return colormap;
+
+      widget = widget->parent;
+    }
 
   return gtk_widget_get_default_colormap ();
 }
@@ -4717,22 +5092,36 @@ gtk_widget_get_visual (GtkWidget *widget)
   return gdk_colormap_get_visual (gtk_widget_get_colormap (widget));
 }
 
+/**
+ * gtk_widget_get_settings:
+ * @widget: a #GtkWidget
+ * 
+ * Gets the settings object holding the settings (global property
+ * settings, RC file information, etc) used for this widget.
+ * 
+ * Return value: the relevant #GtkSettings object
+ **/
+GtkSettings*
+gtk_widget_get_settings (GtkWidget *widget)
+{
+  return gtk_settings_get_default ();
+}
 
 /**
  * gtk_widget_set_colormap:
  * @widget: a #GtkWidget
  * @colormap: a colormap
  *
- * Set the colormap for the widget to the given value. Widget must not
+ * Sets the colormap for the widget to the given value. Widget must not
  * have been previously realized. This probably should only be used
- * from an init() function (i.e. from the constructor for the widget).
+ * from an <function>init()</function> function (i.e. from the constructor 
+ * for the widget).
  * 
  **/
 void
 gtk_widget_set_colormap (GtkWidget   *widget,
                          GdkColormap *colormap)
 {
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (!GTK_WIDGET_REALIZED (widget));
   g_return_if_fail (GDK_IS_COLORMAP (colormap));
@@ -4760,7 +5149,6 @@ gtk_widget_get_events (GtkWidget *widget)
 {
   gint *events;
   
-  g_return_val_if_fail (widget != NULL, 0);
   g_return_val_if_fail (GTK_IS_WIDGET (widget), 0);
   
   events = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_event_mask);
@@ -4784,7 +5172,6 @@ gtk_widget_get_extension_events (GtkWidget *widget)
 {
   GdkExtensionMode *mode;
   
-  g_return_val_if_fail (widget != NULL, 0);
   g_return_val_if_fail (GTK_IS_WIDGET (widget), 0);
   
   mode = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_extension_event_mode);
@@ -4802,9 +5189,9 @@ gtk_widget_get_extension_events (GtkWidget *widget)
  *
  * Obtains the location of the mouse pointer in widget coordinates.
  * Widget coordinates are a bit odd; for historical reasons, they are
- * defined as widget->window coordinates for widgets that are not
- * #GTK_NO_WINDOW widgets, and are relative to widget->allocation.x,
- * widget->allocation.y for widgets that are #GTK_NO_WINDOW widgets.
+ * defined as @widget->window coordinates for widgets that are not
+ * #GTK_NO_WINDOW widgets, and are relative to @widget->allocation.x,
+ * @widget->allocation.y for widgets that are #GTK_NO_WINDOW widgets.
  * 
  **/
 void
@@ -4812,7 +5199,6 @@ gtk_widget_get_pointer (GtkWidget *widget,
                        gint      *x,
                        gint      *y)
 {
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
   
   if (x)
@@ -4848,7 +5234,6 @@ gboolean
 gtk_widget_is_ancestor (GtkWidget *widget,
                        GtkWidget *ancestor)
 {
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
   g_return_val_if_fail (ancestor != NULL, FALSE);
   
@@ -4864,11 +5249,18 @@ gtk_widget_is_ancestor (GtkWidget *widget,
 
 static GQuark quark_composite_name = 0;
 
+/**
+ * gtk_widget_set_composite_name:
+ * @widget: a #GtkWidget.
+ * @name: the name to set.
+ * 
+ * Sets a widgets composite name. The widget must be
+ * a composite child of its parent; see gtk_widget_push_composite_child().
+ **/
 void
 gtk_widget_set_composite_name (GtkWidget   *widget,
                               const gchar *name)
 {
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (GTK_WIDGET_COMPOSITE_CHILD (widget));
   g_return_if_fail (name != NULL);
@@ -4882,25 +5274,61 @@ gtk_widget_set_composite_name (GtkWidget   *widget,
                                  g_free);
 }
 
+/**
+ * gtk_widget_get_composite_name:
+ * @widget: a #GtkWidget.
+ * @returns: the composite name of @widget, or %NULL if @widget is not
+ *   a composite child. The string should not be freed when it is no 
+ *   longer needed.
+ *
+ * Obtains the composite name of a widget. 
+ **/
 gchar*
 gtk_widget_get_composite_name (GtkWidget *widget)
 {
-  g_return_val_if_fail (widget != NULL, NULL);
   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
 
   if (GTK_WIDGET_COMPOSITE_CHILD (widget) && widget->parent)
-    return gtk_container_child_composite_name (GTK_CONTAINER (widget->parent),
+    return _gtk_container_child_composite_name (GTK_CONTAINER (widget->parent),
                                               widget);
   else
     return NULL;
 }
 
+/**
+ * gtk_widget_push_composite_child:
+ * 
+ * Makes all newly-created widgets as composite children until
+ * the corresponding gtk_widget_pop_composite_child() call.
+ * 
+ * A composite child is a child that's an implementation detail of the
+ * container it's inside and should not be visible to people using the
+ * container. Composite children aren't treated differently by GTK (but
+ * see gtk_container_foreach() vs. gtk_container_forall()), but e.g. GUI 
+ * builders might want to treat them in a different way.
+ * 
+ * Here is a simple example:
+ * <informalexample><programlisting>
+ * <!>  gtk_widget_push_composite_child (<!>);
+ * <!>  scrolled_window->hscrollbar = gtk_hscrollbar_new (hadjustment);
+ * <!>  gtk_widget_set_composite_name (scrolled_window->hscrollbar, "hscrollbar");
+ * <!>  gtk_widget_pop_composite_child (<!>);
+ * <!>  gtk_widget_set_parent (scrolled_window->hscrollbar, 
+ * <!>                         GTK_WIDGET (scrolled_window));
+ * <!>  gtk_widget_ref (scrolled_window->hscrollbar);
+ * </programlisting></informalexample>
+ **/
 void
 gtk_widget_push_composite_child (void)
 {
   composite_child_stack++;
 }
 
+/**
+ * gtk_widget_pop_composite_child:
+ *
+ * Cancels the effect of a previous call to gtk_widget_push_composite_child().
+ **/ 
 void
 gtk_widget_pop_composite_child (void)
 {
@@ -4921,7 +5349,7 @@ gtk_widget_pop_composite_child (void)
 void
 gtk_widget_push_colormap (GdkColormap *cmap)
 {
-  g_return_if_fail (cmap != NULL);
+  g_return_if_fail (GDK_IS_COLORMAP (cmap));
 
   colormap_stack = g_slist_prepend (colormap_stack, cmap);
 }
@@ -4935,14 +5363,8 @@ gtk_widget_push_colormap (GdkColormap *cmap)
 void
 gtk_widget_pop_colormap (void)
 {
-  GSList *tmp;
-  
   if (colormap_stack)
-    {
-      tmp = colormap_stack;
-      colormap_stack = colormap_stack->next;
-      g_slist_free_1 (tmp);
-    }
+    colormap_stack = g_slist_delete_link (colormap_stack, colormap_stack);
 }
 
 /**
@@ -4957,6 +5379,8 @@ gtk_widget_pop_colormap (void)
 void
 gtk_widget_set_default_colormap (GdkColormap *colormap)
 {
+  g_return_if_fail (GDK_IS_COLORMAP (colormap));
+
   if (default_colormap != colormap)
     {
       if (default_colormap)
@@ -4978,7 +5402,7 @@ GdkColormap*
 gtk_widget_get_default_colormap (void)
 {
   if (!default_colormap)
-    gtk_widget_set_default_colormap (gdk_colormap_get_system ());
+    gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());
   
   return default_colormap;
 }
@@ -5016,7 +5440,7 @@ gtk_widget_emit_direction_changed (GtkWidget        *widget,
  * @widget: a #GtkWidget
  * @dir:    the new direction
  * 
- * Set the reading direction on a particular widget. This direction
+ * Sets the reading direction on a particular widget. This direction
  * controls the primary direction for widgets containing text,
  * and also the direction in which the children of a container are
  * packed. The ability to set the direction is present in order
@@ -5024,7 +5448,7 @@ gtk_widget_emit_direction_changed (GtkWidget        *widget,
  * reading directions can be done. Generally, applications will
  * let the default reading direction present, except for containers
  * where the containers are arranged in an order that is explicitely
- * visual rather than logical (such as buttons for text justificiation).
+ * visual rather than logical (such as buttons for text justification).
  *
  * If the direction is set to %GTK_TEXT_DIR_NONE, then the value
  * set by gtk_widget_set_default_direction() will be used.
@@ -5035,7 +5459,6 @@ gtk_widget_set_direction (GtkWidget        *widget,
 {
   GtkTextDirection old_dir;
   
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (dir >= GTK_TEXT_DIR_NONE && dir <= GTK_TEXT_DIR_RTL);
 
@@ -5060,7 +5483,7 @@ gtk_widget_set_direction (GtkWidget        *widget,
  * gtk_widget_get_direction:
  * @widget: a #GtkWidget
  * 
- * Get the reading direction for a particular widget. See
+ * Gets the reading direction for a particular widget. See
  * gtk_widget_set_direction().
  * 
  * Return value: the reading direction for the widget.
@@ -5068,7 +5491,6 @@ gtk_widget_set_direction (GtkWidget        *widget,
 GtkTextDirection
 gtk_widget_get_direction (GtkWidget *widget)
 {
-  g_return_val_if_fail (widget != NULL, GTK_TEXT_DIR_LTR);
   g_return_val_if_fail (GTK_IS_WIDGET (widget), GTK_TEXT_DIR_LTR);
   
   if (GTK_WIDGET_DIRECTION_SET (widget))
@@ -5100,7 +5522,7 @@ gtk_widget_set_default_direction_recurse (GtkWidget *widget, gpointer data)
  * @dir: the new default direction. This cannot be
  *        %GTK_TEXT_DIR_NONE.
  * 
- * Set the default reading direction for widgets where the
+ * Sets the default reading direction for widgets where the
  * direction has not been explicitly set by gtk_widget_set_direction().
  **/
 void
@@ -5133,8 +5555,10 @@ gtk_widget_set_default_direction (GtkTextDirection dir)
 /**
  * gtk_widget_get_default_direction:
  * 
- * Return value: the current default direction. See
- * gtk_widget_set_direction().
+ * Obtains the current default reading direction. See
+ * gtk_widget_set_default_direction().
+ *
+ * Return value: the current default direction. 
  **/
 GtkTextDirection
 gtk_widget_get_default_direction (void)
@@ -5143,7 +5567,7 @@ gtk_widget_get_default_direction (void)
 }
 
 static void
-gtk_widget_shutdown (GObject *object)
+gtk_widget_dispose (GObject *object)
 {
   GtkWidget *widget = GTK_WIDGET (object);
 
@@ -5154,32 +5578,24 @@ gtk_widget_shutdown (GObject *object)
   if (GTK_WIDGET_REALIZED (widget))
     gtk_widget_unrealize (widget);
   
-  G_OBJECT_CLASS (parent_class)->shutdown (object);
+  G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 static void
 gtk_widget_real_destroy (GtkObject *object)
 {
-  GtkWidget *widget;
-  GtkStyle *saved_style;
+  /* gtk_object_destroy() will already hold a refcount on object */
+  GtkWidget *widget = GTK_WIDGET (object);
 
-  /* gtk_object_destroy() will already hold a refcount on object
-   */
-  widget = GTK_WIDGET (object);
+  /* wipe accelerator closures (keep order) */
+  g_object_set_qdata (G_OBJECT (widget), quark_accel_path, NULL);
+  g_object_set_qdata (G_OBJECT (widget), quark_accel_closures, NULL);
 
   gtk_grab_remove (widget);
-  gtk_selection_remove_all (widget);
   
-  saved_style = gtk_object_get_data_by_id (object, quark_saved_default_style);
-  if (saved_style)
-    {
-      gtk_style_unref (saved_style);
-      gtk_object_remove_data_by_id (object, quark_saved_default_style);
-    }
-
-  gtk_style_unref (widget->style);
-  widget->style = gtk_widget_peek_style ();
-  gtk_style_ref (widget->style);
+  g_object_unref (widget->style);
+  widget->style = gtk_widget_get_default_style ();
+  g_object_ref (widget->style);
 
   GTK_OBJECT_CLASS (parent_class)->destroy (object);
 }
@@ -5191,20 +5607,11 @@ gtk_widget_finalize (GObject *object)
   GtkWidgetAuxInfo *aux_info;
   gint *events;
   GdkExtensionMode *mode;
-  GtkStyle *saved_style;
   GtkAccessible *accessible;
   
   gtk_grab_remove (widget);
-  gtk_selection_remove_all (widget);
-
-  saved_style = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_saved_default_style);
-  if (saved_style)
-    {
-      gtk_style_unref (saved_style);
-      gtk_object_remove_data_by_id (GTK_OBJECT (widget), quark_saved_default_style);
-    }
 
-  gtk_style_unref (widget->style);
+  g_object_unref (widget->style);
   widget->style = NULL;
 
   if (widget->name)
@@ -5240,7 +5647,6 @@ gtk_widget_finalize (GObject *object)
 static void
 gtk_widget_real_map (GtkWidget *widget)
 {
-  g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (GTK_WIDGET_REALIZED (widget) == TRUE);
   
   if (!GTK_WIDGET_MAPPED (widget))
@@ -5263,9 +5669,6 @@ gtk_widget_real_map (GtkWidget *widget)
 static void
 gtk_widget_real_unmap (GtkWidget *widget)
 {
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-  
   if (GTK_WIDGET_MAPPED (widget))
     {
       GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
@@ -5286,8 +5689,6 @@ gtk_widget_real_unmap (GtkWidget *widget)
 static void
 gtk_widget_real_realize (GtkWidget *widget)
 {
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (GTK_WIDGET_NO_WINDOW (widget));
   
   GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
@@ -5310,9 +5711,6 @@ gtk_widget_real_realize (GtkWidget *widget)
 static void
 gtk_widget_real_unrealize (GtkWidget *widget)
 {
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-
   if (GTK_WIDGET_MAPPED (widget))
     gtk_widget_real_unmap (widget);
 
@@ -5345,6 +5743,8 @@ gtk_widget_real_unrealize (GtkWidget *widget)
       widget->window = NULL;
     }
 
+  gtk_selection_remove_all (widget);
+  
   GTK_WIDGET_UNSET_FLAGS (widget, GTK_REALIZED);
 }
 
@@ -5352,27 +5752,23 @@ static void
 gtk_widget_real_size_request (GtkWidget         *widget,
                              GtkRequisition    *requisition)
 {
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-
   requisition->width = widget->requisition.width;
   requisition->height = widget->requisition.height;
 }
 
-/*****************************************
- * gtk_widget_peek_colormap:
- *
- *   arguments:
- *
- *   results:
- *****************************************/
-
-static GdkColormap*
-gtk_widget_peek_colormap (void)
+/**
+ * _gtk_widget_peek_colormap:
+ * 
+ * Returns colormap currently pushed by gtk_widget_push_colormap, if any.
+ * 
+ * Return value: the currently pushed colormap, or %NULL if there is none.
+ **/
+GdkColormap*
+_gtk_widget_peek_colormap (void)
 {
   if (colormap_stack)
     return (GdkColormap*) colormap_stack->data;
-  return gtk_widget_get_default_colormap ();
+  return NULL;
 }
 
 static void
@@ -5419,12 +5815,12 @@ gtk_widget_propagate_state (GtkWidget           *widget,
       GTK_WIDGET_STATE (widget) = GTK_STATE_INSENSITIVE;
     }
 
-  if (GTK_WIDGET_HAS_FOCUS (widget) && !GTK_WIDGET_IS_SENSITIVE (widget))
+  if (gtk_widget_is_focus (widget) && !GTK_WIDGET_IS_SENSITIVE (widget))
     {
       GtkWidget *window;
 
-      window = gtk_widget_get_ancestor (widget, GTK_TYPE_WINDOW);
-      if (window)
+      window = gtk_widget_get_toplevel (widget);
+      if (window && GTK_WIDGET_TOPLEVEL (window))
        gtk_window_set_focus (GTK_WINDOW (window), NULL);
     }
 
@@ -5503,8 +5899,6 @@ _gtk_widget_get_aux_info (GtkWidget *widget,
 static void
 gtk_widget_aux_info_destroy (GtkWidgetAuxInfo *aux_info)
 {
-  g_return_if_fail (aux_info != NULL);
-  
   g_mem_chunk_free (aux_info_mem_chunk, aux_info);
 }
 
@@ -5515,16 +5909,17 @@ gtk_widget_shape_info_destroy (GtkWidgetShapeInfo *info)
   g_free (info);
 }
 
-/*****************************************
+/**
  * gtk_widget_shape_combine_mask: 
- *   set a shape for this widgets' gdk window, this allows for
- *   transparent windows etc., see gdk_window_shape_combine_mask
- *   for more information
- *
- *   arguments:
- *
- *   results:
- *****************************************/
+ * @widget: a #GtkWidget.
+ * @shape_mask: shape to be added, or %NULL to remove an existing shape. 
+ * @offset_x: X position of shape mask with respect to @window.
+ * @offset_y: Y position of shape mask with respect to @window.
+ * 
+ * Sets a shape for this widget's GDK window. This allows for
+ * transparent windows etc., see gdk_window_shape_combine_mask()
+ * for more information.
+ **/
 void
 gtk_widget_shape_combine_mask (GtkWidget *widget,
                               GdkBitmap *shape_mask,
@@ -5533,7 +5928,6 @@ gtk_widget_shape_combine_mask (GtkWidget *widget,
 {
   GtkWidgetShapeInfo* shape_info;
   
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
   /*  set_shape doesn't work on widgets without gdk window */
   g_return_if_fail (!GTK_WIDGET_NO_WINDOW (widget));
@@ -5584,10 +5978,15 @@ gtk_reset_shapes_recurse (GtkWidget *widget,
     gtk_reset_shapes_recurse (widget, list->data);
 }
 
+/**
+ * gtk_widget_reset_shapes:
+ * @widget: a #GtkWidget.
+ *
+ * Recursively resets the shape on this widget and its descendants.
+ **/
 void
 gtk_widget_reset_shapes (GtkWidget *widget)
 {
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (GTK_WIDGET_REALIZED (widget));
 
@@ -5671,6 +6070,14 @@ gtk_widget_class_install_style_property (GtkWidgetClass *class,
   gtk_widget_class_install_style_property_parser (class, pspec, parser);
 }
 
+/**
+ * gtk_widget_style_get_property:
+ * @widget: a #GtkWidget
+ * @property_name: the name of a style property
+ * @value: location to return the property value 
+ *
+ * Gets the value of a style property of @widget.
+ */
 void
 gtk_widget_style_get_property (GtkWidget   *widget,
                               const gchar *property_name,
@@ -5708,7 +6115,7 @@ gtk_widget_style_get_property (GtkWidget   *widget,
       else if (g_value_type_transformable (G_PARAM_SPEC_VALUE_TYPE (pspec), G_VALUE_TYPE (value)))
        g_value_transform (peek_value, value);
       else
-       g_warning ("can't retrive style property `%s' of type `%s' as value of type `%s'",
+       g_warning ("can't retrieve style property `%s' of type `%s' as value of type `%s'",
                   pspec->name,
                   g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec)),
                   G_VALUE_TYPE_NAME (value));
@@ -5716,6 +6123,17 @@ gtk_widget_style_get_property (GtkWidget   *widget,
   g_object_unref (widget);
 }
 
+/**
+ * gtk_widget_style_get_valist:
+ * @widget: a #GtkWidget
+ * @first_property_name: the name of the first property to get
+ * @var_args: a <type>va_list</type> of pairs of property names and
+ *     locations to return the property values, starting with the location
+ *     for @first_property_name.
+ * 
+ * Non-vararg variant of gtk_widget_style_get(). Used primarily by language 
+ * bindings.
+ */ 
 void
 gtk_widget_style_get_valist (GtkWidget   *widget,
                             const gchar *first_property_name,
@@ -5766,6 +6184,16 @@ gtk_widget_style_get_valist (GtkWidget   *widget,
   g_object_unref (widget);
 }
 
+/**
+ * gtk_widget_style_get:
+ * @widget: a #GtkWidget
+ * @first_property_name: the name of the first property to get
+ * @Varargs: pairs of property names and locations to 
+ *   return the property values, starting with the location for 
+ *   @first_property_name, terminated by %NULL.
+ *
+ * Gets the values of a multiple style properties of @widget.
+ */
 void
 gtk_widget_style_get (GtkWidget   *widget,
                      const gchar *first_property_name,
@@ -5783,9 +6211,9 @@ gtk_widget_style_get (GtkWidget   *widget,
 /**
  * gtk_widget_path:
  * @widget: a #GtkWidget
- * @path_length: location to store length of the path
- * @path: location to store allocated path string 
- * @path_reversed: location to store allocated reverse path string
+ * @path_length: location to store length of the path, or %NULL
+ * @path: location to store allocated path string, or %NULL 
+ * @path_reversed: location to store allocated reverse path string, or %NULL
  *
  * Obtains the full path to @widget. The path is simply the name of a
  * widget and all its parents in the container hierarchy, separated by
@@ -5803,15 +6231,14 @@ gtk_widget_style_get (GtkWidget   *widget,
  **/
 void
 gtk_widget_path (GtkWidget *widget,
-                guint     *path_length_p,
-                gchar    **path_p,
-                gchar    **path_reversed_p)
+                guint     *path_length,
+                gchar    **path,
+                gchar    **path_reversed)
 {
   static gchar *rev_path = NULL;
-  static guint  path_len = 0;
+  static guint tmp_path_len = 0;
   guint len;
   
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
   
   len = 0;
@@ -5824,10 +6251,10 @@ gtk_widget_path (GtkWidget *widget,
       
       string = gtk_widget_get_name (widget);
       l = strlen (string);
-      while (path_len <= len + l + 1)
+      while (tmp_path_len <= len + l + 1)
        {
-         path_len += INIT_PATH_SIZE;
-         rev_path = g_realloc (rev_path, path_len);
+         tmp_path_len += INIT_PATH_SIZE;
+         rev_path = g_realloc (rev_path, tmp_path_len);
        }
       s = string + l - 1;
       d = rev_path + len;
@@ -5844,23 +6271,23 @@ gtk_widget_path (GtkWidget *widget,
     }
   while (widget);
   
-  if (path_length_p)
-    *path_length_p = len - 1;
-  if (path_reversed_p)
-    *path_reversed_p = g_strdup (rev_path);
-  if (path_p)
+  if (path_length)
+    *path_length = len - 1;
+  if (path_reversed)
+    *path_reversed = g_strdup (rev_path);
+  if (path)
     {
-      *path_p = g_strdup (rev_path);
-      g_strreverse (*path_p);
+      *path = g_strdup (rev_path);
+      g_strreverse (*path);
     }
 }
 
 /**
  * gtk_widget_class_path:
  * @widget: a #GtkWidget
- * @path_length: location to store the length of the class path
- * @path: location to store the class path as an allocated string
- * @path_reversed: location to store the reverse class path as an allocated string
+ * @path_length: location to store the length of the class path, or %NULL
+ * @path: location to store the class path as an allocated string, or %NULL
+ * @path_reversed: location to store the reverse class path as an allocated string, or %NULL
  *
  * Same as gtk_widget_path(), but always uses the name of a widget's type,
  * never uses a custom name set with gtk_widget_set_name().
@@ -5868,15 +6295,14 @@ gtk_widget_path (GtkWidget *widget,
  **/
 void
 gtk_widget_class_path (GtkWidget *widget,
-                      guint     *path_length_p,
-                      gchar    **path_p,
-                      gchar    **path_reversed_p)
+                      guint     *path_length,
+                      gchar    **path,
+                      gchar    **path_reversed)
 {
   static gchar *rev_path = NULL;
-  static guint  path_len = 0;
+  static guint tmp_path_len = 0;
   guint len;
   
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (widget));
   
   len = 0;
@@ -5889,10 +6315,10 @@ gtk_widget_class_path (GtkWidget *widget,
       
       string = gtk_type_name (GTK_WIDGET_TYPE (widget));
       l = strlen (string);
-      while (path_len <= len + l + 1)
+      while (tmp_path_len <= len + l + 1)
        {
-         path_len += INIT_PATH_SIZE;
-         rev_path = g_realloc (rev_path, path_len);
+         tmp_path_len += INIT_PATH_SIZE;
+         rev_path = g_realloc (rev_path, tmp_path_len);
        }
       s = string + l - 1;
       d = rev_path + len;
@@ -5909,44 +6335,71 @@ gtk_widget_class_path (GtkWidget *widget,
     }
   while (widget);
   
-  if (path_length_p)
-    *path_length_p = len - 1;
-  if (path_reversed_p)
-    *path_reversed_p = g_strdup (rev_path);
-  if (path_p)
+  if (path_length)
+    *path_length = len - 1;
+  if (path_reversed)
+    *path_reversed = g_strdup (rev_path);
+  if (path)
     {
-      *path_p = g_strdup (rev_path);
-      g_strreverse (*path_p);
+      *path = g_strdup (rev_path);
+      g_strreverse (*path);
     }
 }
 
+/**
+ * gtk_requisition_copy:
+ * @requisition: a #GtkRequisition.
+ * @returns: a copy of @requisition.
+ *
+ * Copies a #GtkRequisition.
+ **/
 GtkRequisition *
 gtk_requisition_copy (const GtkRequisition *requisition)
 {
   return (GtkRequisition *)g_memdup (requisition, sizeof (GtkRequisition));
 }
 
+/**
+ * gtk_requisition_free:
+ * @requisition: a #GtkRequisition.
+ * 
+ * Frees a #GtkRequisition.
+ **/
 void
 gtk_requisition_free (GtkRequisition *requisition)
 {
   g_free (requisition);
 }
 
-AtkObject* gtk_widget_get_accessible (GtkWidget *widget)
+GType
+gtk_requisition_get_type (void)
+{
+  static GType our_type = 0;
+  
+  if (our_type == 0)
+    our_type = g_boxed_type_register_static ("GtkTypeRequisition",
+                                            (GBoxedCopyFunc) gtk_requisition_copy,
+                                            (GBoxedFreeFunc) gtk_requisition_free);
+
+  return our_type;
+}
+
+AtkObject* 
+gtk_widget_get_accessible (GtkWidget *widget)
 {
   GtkWidgetClass *klass;
 
-  g_return_val_if_fail (widget != NULL, NULL);
   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
 
   klass = GTK_WIDGET_GET_CLASS (widget);
 
   g_return_val_if_fail (klass->get_accessible != NULL, NULL);
 
-  return klass->get_accessible(widget);
+  return klass->get_accessible (widget);
 }
 
-AtkObject* gtk_widget_real_get_accessible (GtkWidget *widget)
+static AtkObject* 
+gtk_widget_real_get_accessible (GtkWidget *widget)
 {
   AtkObject* accessible;
 
@@ -5962,7 +6415,7 @@ AtkObject* gtk_widget_real_get_accessible (GtkWidget *widget)
                                         GTK_OBJECT_TYPE (widget));
     accessible =
       atk_object_factory_create_accessible (factory,
-                                               G_OBJECT(widget));
+                                           G_OBJECT (widget));
     g_object_set_qdata (G_OBJECT (widget), 
                         quark_accessible_object,
                         accessible);
@@ -5981,7 +6434,7 @@ gtk_widget_accessible_interface_init (AtkImplementorIface *iface)
 }
 
 static AtkObject*
-gtk_widget_ref_accessible(AtkImplementor *implementor)
+gtk_widget_ref_accessible (AtkImplementor *implementor)
 {
   AtkObject *accessible;