]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkwindow.c
Add a deletable property with getter and setter, to control the close
[~andy/gtk] / gtk / gtkwindow.c
index 79df74744ce5bae4a5ba183d9dd9f74d2837d8aa..b318a99b64d8587983becba17848c9ab05da7ac3 100644 (file)
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include <config.h>
 #include <string.h>
 #include <limits.h>
 #include "gdk/gdk.h"
 #include "gdk/gdkkeysyms.h"
 
+#include "gtkintl.h"
+
 #include "gtkprivate.h"
 #include "gtkrc.h"
-#include "gtksignal.h"
 #include "gtkwindow.h"
 #include "gtkwindow-decorate.h"
 #include "gtkbindings.h"
+#include "gtkkeyhash.h"
 #include "gtkmain.h"
+#include "gtkmnemonichash.h"
 #include "gtkiconfactory.h"
-#include "gtkintl.h"
+#include "gtkicontheme.h"
 #include "gtkmarshalers.h"
+#include "gtkplug.h"
+#include "gtkalias.h"
+
+#ifdef GDK_WINDOWING_X11
+#include "x11/gdkx.h"
+#endif
 
 enum {
   SET_FOCUS,
@@ -58,6 +68,7 @@ enum {
 
   /* Normal Props */
   PROP_TITLE,
+  PROP_ROLE,
   PROP_ALLOW_SHRINK,
   PROP_ALLOW_GROW,
   PROP_RESIZABLE,
@@ -67,6 +78,21 @@ enum {
   PROP_DEFAULT_HEIGHT,
   PROP_DESTROY_WITH_PARENT,
   PROP_ICON,
+  PROP_ICON_NAME,
+  PROP_SCREEN,
+  PROP_TYPE_HINT,
+  PROP_SKIP_TASKBAR_HINT,
+  PROP_SKIP_PAGER_HINT,
+  PROP_URGENCY_HINT,
+  PROP_ACCEPT_FOCUS,
+  PROP_FOCUS_ON_MAP,
+  PROP_DECORATED,
+  PROP_DELETABLE,
+  PROP_GRAVITY,
+  
+  /* Readonly properties */
+  PROP_IS_ACTIVE,
+  PROP_HAS_TOPLEVEL_FOCUS,
   
   LAST_ARG
 };
@@ -76,9 +102,11 @@ typedef struct
   GList     *icon_list;
   GdkPixmap *icon_pixmap;
   GdkPixmap *icon_mask;
+  gchar     *icon_name;
   guint      realized : 1;
   guint      using_default_icon : 1;
   guint      using_parent_icon : 1;
+  guint      using_themed_icon : 1;
 } GtkWindowIconInfo;
 
 typedef struct {
@@ -117,17 +145,34 @@ struct _GtkWindowGeometryInfo
    * we sent the last configure request.
    */
   guint          position_constraints_changed : 1;
+
+  /* if true, default_width, height come from gtk_window_parse_geometry,
+   * and thus should be multiplied by the increments and affect the
+   * geometry widget only
+   */
+  guint          default_is_geometry : 1;
   
   GtkWindowLastGeometryInfo last;
 };
 
-typedef struct {
-  GtkWindow *window;
-  guint keyval;
+#define GTK_WINDOW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_WINDOW, GtkWindowPrivate))
 
-  GSList *targets;
-} GtkWindowMnemonic;
+typedef struct _GtkWindowPrivate GtkWindowPrivate;
 
+struct _GtkWindowPrivate
+{
+  GtkMnemonicHash *mnemonic_hash;
+  
+  guint above_initially : 1;
+  guint below_initially : 1;
+  guint fullscreen_initially : 1;
+  guint skips_taskbar : 1;
+  guint skips_pager : 1;
+  guint urgent : 1;
+  guint accept_focus : 1;
+  guint focus_on_map : 1;
+  guint deletable : 1;
+};
 
 static void gtk_window_class_init         (GtkWindowClass    *klass);
 static void gtk_window_init               (GtkWindow         *window);
@@ -174,18 +219,19 @@ static void gtk_window_real_activate_default (GtkWindow         *window);
 static void gtk_window_real_activate_focus   (GtkWindow         *window);
 static void gtk_window_move_focus            (GtkWindow         *window,
                                               GtkDirectionType   dir);
-static void gtk_window_read_rcfiles       (GtkWidget         *widget,
-                                          GdkEventClient    *event);
-static void gtk_window_paint              (GtkWidget         *widget,
-                                          GdkRectangle      *area);
-static gint gtk_window_expose             (GtkWidget         *widget,
-                                          GdkEventExpose    *event);
+static void gtk_window_keys_changed          (GtkWindow         *window);
+static void gtk_window_paint                 (GtkWidget         *widget,
+                                             GdkRectangle      *area);
+static gint gtk_window_expose                (GtkWidget         *widget,
+                                             GdkEventExpose    *event);
 static void gtk_window_unset_transient_for         (GtkWindow  *window);
 static void gtk_window_transient_parent_realized   (GtkWidget  *parent,
                                                    GtkWidget  *window);
 static void gtk_window_transient_parent_unrealized (GtkWidget  *parent,
                                                    GtkWidget  *window);
 
+static GdkScreen *gtk_window_check_screen (GtkWindow *window);
+
 static GtkWindowGeometryInfo* gtk_window_get_geometry_info         (GtkWindow    *window,
                                                                     gboolean      create);
 
@@ -218,20 +264,28 @@ static void     gtk_window_set_default_size_internal (GtkWindow    *window,
                                                       gboolean      change_width,
                                                       gint          width,
                                                       gboolean      change_height,
-                                                      gint          height);
+                                                      gint          height,
+                                                     gboolean      is_geometry);
 
+static void     update_themed_icon                    (GtkIconTheme *theme,
+                                                      GtkWindow    *window);
+static GList   *icon_list_from_theme                  (GtkWidget    *widget,
+                                                      const gchar  *name);
 static void     gtk_window_realize_icon               (GtkWindow    *window);
 static void     gtk_window_unrealize_icon             (GtkWindow    *window);
-static void    gtk_window_notify_keys_changed      (GtkWindow    *window);
+
+static void        gtk_window_notify_keys_changed (GtkWindow   *window);
+static GtkKeyHash *gtk_window_get_key_hash        (GtkWindow   *window);
+static void        gtk_window_free_key_hash       (GtkWindow   *window);
 
 static GSList      *toplevel_list = NULL;
-static GHashTable  *mnemonic_hash_table = NULL;
 static GtkBinClass *parent_class = NULL;
 static guint        window_signals[LAST_SIGNAL] = { 0 };
 static GList       *default_icon_list = NULL;
-/* FIXME need to be per-screen */
-static GdkPixmap   *default_icon_pixmap = NULL;
-static GdkPixmap   *default_icon_mask = NULL;
+static gchar       *default_icon_name = NULL;
+static guint        default_icon_serial = 0;
+static gboolean     disable_startup_notification = FALSE;
+static gboolean     sent_startup_notification = FALSE;
 
 static void gtk_window_set_property (GObject         *object,
                                     guint            prop_id,
@@ -243,55 +297,28 @@ static void gtk_window_get_property (GObject         *object,
                                     GParamSpec      *pspec);
 
 
-static guint
-mnemonic_hash (gconstpointer key)
-{
-  const GtkWindowMnemonic *k;
-  guint h;
-  
-  k = (GtkWindowMnemonic *)key;
-  
-  h = (gulong) k->window;
-  h ^= k->keyval << 16;
-  h ^= k->keyval >> 16;
-
-  return h;
-}
-
-static gboolean
-mnemonic_equal (gconstpointer a, gconstpointer b)
-{
-  const GtkWindowMnemonic *ka;
-  const GtkWindowMnemonic *kb;
-  
-  ka = (GtkWindowMnemonic *)a;
-  kb = (GtkWindowMnemonic *)b;
-
-  return
-    (ka->window == kb->window) &&
-    (ka->keyval == kb->keyval);
-}
-
-GtkType
+GType
 gtk_window_get_type (void)
 {
-  static GtkType window_type = 0;
+  static GType window_type = 0;
 
   if (!window_type)
     {
-      static const GtkTypeInfo window_info =
+      static const GTypeInfo window_info =
       {
-       "GtkWindow",
-       sizeof (GtkWindow),
        sizeof (GtkWindowClass),
-       (GtkClassInitFunc) gtk_window_class_init,
-       (GtkObjectInitFunc) gtk_window_init,
-        /* reserved_1 */ NULL,
-       /* reserved_2 */ NULL,
-       (GtkClassInitFunc) NULL,
+       NULL,           /* base_init */
+       NULL,           /* base_finalize */
+       (GClassInitFunc) gtk_window_class_init,
+       NULL,           /* class_finalize */
+       NULL,           /* class_data */
+       sizeof (GtkWindow),
+       0,              /* n_preallocs */
+       (GInstanceInitFunc) gtk_window_init,
       };
 
-      window_type = gtk_type_unique (gtk_bin_get_type (), &window_info);
+      window_type = g_type_register_static (GTK_TYPE_BIN, "GtkWindow",
+                                           &window_info, 0);
     }
 
   return window_type;
@@ -308,11 +335,30 @@ add_tab_bindings (GtkBindingSet    *binding_set,
   gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, modifiers,
                                 "move_focus", 1,
                                 GTK_TYPE_DIRECTION_TYPE, direction);
-  gtk_binding_entry_add_signal (binding_set, GDK_ISO_Left_Tab, modifiers,
+}
+
+static void
+add_arrow_bindings (GtkBindingSet    *binding_set,
+                   guint             keysym,
+                   GtkDirectionType  direction)
+{
+  guint keypad_keysym = keysym - GDK_Left + GDK_KP_Left;
+  
+  gtk_binding_entry_add_signal (binding_set, keysym, 0,
+                                "move_focus", 1,
+                                GTK_TYPE_DIRECTION_TYPE, direction);
+  gtk_binding_entry_add_signal (binding_set, keysym, GDK_CONTROL_MASK,
+                                "move_focus", 1,
+                                GTK_TYPE_DIRECTION_TYPE, direction);
+  gtk_binding_entry_add_signal (binding_set, keypad_keysym, 0,
+                                "move_focus", 1,
+                                GTK_TYPE_DIRECTION_TYPE, direction);
+  gtk_binding_entry_add_signal (binding_set, keypad_keysym, GDK_CONTROL_MASK,
                                 "move_focus", 1,
                                 GTK_TYPE_DIRECTION_TYPE, direction);
 }
 
+
 static void
 gtk_window_class_init (GtkWindowClass *klass)
 {
@@ -326,9 +372,7 @@ gtk_window_class_init (GtkWindowClass *klass)
   widget_class = (GtkWidgetClass*) klass;
   container_class = (GtkContainerClass*) klass;
   
-  parent_class = gtk_type_class (gtk_bin_get_type ());
-
-  mnemonic_hash_table = g_hash_table_new (mnemonic_hash, mnemonic_equal);
+  parent_class = g_type_class_peek_parent (klass);
 
   gobject_class->dispose = gtk_window_dispose;
   gobject_class->finalize = gtk_window_finalize;
@@ -366,108 +410,268 @@ gtk_window_class_init (GtkWindowClass *klass)
   klass->activate_default = gtk_window_real_activate_default;
   klass->activate_focus = gtk_window_real_activate_focus;
   klass->move_focus = gtk_window_move_focus;
-  klass->keys_changed = NULL;
+  klass->keys_changed = gtk_window_keys_changed;
+  
+  g_type_class_add_private (gobject_class, sizeof (GtkWindowPrivate));
   
   /* Construct */
   g_object_class_install_property (gobject_class,
                                    PROP_TYPE,
                                    g_param_spec_enum ("type",
-                                                     _("Window Type"),
-                                                     _("The type of the window"),
+                                                     P_("Window Type"),
+                                                     P_("The type of the window"),
                                                      GTK_TYPE_WINDOW_TYPE,
                                                      GTK_WINDOW_TOPLEVEL,
-                                                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-
+                                                     GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
   /* Regular Props */
   g_object_class_install_property (gobject_class,
                                    PROP_TITLE,
                                    g_param_spec_string ("title",
-                                                        _("Window Title"),
-                                                        _("The title of the window"),
+                                                        P_("Window Title"),
+                                                        P_("The title of the window"),
                                                         NULL,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (gobject_class,
+                                   PROP_ROLE,
+                                   g_param_spec_string ("role",
+                                                       P_("Window Role"),
+                                                       P_("Unique identifier for the window to be used when restoring a session"),
+                                                       NULL,
+                                                       GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_ALLOW_SHRINK,
-                                   g_param_spec_boolean ("allow_shrink",
-                                                        _("Allow Shrink"),
+                                   g_param_spec_boolean ("allow-shrink",
+                                                        P_("Allow Shrink"),
                                                         /* xgettext:no-c-format */
-                                                        _("If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of the time a bad idea."),
+                                                        P_("If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of the time a bad idea"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_ALLOW_GROW,
-                                   g_param_spec_boolean ("allow_grow",
-                                                        _("Allow Grow"),
-                                                        _("If TRUE, users can expand the window beyond its minimum size."),
+                                   g_param_spec_boolean ("allow-grow",
+                                                        P_("Allow Grow"),
+                                                        P_("If TRUE, users can expand the window beyond its minimum size"),
                                                         TRUE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_RESIZABLE,
                                    g_param_spec_boolean ("resizable",
-                                                        _("Resizable"),
-                                                        _("If TRUE, users can resize the window."),
+                                                        P_("Resizable"),
+                                                        P_("If TRUE, users can resize the window"),
                                                         TRUE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_MODAL,
                                    g_param_spec_boolean ("modal",
-                                                        _("Modal"),
-                                                        _("If TRUE, the window is modal (other windows are not usable while this one is up)."),
+                                                        P_("Modal"),
+                                                        P_("If TRUE, the window is modal (other windows are not usable while this one is up)"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_WIN_POS,
-                                   g_param_spec_enum ("window_position",
-                                                     _("Window Position"),
-                                                     _("The initial position of the window."),
+                                   g_param_spec_enum ("window-position",
+                                                     P_("Window Position"),
+                                                     P_("The initial position of the window"),
                                                      GTK_TYPE_WINDOW_POSITION,
                                                      GTK_WIN_POS_NONE,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
  
   g_object_class_install_property (gobject_class,
                                    PROP_DEFAULT_WIDTH,
-                                   g_param_spec_int ("default_width",
-                                                    _("Default Width"),
-                                                    _("The default width of the window, used when initially showing the window."),
+                                   g_param_spec_int ("default-width",
+                                                    P_("Default Width"),
+                                                    P_("The default width of the window, used when initially showing the window"),
                                                     -1,
                                                     G_MAXINT,
                                                     -1,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_DEFAULT_HEIGHT,
-                                   g_param_spec_int ("default_height",
-                                                    _("Default Height"),
-                                                    _("The default height of the window, used when initially showing the window."),
+                                   g_param_spec_int ("default-height",
+                                                    P_("Default Height"),
+                                                    P_("The default height of the window, used when initially showing the window"),
                                                     -1,
                                                     G_MAXINT,
                                                     -1,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_DESTROY_WITH_PARENT,
-                                   g_param_spec_boolean ("destroy_with_parent",
-                                                        _("Destroy with Parent"),
-                                                        _("If this window should be destroyed when the parent is destroyed"),
+                                   g_param_spec_boolean ("destroy-with-parent",
+                                                        P_("Destroy with Parent"),
+                                                        P_("If this window should be destroyed when the parent is destroyed"),
                                                          FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_ICON,
                                    g_param_spec_object ("icon",
-                                                        _("Icon"),
-                                                        _("Icon for this window"),
+                                                        P_("Icon"),
+                                                        P_("Icon for this window"),
                                                         GDK_TYPE_PIXBUF,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
+  
+  /**
+   * GtkWindow:icon-name:
+   *
+   * The :icon-name property specifies the name of the themed icon to
+   * use as the window icon. See #GtkIconTheme for more details.
+   *
+   * Since: 2.6
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_ICON_NAME,
+                                   g_param_spec_string ("icon-name",
+                                                        P_("Icon Name"),
+                                                        P_("Name of the themed icon for this window"),
+                                                       NULL,
+                                                        GTK_PARAM_READWRITE));
+  
+  g_object_class_install_property (gobject_class,
+                                  PROP_SCREEN,
+                                  g_param_spec_object ("screen",
+                                                       P_("Screen"),
+                                                       P_("The screen where this window will be displayed"),
+                                                       GDK_TYPE_SCREEN,
+                                                       GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (gobject_class,
+                                   PROP_IS_ACTIVE,
+                                   g_param_spec_boolean ("is-active",
+                                                        P_("Is Active"),
+                                                        P_("Whether the toplevel is the current active window"),
+                                                        FALSE,
+                                                        GTK_PARAM_READABLE));
   
+  g_object_class_install_property (gobject_class,
+                                   PROP_HAS_TOPLEVEL_FOCUS,
+                                   g_param_spec_boolean ("has-toplevel-focus",
+                                                        P_("Focus in Toplevel"),
+                                                        P_("Whether the input focus is within this GtkWindow"),
+                                                        FALSE,
+                                                        GTK_PARAM_READABLE));
+
+  g_object_class_install_property (gobject_class,
+                                  PROP_TYPE_HINT,
+                                  g_param_spec_enum ("type-hint",
+                                                      P_("Type hint"),
+                                                      P_("Hint to help the desktop environment understand what kind of window this is and how to treat it."),
+                                                      GDK_TYPE_WINDOW_TYPE_HINT,
+                                                      GDK_WINDOW_TYPE_HINT_NORMAL,
+                                                      GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (gobject_class,
+                                  PROP_SKIP_TASKBAR_HINT,
+                                  g_param_spec_boolean ("skip-taskbar-hint",
+                                                         P_("Skip taskbar"),
+                                                         P_("TRUE if the window should not be in the task bar."),
+                                                         FALSE,
+                                                         GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (gobject_class,
+                                  PROP_SKIP_PAGER_HINT,
+                                  g_param_spec_boolean ("skip-pager-hint",
+                                                         P_("Skip pager"),
+                                                         P_("TRUE if the window should not be in the pager."),
+                                                         FALSE,
+                                                         GTK_PARAM_READWRITE));  
+
+  g_object_class_install_property (gobject_class,
+                                  PROP_URGENCY_HINT,
+                                  g_param_spec_boolean ("urgency-hint",
+                                                         P_("Urgent"),
+                                                         P_("TRUE if the window should be brought to the user's attention."),
+                                                         FALSE,
+                                                         GTK_PARAM_READWRITE));  
+
+  /**
+   * GtkWindow:accept-focus-hint:
+   *
+   * Whether the window should receive the input focus.
+   *
+   * Since: 2.4
+   */
+  g_object_class_install_property (gobject_class,
+                                  PROP_ACCEPT_FOCUS,
+                                  g_param_spec_boolean ("accept-focus",
+                                                         P_("Accept focus"),
+                                                         P_("TRUE if the window should receive the input focus."),
+                                                         TRUE,
+                                                         GTK_PARAM_READWRITE));  
+
+  /**
+   * GtkWindow:focus-on-map-hint:
+   *
+   * Whether the window should receive the input focus when mapped.
+   *
+   * Since: 2.6
+   */
+  g_object_class_install_property (gobject_class,
+                                  PROP_FOCUS_ON_MAP,
+                                  g_param_spec_boolean ("focus-on-map",
+                                                         P_("Focus on map"),
+                                                         P_("TRUE if the window should receive the input focus when mapped."),
+                                                         TRUE,
+                                                         GTK_PARAM_READWRITE));  
+
+  /**
+   * GtkWindow:decorated:
+   *
+   * Whether the window should be decorated by the window manager.
+   *
+   * Since: 2.4
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_DECORATED,
+                                   g_param_spec_boolean ("decorated",
+                                                        P_("Decorated"),
+                                                        P_("Whether the window should be decorated by the window manager"),
+                                                        TRUE,
+                                                        GTK_PARAM_READWRITE));
+
+  /**
+   * GtkWindow:deletable:
+   *
+   * Whether the window frame should have a close button.
+   *
+   * Since: 2.10
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_DELETABLE,
+                                   g_param_spec_boolean ("deletable",
+                                                        P_("Deletable"),
+                                                        P_("Whether the window frame should have a close button"),
+                                                        TRUE,
+                                                        GTK_PARAM_READWRITE));
+
+
+  /**
+   * GtkWindow:gravity:
+   *
+   * The window gravity of the window. See gtk_window_move() and #GdkGravity for
+   * more details about window gravity.
+   *
+   * Since: 2.4
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_GRAVITY,
+                                   g_param_spec_enum ("gravity",
+                                                     P_("Gravity"),
+                                                     P_("The window gravity of the window"),
+                                                     GDK_TYPE_GRAVITY,
+                                                     GDK_GRAVITY_NORTH_WEST,
+                                                     GTK_PARAM_READWRITE));
+
   window_signals[SET_FOCUS] =
     g_signal_new ("set_focus",
-                  G_TYPE_FROM_CLASS (object_class),
+                  G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkWindowClass, set_focus),
                   NULL, NULL,
@@ -477,7 +681,7 @@ gtk_window_class_init (GtkWindowClass *klass)
   
   window_signals[FRAME_EVENT] =
     g_signal_new ("frame_event",
-                  G_TYPE_FROM_CLASS(object_class),
+                  G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWindowClass, frame_event),
                   _gtk_boolean_handled_accumulator, NULL,
@@ -487,9 +691,9 @@ gtk_window_class_init (GtkWindowClass *klass)
 
   window_signals[ACTIVATE_FOCUS] =
     g_signal_new ("activate_focus",
-                  G_OBJECT_CLASS_TYPE (object_class),
+                  G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                  GTK_SIGNAL_OFFSET (GtkWindowClass, activate_focus),
+                  G_STRUCT_OFFSET (GtkWindowClass, activate_focus),
                   NULL, NULL,
                   _gtk_marshal_VOID__VOID,
                   G_TYPE_NONE,
@@ -497,9 +701,9 @@ gtk_window_class_init (GtkWindowClass *klass)
 
   window_signals[ACTIVATE_DEFAULT] =
     g_signal_new ("activate_default",
-                  G_OBJECT_CLASS_TYPE (object_class),
+                  G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                  GTK_SIGNAL_OFFSET (GtkWindowClass, activate_default),
+                  G_STRUCT_OFFSET (GtkWindowClass, activate_default),
                   NULL, NULL,
                   _gtk_marshal_VOID__VOID,
                   G_TYPE_NONE,
@@ -507,9 +711,9 @@ gtk_window_class_init (GtkWindowClass *klass)
 
   window_signals[MOVE_FOCUS] =
     g_signal_new ("move_focus",
-                  G_OBJECT_CLASS_TYPE (object_class),
+                  G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                  GTK_SIGNAL_OFFSET (GtkWindowClass, move_focus),
+                  G_STRUCT_OFFSET (GtkWindowClass, move_focus),
                   NULL, NULL,
                   _gtk_marshal_VOID__ENUM,
                   G_TYPE_NONE,
@@ -518,11 +722,11 @@ gtk_window_class_init (GtkWindowClass *klass)
 
   window_signals[KEYS_CHANGED] =
     g_signal_new ("keys_changed",
-                  G_OBJECT_CLASS_TYPE (object_class),
+                  G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_FIRST,
-                  GTK_SIGNAL_OFFSET (GtkWindowClass, keys_changed),
+                  G_STRUCT_OFFSET (GtkWindowClass, keys_changed),
                   NULL, NULL,
-                  gtk_marshal_VOID__VOID,
+                  _gtk_marshal_VOID__VOID,
                   G_TYPE_NONE,
                   0);
 
@@ -543,33 +747,10 @@ gtk_window_class_init (GtkWindowClass *klass)
   gtk_binding_entry_add_signal (binding_set, GDK_KP_Enter, 0,
                                 "activate_default", 0);
 
-  gtk_binding_entry_add_signal (binding_set, GDK_Up, 0,
-                                "move_focus", 1,
-                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_UP);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Up, 0,
-                                "move_focus", 1,
-                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_UP);
-
-  gtk_binding_entry_add_signal (binding_set, GDK_Down, 0,
-                                "move_focus", 1,
-                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_DOWN);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Down, 0,
-                                "move_focus", 1,
-                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_DOWN);
-
-  gtk_binding_entry_add_signal (binding_set, GDK_Left, 0,
-                                "move_focus", 1,
-                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_LEFT);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Left, 0,
-                                "move_focus", 1,
-                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_LEFT);  
-
-  gtk_binding_entry_add_signal (binding_set, GDK_Right, 0,
-                                "move_focus", 1,
-                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_RIGHT);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Right, 0,
-                                "move_focus", 1,
-                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_RIGHT);  
+  add_arrow_bindings (binding_set, GDK_Up, GTK_DIR_UP);
+  add_arrow_bindings (binding_set, GDK_Down, GTK_DIR_DOWN);
+  add_arrow_bindings (binding_set, GDK_Left, GTK_DIR_LEFT);
+  add_arrow_bindings (binding_set, GDK_Right, GTK_DIR_RIGHT);
 
   add_tab_bindings (binding_set, 0, GTK_DIR_TAB_FORWARD);
   add_tab_bindings (binding_set, GDK_CONTROL_MASK, GTK_DIR_TAB_FORWARD);
@@ -581,6 +762,7 @@ static void
 gtk_window_init (GtkWindow *window)
 {
   GdkColormap *colormap;
+  GtkWindowPrivate *priv = GTK_WINDOW_GET_PRIVATE (window);
   
   GTK_WIDGET_UNSET_FLAGS (window, GTK_NO_WINDOW);
   GTK_WIDGET_SET_FLAGS (window, GTK_TOPLEVEL);
@@ -615,22 +797,27 @@ gtk_window_init (GtkWindow *window)
   window->gravity = GDK_GRAVITY_NORTH_WEST;
   window->decorated = TRUE;
   window->mnemonic_modifier = GDK_MOD1_MASK;
-  
+  window->screen = gdk_screen_get_default ();
+
+  priv->accept_focus = TRUE;
+  priv->focus_on_map = TRUE;
+  priv->deletable = TRUE;
+
   colormap = _gtk_widget_peek_colormap ();
   if (colormap)
     gtk_widget_set_colormap (GTK_WIDGET (window), colormap);
   
-  gtk_widget_ref (GTK_WIDGET (window));
+  g_object_ref (window);
   gtk_object_sink (GTK_OBJECT (window));
   window->has_user_ref_count = TRUE;
   toplevel_list = g_slist_prepend (toplevel_list, window);
 
   gtk_decorated_window_init (window);
 
-  gtk_signal_connect (GTK_OBJECT (window),
-                     "event",
-                     GTK_SIGNAL_FUNC (gtk_window_event),
-                     NULL);
+  g_signal_connect (window,
+                   "event",
+                   G_CALLBACK (gtk_window_event),
+                   NULL);
 }
 
 static void
@@ -651,6 +838,9 @@ gtk_window_set_property (GObject      *object,
     case PROP_TITLE:
       gtk_window_set_title (window, g_value_get_string (value));
       break;
+    case PROP_ROLE:
+      gtk_window_set_role (window, g_value_get_string (value));
+      break;
     case PROP_ALLOW_SHRINK:
       window->allow_shrink = g_value_get_boolean (value);
       gtk_widget_queue_resize (GTK_WIDGET (window));
@@ -663,7 +853,7 @@ gtk_window_set_property (GObject      *object,
     case PROP_RESIZABLE:
       window->allow_grow = g_value_get_boolean (value);
       gtk_widget_queue_resize (GTK_WIDGET (window));
-      g_object_notify (G_OBJECT (window), "allow_grow");
+      g_object_notify (G_OBJECT (window), "allow-grow");
       break;
     case PROP_MODAL:
       gtk_window_set_modal (window, g_value_get_boolean (value));
@@ -674,12 +864,12 @@ gtk_window_set_property (GObject      *object,
     case PROP_DEFAULT_WIDTH:
       gtk_window_set_default_size_internal (window,
                                             TRUE, g_value_get_int (value),
-                                            FALSE, -1);
+                                            FALSE, -1, FALSE);
       break;
     case PROP_DEFAULT_HEIGHT:
       gtk_window_set_default_size_internal (window,
                                             FALSE, -1,
-                                            TRUE, g_value_get_int (value));
+                                            TRUE, g_value_get_int (value), FALSE);
       break;
     case PROP_DESTROY_WITH_PARENT:
       gtk_window_set_destroy_with_parent (window, g_value_get_boolean (value));
@@ -688,7 +878,45 @@ gtk_window_set_property (GObject      *object,
       gtk_window_set_icon (window,
                            g_value_get_object (value));
       break;
-
+    case PROP_ICON_NAME:
+      gtk_window_set_icon_name (window, g_value_get_string (value));
+      break;
+    case PROP_SCREEN:
+      gtk_window_set_screen (window, g_value_get_object (value));
+      break;
+    case PROP_TYPE_HINT:
+      gtk_window_set_type_hint (window,
+                                g_value_get_enum (value));
+      break;
+    case PROP_SKIP_TASKBAR_HINT:
+      gtk_window_set_skip_taskbar_hint (window,
+                                        g_value_get_boolean (value));
+      break;
+    case PROP_SKIP_PAGER_HINT:
+      gtk_window_set_skip_pager_hint (window,
+                                      g_value_get_boolean (value));
+      break;
+    case PROP_URGENCY_HINT:
+      gtk_window_set_urgency_hint (window,
+                                  g_value_get_boolean (value));
+      break;
+    case PROP_ACCEPT_FOCUS:
+      gtk_window_set_accept_focus (window,
+                                  g_value_get_boolean (value));
+      break;
+    case PROP_FOCUS_ON_MAP:
+      gtk_window_set_focus_on_map (window,
+                                  g_value_get_boolean (value));
+      break;
+    case PROP_DECORATED:
+      gtk_window_set_decorated (window, g_value_get_boolean (value));
+      break;
+    case PROP_DELETABLE:
+      gtk_window_set_deletable (window, g_value_get_boolean (value));
+      break;
+    case PROP_GRAVITY:
+      gtk_window_set_gravity (window, g_value_get_enum (value));
+      break;
     default:
       break;
     }
@@ -710,6 +938,9 @@ gtk_window_get_property (GObject      *object,
     case PROP_TYPE:
       g_value_set_enum (value, window->type);
       break;
+    case PROP_ROLE:
+      g_value_set_string (value, window->wm_role);
+      break;
     case PROP_TITLE:
       g_value_set_string (value, window->title);
       break;
@@ -748,6 +979,51 @@ gtk_window_get_property (GObject      *object,
     case PROP_ICON:
       g_value_set_object (value, gtk_window_get_icon (window));
       break;
+    case PROP_ICON_NAME:
+      g_value_set_string (value, gtk_window_get_icon_name (window));
+      break;
+    case PROP_SCREEN:
+      g_value_set_object (value, window->screen);
+      break;
+    case PROP_IS_ACTIVE:
+      g_value_set_boolean (value, window->is_active);
+      break;
+    case PROP_HAS_TOPLEVEL_FOCUS:
+      g_value_set_boolean (value, window->has_toplevel_focus);
+      break;
+    case PROP_TYPE_HINT:
+      g_value_set_enum (value,
+                        window->type_hint);
+      break;
+    case PROP_SKIP_TASKBAR_HINT:
+      g_value_set_boolean (value,
+                           gtk_window_get_skip_taskbar_hint (window));
+      break;
+    case PROP_SKIP_PAGER_HINT:
+      g_value_set_boolean (value,
+                           gtk_window_get_skip_pager_hint (window));
+      break;
+    case PROP_URGENCY_HINT:
+      g_value_set_boolean (value,
+                           gtk_window_get_urgency_hint (window));
+      break;
+    case PROP_ACCEPT_FOCUS:
+      g_value_set_boolean (value,
+                           gtk_window_get_accept_focus (window));
+      break;
+    case PROP_FOCUS_ON_MAP:
+      g_value_set_boolean (value,
+                           gtk_window_get_focus_on_map (window));
+      break;
+    case PROP_DECORATED:
+      g_value_set_boolean (value, gtk_window_get_decorated (window));
+      break;
+    case PROP_DELETABLE:
+      g_value_set_boolean (value, gtk_window_get_deletable (window));
+      break;
+    case PROP_GRAVITY:
+      g_value_set_enum (value, gtk_window_get_gravity (window));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -780,7 +1056,7 @@ gtk_window_new (GtkWindowType type)
 
   g_return_val_if_fail (type >= GTK_WINDOW_TOPLEVEL && type <= GTK_WINDOW_POPUP, NULL);
 
-  window = gtk_type_new (GTK_TYPE_WINDOW);
+  window = g_object_new (GTK_TYPE_WINDOW, NULL);
 
   window->type = type;
 
@@ -806,11 +1082,13 @@ void
 gtk_window_set_title (GtkWindow   *window,
                      const gchar *title)
 {
+  char *new_title;
+  
   g_return_if_fail (GTK_IS_WINDOW (window));
 
-  if (window->title)
-    g_free (window->title);
-  window->title = g_strdup (title);
+  new_title = g_strdup (title);
+  g_free (window->title);
+  window->title = new_title;
 
   if (GTK_WIDGET_REALIZED (window))
     {
@@ -896,16 +1174,18 @@ void
 gtk_window_set_role (GtkWindow   *window,
                      const gchar *role)
 {
+  char *new_role;
+  
   g_return_if_fail (GTK_IS_WINDOW (window));
 
-  if (role == window->wm_role)
-    return;
-  
+  new_role = g_strdup (role);
   g_free (window->wm_role);
-  window->wm_role = g_strdup (role);
-  
+  window->wm_role = new_role;
+
   if (GTK_WIDGET_REALIZED (window))
-    g_warning ("gtk_window_set_role(): shouldn't set role after window is realized!\n");
+    gdk_window_set_role (GTK_WIDGET (window)->window, window->wm_role);
+
+  g_object_notify (G_OBJECT (window), "role");
 }
 
 /**
@@ -953,7 +1233,22 @@ gtk_window_set_focus (GtkWindow *window,
   if (focus)
     gtk_widget_grab_focus (focus);
   else
-    _gtk_window_internal_set_focus (window, NULL);
+    {
+      /* Clear the existing focus chain, so that when we focus into
+       * the window again, we start at the beginnning.
+       */
+      GtkWidget *widget = window->focus_widget;
+      if (widget)
+       {
+         while (widget->parent)
+           {
+             widget = widget->parent;
+             gtk_container_set_focus_child (GTK_CONTAINER (widget), NULL);
+           }
+       }
+      
+      _gtk_window_internal_set_focus (window, NULL);
+    }
 }
 
 void
@@ -964,7 +1259,7 @@ _gtk_window_internal_set_focus (GtkWindow *window,
 
   if ((window->focus_widget != focus) ||
       (focus && !GTK_WIDGET_HAS_FOCUS (focus)))
-    gtk_signal_emit (GTK_OBJECT (window), window_signals[SET_FOCUS], focus);
+    g_signal_emit (window, window_signals[SET_FOCUS], 0, focus);
 }
 
 /**
@@ -1018,11 +1313,11 @@ gtk_window_set_default (GtkWindow *window,
        }
 
       if (old_default_widget)
-       g_object_notify (G_OBJECT (old_default_widget), "has_default");
+       g_object_notify (G_OBJECT (old_default_widget), "has-default");
       
       if (default_widget)
        {
-         g_object_notify (G_OBJECT (default_widget), "has_default");
+         g_object_notify (G_OBJECT (default_widget), "has-default");
          g_object_unref (default_widget);
        }
     }
@@ -1040,8 +1335,8 @@ gtk_window_set_policy (GtkWindow *window,
   window->allow_grow = (allow_grow != FALSE);
 
   g_object_freeze_notify (G_OBJECT (window));
-  g_object_notify (G_OBJECT (window), "allow_shrink");
-  g_object_notify (G_OBJECT (window), "allow_grow");
+  g_object_notify (G_OBJECT (window), "allow-shrink");
+  g_object_notify (G_OBJECT (window), "allow-grow");
   g_object_notify (G_OBJECT (window), "resizable");
   g_object_thaw_notify (G_OBJECT (window));
   
@@ -1058,7 +1353,7 @@ handle_keys_changed (gpointer data)
 
   if (window->keys_changed_handler)
     {
-      gtk_idle_remove (window->keys_changed_handler);
+      g_source_remove (window->keys_changed_handler);
       window->keys_changed_handler = 0;
     }
 
@@ -1072,7 +1367,7 @@ static void
 gtk_window_notify_keys_changed (GtkWindow *window)
 {
   if (!window->keys_changed_handler)
-    window->keys_changed_handler = gtk_idle_add (handle_keys_changed, window);
+    window->keys_changed_handler = g_idle_add (handle_keys_changed, window);
 }
 
 /**
@@ -1109,124 +1404,90 @@ gtk_window_remove_accel_group (GtkWindow     *window,
                               GtkAccelGroup *accel_group)
 {
   g_return_if_fail (GTK_IS_WINDOW (window));
-  g_return_if_fail (accel_group != NULL);
+  g_return_if_fail (GTK_IS_ACCEL_GROUP (accel_group));
 
   g_signal_handlers_disconnect_by_func (accel_group,
-                                       G_CALLBACK (gtk_window_notify_keys_changed),
+                                       gtk_window_notify_keys_changed,
                                        window);
   _gtk_accel_group_detach (accel_group, G_OBJECT (window));
 }
 
+static GtkMnemonicHash *
+gtk_window_get_mnemonic_hash (GtkWindow *window,
+                             gboolean   create)
+{
+  GtkWindowPrivate *private = GTK_WINDOW_GET_PRIVATE (window);
+  if (!private->mnemonic_hash && create)
+    private->mnemonic_hash = _gtk_mnemonic_hash_new ();
+  
+  return private->mnemonic_hash;
+}
+
+/**
+ * gtk_window_add_mnemonic:
+ * @window: a #GtkWindow
+ * @keyval: the mnemonic
+ * @target: the widget that gets activated by the mnemonic
+ *
+ * Adds a mnemonic to this window.
+ */
 void
 gtk_window_add_mnemonic (GtkWindow *window,
                         guint      keyval,
                         GtkWidget *target)
 {
-  GtkWindowMnemonic key;
-  GtkWindowMnemonic *mnemonic;
-
   g_return_if_fail (GTK_IS_WINDOW (window));
   g_return_if_fail (GTK_IS_WIDGET (target));
-  
-  key.window = window;
-  key.keyval = keyval;
-  mnemonic = g_hash_table_lookup (mnemonic_hash_table, &key);
 
-  if (mnemonic)
-    {
-      g_return_if_fail (g_slist_find (mnemonic->targets, target) == NULL);
-      mnemonic->targets = g_slist_prepend (mnemonic->targets, target);
-    }
-  else
-    {
-      mnemonic = g_new (GtkWindowMnemonic, 1);
-      *mnemonic = key;
-      mnemonic->targets = g_slist_prepend (NULL, target);
-      g_hash_table_insert (mnemonic_hash_table, mnemonic, mnemonic);
-    }
+  _gtk_mnemonic_hash_add (gtk_window_get_mnemonic_hash (window, TRUE),
+                         keyval, target);
   gtk_window_notify_keys_changed (window);
 }
 
+/**
+ * gtk_window_remove_mnemonic:
+ * @window: a #GtkWindow
+ * @keyval: the mnemonic
+ * @target: the widget that gets activated by the mnemonic
+ *
+ * Removes a mnemonic from this window.
+ */
 void
 gtk_window_remove_mnemonic (GtkWindow *window,
                            guint      keyval,
                            GtkWidget *target)
 {
-  GtkWindowMnemonic key;
-  GtkWindowMnemonic *mnemonic;
-
   g_return_if_fail (GTK_IS_WINDOW (window));
   g_return_if_fail (GTK_IS_WIDGET (target));
   
-  key.window = window;
-  key.keyval = keyval;
-  mnemonic = g_hash_table_lookup (mnemonic_hash_table, &key);
-
-  g_return_if_fail (mnemonic && g_slist_find (mnemonic->targets, target) != NULL);
-
-  mnemonic->targets = g_slist_remove (mnemonic->targets, target);
-  if (mnemonic->targets == NULL)
-    {
-      g_hash_table_remove (mnemonic_hash_table, mnemonic);
-      g_free (mnemonic);
-    }
+  _gtk_mnemonic_hash_remove (gtk_window_get_mnemonic_hash (window, TRUE),
+                            keyval, target);
   gtk_window_notify_keys_changed (window);
 }
 
+/**
+ * gtk_window_mnemonic_activate:
+ * @window: a #GtkWindow
+ * @keyval: the mnemonic
+ * @modifier: the modifiers 
+ * @returns: %TRUE if the activation is done. 
+ * 
+ * Activates the targets associated with the mnemonic.
+ */
 gboolean
 gtk_window_mnemonic_activate (GtkWindow      *window,
                              guint           keyval,
                              GdkModifierType modifier)
 {
-  GtkWindowMnemonic key;
-  GtkWindowMnemonic *mnemonic;
-  GSList *list;
-  GtkWidget *widget, *chosen_widget;
-  gboolean overloaded;
-
   g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
 
-  if (window->mnemonic_modifier != (modifier & gtk_accelerator_get_default_mod_mask ()))
-    return FALSE;
-  
-  key.window = window;
-  key.keyval = keyval;
-  mnemonic = g_hash_table_lookup (mnemonic_hash_table, &key);
-
-  if (!mnemonic)
-    return FALSE;
-  
-  overloaded = FALSE;
-  chosen_widget = NULL;
-  list = mnemonic->targets;
-  while (list)
-    {
-      widget = GTK_WIDGET (list->data);
-      
-      if (GTK_WIDGET_IS_SENSITIVE (widget) &&
-         GTK_WIDGET_MAPPED (widget))
-       {
-         if (chosen_widget)
-           {
-             overloaded = TRUE;
-             break;
-           }
-         else
-           chosen_widget = widget;
-       }
-      list = g_slist_next (list);
-    }
-
-  if (chosen_widget)
-    {
-      /* For round robin we put the activated entry on
-       * the end of the list after activation
-       */
-      mnemonic->targets = g_slist_remove (mnemonic->targets, chosen_widget);
-      mnemonic->targets = g_slist_append (mnemonic->targets, chosen_widget);
+  if (window->mnemonic_modifier == (modifier & gtk_accelerator_get_default_mod_mask ()))
+      {
+       GtkMnemonicHash *mnemonic_hash = gtk_window_get_mnemonic_hash (window, FALSE);
+       if (mnemonic_hash)
+         return _gtk_mnemonic_hash_activate (mnemonic_hash, keyval);
+      }
 
-      return gtk_widget_mnemonic_activate (chosen_widget, overloaded);
-    }
   return FALSE;
 }
 
@@ -1300,20 +1561,24 @@ gtk_window_set_position (GtkWindow         *window,
 
   window->position = position;
   
-  g_object_notify (G_OBJECT (window), "window_position");
+  g_object_notify (G_OBJECT (window), "window-position");
 }
 
+/**
+ * gtk_window_activate_focus:
+ * @window: a #GtkWindow
+ * 
+ * Activates the current focused widget within the window.
+ * 
+ * Return value: %TRUE if a widget got activated.
+ **/
 gboolean 
 gtk_window_activate_focus (GtkWindow *window)
 {
   g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
 
-  if (window->focus_widget)
-    {
-      if (GTK_WIDGET_IS_SENSITIVE (window->focus_widget))
-        gtk_widget_activate (window->focus_widget);
-      return TRUE;
-    }
+  if (window->focus_widget && GTK_WIDGET_IS_SENSITIVE (window->focus_widget))
+    return gtk_widget_activate (window->focus_widget);
 
   return FALSE;
 }
@@ -1328,7 +1593,7 @@ gtk_window_activate_focus (GtkWindow *window)
  * is not focused then  <literal>GTK_WIDGET_HAS_FOCUS (widget)</literal> will
  * not be %TRUE for the widget. 
  * 
- * Return value: the currently focused widget.
+ * Return value: the currently focused widget, or %NULL if there is none.
  **/
 GtkWidget *
 gtk_window_get_focus (GtkWindow *window)
@@ -1338,6 +1603,17 @@ gtk_window_get_focus (GtkWindow *window)
   return window->focus_widget;
 }
 
+/**
+ * gtk_window_activate_default:
+ * @window: a #GtkWindow
+ * 
+ * Activates the default widget for the window, unless the current 
+ * focused widget has been configured to receive the default action 
+ * (see #GTK_RECEIVES_DEFAULT in #GtkWidgetFlags), in which case the
+ * focused widget is activated. 
+ * 
+ * Return value: %TRUE if a widget got activated.
+ **/
 gboolean
 gtk_window_activate_default (GtkWindow *window)
 {
@@ -1345,16 +1621,9 @@ gtk_window_activate_default (GtkWindow *window)
 
   if (window->default_widget && GTK_WIDGET_IS_SENSITIVE (window->default_widget) &&
       (!window->focus_widget || !GTK_WIDGET_RECEIVES_DEFAULT (window->focus_widget)))
-    {
-      gtk_widget_activate (window->default_widget);
-      return TRUE;
-    }
-  else if (window->focus_widget)
-    {
-      if (GTK_WIDGET_IS_SENSITIVE (window->focus_widget))
-        gtk_widget_activate (window->focus_widget);
-      return TRUE;
-    }
+    return gtk_widget_activate (window->default_widget);
+  else if (window->focus_widget && GTK_WIDGET_IS_SENSITIVE (window->focus_widget))
+    return gtk_widget_activate (window->focus_widget);
 
   return FALSE;
 }
@@ -1379,13 +1648,30 @@ gtk_window_set_modal (GtkWindow *window,
 {
   g_return_if_fail (GTK_IS_WINDOW (window));
 
-  window->modal = modal != FALSE;
+  modal = modal != FALSE;
+  if (window->modal == modal)
+    return;
+  
+  window->modal = modal;
   
   /* adjust desired modality state */
-  if (GTK_WIDGET_VISIBLE (window) && window->modal)
-    gtk_grab_add (GTK_WIDGET (window));
-  else
-    gtk_grab_remove (GTK_WIDGET (window));
+  if (GTK_WIDGET_REALIZED (window))
+    {
+      GtkWidget *widget = GTK_WIDGET (window);
+      
+      if (window->modal)
+       gdk_window_set_modal_hint (widget->window, TRUE);
+      else
+       gdk_window_set_modal_hint (widget->window, FALSE);
+    }
+
+  if (GTK_WIDGET_VISIBLE (window))
+    {
+      if (window->modal)
+       gtk_grab_add (GTK_WIDGET (window));
+      else
+       gtk_grab_remove (GTK_WIDGET (window));
+    }
 
   g_object_notify (G_OBJECT (window), "modal");
 }
@@ -1438,17 +1724,17 @@ gtk_window_add_embedded_xid (GtkWindow *window, guint xid)
 
   g_return_if_fail (GTK_IS_WINDOW (window));
 
-  embedded_windows = gtk_object_get_data (GTK_OBJECT (window), "gtk-embedded");
+  embedded_windows = g_object_get_data (G_OBJECT (window), "gtk-embedded");
   if (embedded_windows)
-    gtk_object_remove_no_notify_by_id (GTK_OBJECT (window), 
-                                      g_quark_from_static_string ("gtk-embedded"));
+    g_object_steal_qdata (G_OBJECT (window), 
+                         g_quark_from_static_string ("gtk-embedded"));
   embedded_windows = g_list_prepend (embedded_windows,
                                     GUINT_TO_POINTER (xid));
 
-  gtk_object_set_data_full (GTK_OBJECT (window), "gtk-embedded", 
-                           embedded_windows,
-                           embedded_windows ?
-                             (GtkDestroyNotify) g_list_free : NULL);
+  g_object_set_data_full (G_OBJECT (window), "gtk-embedded", 
+                         embedded_windows,
+                         embedded_windows ?
+                           (GDestroyNotify) g_list_free : NULL);
 }
 
 void
@@ -1459,10 +1745,10 @@ gtk_window_remove_embedded_xid (GtkWindow *window, guint xid)
 
   g_return_if_fail (GTK_IS_WINDOW (window));
   
-  embedded_windows = gtk_object_get_data (GTK_OBJECT (window), "gtk-embedded");
+  embedded_windows = g_object_get_data (G_OBJECT (window), "gtk-embedded");
   if (embedded_windows)
-    gtk_object_remove_no_notify_by_id (GTK_OBJECT (window), 
-                                      g_quark_from_static_string ("gtk-embedded"));
+    g_object_steal_qdata (G_OBJECT (window), 
+                         g_quark_from_static_string ("gtk-embedded"));
 
   node = g_list_find (embedded_windows, GUINT_TO_POINTER (xid));
   if (node)
@@ -1471,10 +1757,10 @@ gtk_window_remove_embedded_xid (GtkWindow *window, guint xid)
       g_list_free_1 (node);
     }
   
-  gtk_object_set_data_full (GTK_OBJECT (window), 
-                           "gtk-embedded", embedded_windows,
-                           embedded_windows ?
-                             (GtkDestroyNotify) g_list_free : NULL);
+  g_object_set_data_full (G_OBJECT (window), "gtk-embedded",
+                         embedded_windows,
+                         embedded_windows ?
+                           (GDestroyNotify) g_list_free : NULL);
 }
 
 void       
@@ -1490,11 +1776,7 @@ _gtk_window_reposition (GtkWindow *window,
 static void
 gtk_window_dispose (GObject *object)
 {
-  GtkWindow *window;
-
-  g_return_if_fail (GTK_IS_WINDOW (object));
-
-  window = GTK_WINDOW (object);
+  GtkWindow *window = GTK_WINDOW (object);
 
   gtk_window_set_focus (window, NULL);
   gtk_window_set_default (window, NULL);
@@ -1513,10 +1795,10 @@ connect_parent_destroyed (GtkWindow *window)
 {
   if (window->transient_parent)
     {
-      gtk_signal_connect (GTK_OBJECT (window->transient_parent),
-                          "destroy",
-                          GTK_SIGNAL_FUNC (parent_destroyed_callback),
-                          window);
+      g_signal_connect (window->transient_parent,
+                        "destroy",
+                        G_CALLBACK (parent_destroyed_callback),
+                        window);
     }  
 }
 
@@ -1525,9 +1807,9 @@ disconnect_parent_destroyed (GtkWindow *window)
 {
   if (window->transient_parent)
     {
-      gtk_signal_disconnect_by_func (GTK_OBJECT (window->transient_parent),
-                                     GTK_SIGNAL_FUNC (parent_destroyed_callback),
-                                     window);
+      g_signal_handlers_disconnect_by_func (window->transient_parent,
+                                           parent_destroyed_callback,
+                                           window);
     }
 }
 
@@ -1548,20 +1830,31 @@ gtk_window_transient_parent_unrealized (GtkWidget *parent,
                         gdk_atom_intern ("WM_TRANSIENT_FOR", FALSE));
 }
 
+static void
+gtk_window_transient_parent_screen_changed (GtkWindow  *parent,
+                                           GParamSpec  *pspec,
+                                           GtkWindow   *window)
+{
+  gtk_window_set_screen (window, parent->screen);
+}
+
 static void       
 gtk_window_unset_transient_for  (GtkWindow *window)
 {
   if (window->transient_parent)
     {
-      gtk_signal_disconnect_by_func (GTK_OBJECT (window->transient_parent),
-                                    GTK_SIGNAL_FUNC (gtk_window_transient_parent_realized),
-                                    window);
-      gtk_signal_disconnect_by_func (GTK_OBJECT (window->transient_parent),
-                                    GTK_SIGNAL_FUNC (gtk_window_transient_parent_unrealized),
-                                    window);
-      gtk_signal_disconnect_by_func (GTK_OBJECT (window->transient_parent),
-                                    GTK_SIGNAL_FUNC (gtk_widget_destroyed),
-                                    &window->transient_parent);
+      g_signal_handlers_disconnect_by_func (window->transient_parent,
+                                           gtk_window_transient_parent_realized,
+                                           window);
+      g_signal_handlers_disconnect_by_func (window->transient_parent,
+                                           gtk_window_transient_parent_unrealized,
+                                           window);
+      g_signal_handlers_disconnect_by_func (window->transient_parent,
+                                           gtk_window_transient_parent_screen_changed,
+                                           window);
+      g_signal_handlers_disconnect_by_func (window->transient_parent,
+                                           gtk_widget_destroyed,
+                                           &window->transient_parent);
 
       if (window->destroy_with_parent)
         disconnect_parent_destroyed (window);
@@ -1612,15 +1905,20 @@ gtk_window_set_transient_for  (GtkWindow *window,
 
   if (parent)
     {
-      gtk_signal_connect (GTK_OBJECT (parent), "destroy",
-                         GTK_SIGNAL_FUNC (gtk_widget_destroyed),
-                         &window->transient_parent);
-      gtk_signal_connect (GTK_OBJECT (parent), "realize",
-                         GTK_SIGNAL_FUNC (gtk_window_transient_parent_realized),
-                         window);
-      gtk_signal_connect (GTK_OBJECT (parent), "unrealize",
-                         GTK_SIGNAL_FUNC (gtk_window_transient_parent_unrealized),
-                         window);
+      g_signal_connect (parent, "destroy",
+                       G_CALLBACK (gtk_widget_destroyed),
+                       &window->transient_parent);
+      g_signal_connect (parent, "realize",
+                       G_CALLBACK (gtk_window_transient_parent_realized),
+                       window);
+      g_signal_connect (parent, "unrealize",
+                       G_CALLBACK (gtk_window_transient_parent_unrealized),
+                       window);
+      g_signal_connect (parent, "notify::screen",
+                       G_CALLBACK (gtk_window_transient_parent_screen_changed),
+                       window);
+      
+      gtk_window_set_screen (window, parent->screen);
 
       if (window->destroy_with_parent)
         connect_parent_destroyed (window);
@@ -1691,8 +1989,283 @@ gtk_window_get_type_hint (GtkWindow *window)
 }
 
 /**
- * gtk_window_set_destroy_with_parent:
- * @window: a #GtkWindow
+ * gtk_window_set_skip_taskbar_hint:
+ * @window: a #GtkWindow 
+ * @setting: %TRUE to keep this window from appearing in the task bar
+ * 
+ * Windows may set a hint asking the desktop environment not to display
+ * the window in the task bar. This function sets this hint.
+ * 
+ * Since: 2.2
+ **/
+void
+gtk_window_set_skip_taskbar_hint (GtkWindow *window,
+                                  gboolean   setting)
+{
+  GtkWindowPrivate *priv;
+
+  g_return_if_fail (GTK_IS_WINDOW (window));
+  
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+
+  setting = setting != FALSE;
+
+  if (priv->skips_taskbar != setting)
+    {
+      priv->skips_taskbar = setting;
+      if (GTK_WIDGET_REALIZED (window))
+        gdk_window_set_skip_taskbar_hint (GTK_WIDGET (window)->window,
+                                          priv->skips_taskbar);
+      g_object_notify (G_OBJECT (window), "skip-taskbar-hint");
+    }
+}
+
+/**
+ * gtk_window_get_skip_taskbar_hint:
+ * @window: a #GtkWindow
+ * 
+ * Gets the value set by gtk_window_set_skip_taskbar_hint()
+ * 
+ * Return value: %TRUE if window shouldn't be in taskbar
+ * 
+ * Since: 2.2
+ **/
+gboolean
+gtk_window_get_skip_taskbar_hint (GtkWindow *window)
+{
+  GtkWindowPrivate *priv;
+
+  g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
+  
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+
+  return priv->skips_taskbar;
+}
+
+/**
+ * gtk_window_set_skip_pager_hint:
+ * @window: a #GtkWindow 
+ * @setting: %TRUE to keep this window from appearing in the pager
+ * 
+ * Windows may set a hint asking the desktop environment not to display
+ * the window in the pager. This function sets this hint.
+ * (A "pager" is any desktop navigation tool such as a workspace
+ * switcher that displays a thumbnail representation of the windows
+ * on the screen.)
+ * 
+ * Since: 2.2
+ **/
+void
+gtk_window_set_skip_pager_hint (GtkWindow *window,
+                                gboolean   setting)
+{
+  GtkWindowPrivate *priv;
+
+  g_return_if_fail (GTK_IS_WINDOW (window));
+  
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+
+  setting = setting != FALSE;
+
+  if (priv->skips_pager != setting)
+    {
+      priv->skips_pager = setting;
+      if (GTK_WIDGET_REALIZED (window))
+        gdk_window_set_skip_pager_hint (GTK_WIDGET (window)->window,
+                                        priv->skips_pager);
+      g_object_notify (G_OBJECT (window), "skip-pager-hint");
+    }
+}
+
+/**
+ * gtk_window_get_skip_pager_hint:
+ * @window: a #GtkWindow
+ * 
+ * Gets the value set by gtk_window_set_skip_pager_hint().
+ * 
+ * Return value: %TRUE if window shouldn't be in pager
+ * 
+ * Since: 2.2
+ **/
+gboolean
+gtk_window_get_skip_pager_hint (GtkWindow *window)
+{
+  GtkWindowPrivate *priv;
+
+  g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
+  
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+
+  return priv->skips_pager;
+}
+
+/**
+ * gtk_window_set_urgency_hint:
+ * @window: a #GtkWindow 
+ * @setting: %TRUE to mark this window as urgent
+ * 
+ * Windows may set a hint asking the desktop environment to draw
+ * the users attention to the window. This function sets this hint.
+ * 
+ * Since: 2.8
+ **/
+void
+gtk_window_set_urgency_hint (GtkWindow *window,
+                            gboolean   setting)
+{
+  GtkWindowPrivate *priv;
+
+  g_return_if_fail (GTK_IS_WINDOW (window));
+  
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+
+  setting = setting != FALSE;
+
+  if (priv->urgent != setting)
+    {
+      priv->urgent = setting;
+      if (GTK_WIDGET_REALIZED (window))
+        gdk_window_set_urgency_hint (GTK_WIDGET (window)->window,
+                                    priv->urgent);
+      g_object_notify (G_OBJECT (window), "urgency-hint");
+    }
+}
+
+/**
+ * gtk_window_get_urgency_hint:
+ * @window: a #GtkWindow
+ * 
+ * Gets the value set by gtk_window_set_urgency_hint()
+ * 
+ * Return value: %TRUE if window is urgent
+ * 
+ * Since: 2.8
+ **/
+gboolean
+gtk_window_get_urgency_hint (GtkWindow *window)
+{
+  GtkWindowPrivate *priv;
+
+  g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
+  
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+
+  return priv->urgent;
+}
+
+/**
+ * gtk_window_set_accept_focus:
+ * @window: a #GtkWindow 
+ * @setting: %TRUE to let this window receive input focus
+ * 
+ * Windows may set a hint asking the desktop environment not to receive
+ * the input focus. This function sets this hint.
+ * 
+ * Since: 2.4
+ **/
+void
+gtk_window_set_accept_focus (GtkWindow *window,
+                            gboolean   setting)
+{
+  GtkWindowPrivate *priv;
+
+  g_return_if_fail (GTK_IS_WINDOW (window));
+  
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+
+  setting = setting != FALSE;
+
+  if (priv->accept_focus != setting)
+    {
+      priv->accept_focus = setting;
+      if (GTK_WIDGET_REALIZED (window))
+        gdk_window_set_accept_focus (GTK_WIDGET (window)->window,
+                                    priv->accept_focus);
+      g_object_notify (G_OBJECT (window), "accept-focus");
+    }
+}
+
+/**
+ * gtk_window_get_accept_focus:
+ * @window: a #GtkWindow
+ * 
+ * Gets the value set by gtk_window_set_accept_focus().
+ * 
+ * Return value: %TRUE if window should receive the input focus
+ * 
+ * Since: 2.4
+ **/
+gboolean
+gtk_window_get_accept_focus (GtkWindow *window)
+{
+  GtkWindowPrivate *priv;
+
+  g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
+  
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+
+  return priv->accept_focus;
+}
+
+/**
+ * gtk_window_set_focus_on_map:
+ * @window: a #GtkWindow 
+ * @setting: %TRUE to let this window receive input focus on map
+ * 
+ * Windows may set a hint asking the desktop environment not to receive
+ * the input focus when the window is mapped.  This function sets this
+ * hint.
+ * 
+ * Since: 2.6
+ **/
+void
+gtk_window_set_focus_on_map (GtkWindow *window,
+                            gboolean   setting)
+{
+  GtkWindowPrivate *priv;
+
+  g_return_if_fail (GTK_IS_WINDOW (window));
+  
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+
+  setting = setting != FALSE;
+
+  if (priv->focus_on_map != setting)
+    {
+      priv->focus_on_map = setting;
+      if (GTK_WIDGET_REALIZED (window))
+        gdk_window_set_focus_on_map (GTK_WIDGET (window)->window,
+                                    priv->focus_on_map);
+      g_object_notify (G_OBJECT (window), "focus-on-map");
+    }
+}
+
+/**
+ * gtk_window_get_focus_on_map:
+ * @window: a #GtkWindow
+ * 
+ * Gets the value set by gtk_window_set_focus_on_map().
+ * 
+ * Return value: %TRUE if window should receive the input focus when
+ * mapped.
+ * 
+ * Since: 2.6
+ **/
+gboolean
+gtk_window_get_focus_on_map (GtkWindow *window)
+{
+  GtkWindowPrivate *priv;
+
+  g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
+  
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+
+  return priv->focus_on_map;
+}
+
+/**
+ * gtk_window_set_destroy_with_parent:
+ * @window: a #GtkWindow
  * @setting: whether to destroy @window with its transient parent
  * 
  * If @setting is %TRUE, then destroying the transient parent of @window
@@ -1720,7 +2293,7 @@ gtk_window_set_destroy_with_parent  (GtkWindow *window,
   
   window->destroy_with_parent = setting;
 
-  g_object_notify (G_OBJECT (window), "destroy_with_parent");
+  g_object_notify (G_OBJECT (window), "destroy-with-parent");
 }
 
 /**
@@ -1758,6 +2331,7 @@ gtk_window_get_geometry_info (GtkWindow *window,
       info->initial_x = 0;
       info->initial_y = 0;
       info->initial_pos_set = FALSE;
+      info->default_is_geometry = FALSE;
       info->position_constraints_changed = FALSE;
       info->last.configure_request.x = 0;
       info->last.configure_request.y = 0;
@@ -1792,20 +2366,21 @@ gtk_window_set_geometry_hints (GtkWindow       *window,
 {
   GtkWindowGeometryInfo *info;
 
-  g_return_if_fail (window != NULL);
+  g_return_if_fail (GTK_IS_WINDOW (window));
+  g_return_if_fail (geometry_widget == NULL || GTK_IS_WIDGET (geometry_widget));
 
   info = gtk_window_get_geometry_info (window, TRUE);
   
   if (info->widget)
-    gtk_signal_disconnect_by_func (GTK_OBJECT (info->widget),
-                                  GTK_SIGNAL_FUNC (gtk_widget_destroyed),
-                                  &info->widget);
+    g_signal_handlers_disconnect_by_func (info->widget,
+                                         gtk_widget_destroyed,
+                                         &info->widget);
   
   info->widget = geometry_widget;
   if (info->widget)
-    gtk_signal_connect (GTK_OBJECT (geometry_widget), "destroy",
-                       GTK_SIGNAL_FUNC (gtk_widget_destroyed),
-                       &info->widget);
+    g_signal_connect (geometry_widget, "destroy",
+                     G_CALLBACK (gtk_widget_destroyed),
+                     &info->widget);
 
   if (geometry)
     info->geometry = *geometry;
@@ -1831,7 +2406,9 @@ gtk_window_set_geometry_hints (GtkWindow       *window,
  * managers</link> allow GTK+ to disable these decorations, creating a
  * borderless window. If you set the decorated property to %FALSE
  * using this function, GTK+ will do its best to convince the window
- * manager not to decorate the window.
+ * manager not to decorate the window. Depending on the system, this
+ * function may not have any effect when called on a window that is
+ * already visible, so you should call it before calling gtk_window_show().
  *
  * On Windows, this function always works, since there's no window manager
  * policy involved.
@@ -1859,6 +2436,8 @@ gtk_window_set_decorated (GtkWindow *window,
         gdk_window_set_decorations (GTK_WIDGET (window)->window,
                                     0);
     }
+
+  g_object_notify (G_OBJECT (window), "decorated");
 }
 
 /**
@@ -1878,6 +2457,74 @@ gtk_window_get_decorated (GtkWindow *window)
   return window->decorated;
 }
 
+/**
+ * @window: a #GtkWindow
+ * @setting: %TRUE to decorate the window as deletable
+ *
+ * By default, windows have a close button in the window frame. Some 
+ * <link linkend="gtk-X11-arch">window managers</link> allow GTK+ to 
+ * disable this button. If you set the deletable property to %FALSE
+ * using this function, GTK+ will do its best to convince the window
+ * manager not to show a close button. Depending on the system, this
+ * function may not have any effect when called on a window that is
+ * already visible, so you should call it before calling gtk_window_show().
+ *
+ * On Windows, this function always works, since there's no window manager
+ * policy involved.
+ *
+ * Since: 2.10
+ */
+void
+gtk_window_set_deletable (GtkWindow *window,
+                         gboolean   setting)
+{
+  GtkWindowPrivate *priv;
+
+  g_return_if_fail (GTK_IS_WINDOW (window));
+
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+
+  setting = setting != FALSE;
+
+  if (setting == priv->deletable)
+    return;
+
+  priv->deletable = setting;
+  
+  if (GTK_WIDGET (window)->window)
+    {
+      if (priv->deletable)
+        gdk_window_set_functions (GTK_WIDGET (window)->window,
+                                 GDK_FUNC_ALL);
+      else
+        gdk_window_set_functions (GTK_WIDGET (window)->window,
+                                 GDK_FUNC_ALL | GDK_FUNC_CLOSE);
+    }
+
+  g_object_notify (G_OBJECT (window), "deletable");  
+}
+
+/**
+ * gtk_window_get_deletable:
+ * @window: a #GtkWindow
+ *
+ * Returns whether the window has been set to have a close button
+ * via gtk_window_set_deletable().
+ *
+ * Return value: %TRUE if the window has been set to have a close button
+ **/
+gboolean
+gtk_window_get_deletable (GtkWindow *window)
+{
+  GtkWindowPrivate *priv;
+
+  g_return_val_if_fail (GTK_IS_WINDOW (window), TRUE);
+
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+
+  return priv->deletable;
+}
+
 static GtkWindowIconInfo*
 get_icon_info (GtkWindow *window)
 {
@@ -1885,6 +2532,14 @@ get_icon_info (GtkWindow *window)
                             "gtk-window-icon-info");
 }
      
+static void
+free_icon_info (GtkWindowIconInfo *info)
+{
+  g_free (info->icon_name);
+  g_free (info);
+}
+
+
 static GtkWindowIconInfo*
 ensure_icon_info (GtkWindow *window)
 {
@@ -1898,46 +2553,85 @@ ensure_icon_info (GtkWindow *window)
       g_object_set_data_full (G_OBJECT (window),
                               "gtk-window-icon-info",
                               info,
-                              g_free);
+                              (GDestroyNotify)free_icon_info);
     }
 
   return info;
 }
 
+typedef struct {
+  guint serial;
+  GdkPixmap *pixmap;
+  GdkPixmap *mask;
+} ScreenIconInfo;
+
+static ScreenIconInfo *
+get_screen_icon_info (GdkScreen *screen)
+{
+  ScreenIconInfo *info = g_object_get_data (G_OBJECT (screen), 
+                                           "gtk-window-default-icon-pixmap");
+  if (!info)
+    {
+      info = g_new0 (ScreenIconInfo, 1);
+      g_object_set_data (G_OBJECT (screen), "gtk-window-default-icon-pixmap", info);
+    }
+
+  if (info->serial != default_icon_serial)
+    {
+      if (info->pixmap)
+       {
+         g_object_remove_weak_pointer (G_OBJECT (info->pixmap), (gpointer*)&info->pixmap);
+         info->pixmap = NULL;
+       }
+         
+      if (info->mask)
+       {
+         g_object_remove_weak_pointer (G_OBJECT (info->mask), (gpointer*)&info->mask);
+         info->mask = NULL;
+       }
+
+      info->serial = default_icon_serial;
+    }
+  
+  return info;
+}
+
 static void
-get_pixmap_and_mask (GtkWindowIconInfo  *parent_info,
+get_pixmap_and_mask (GdkWindow         *window,
+                    GtkWindowIconInfo  *parent_info,
                      gboolean            is_default_list,
                      GList              *icon_list,
                      GdkPixmap         **pmap_return,
                      GdkBitmap         **mask_return)
 {
+  GdkScreen *screen = gdk_drawable_get_screen (window);
+  ScreenIconInfo *default_icon_info = get_screen_icon_info (screen);
   GdkPixbuf *best_icon;
   GList *tmp_list;
   int best_size;
-
+  
   *pmap_return = NULL;
   *mask_return = NULL;
   
   if (is_default_list &&
-      default_icon_pixmap != NULL)
+      default_icon_info->pixmap != NULL)
     {
-      /* Use shared icon pixmap (eventually will be stored on the
-       * GdkScreen)
+      /* Use shared icon pixmap for all windows on this screen.
        */
-      if (default_icon_pixmap)
-        g_object_ref (G_OBJECT (default_icon_pixmap));
-      if (default_icon_mask)
-        g_object_ref (G_OBJECT (default_icon_mask));
-      
-      *pmap_return = default_icon_pixmap;
-      *mask_return = default_icon_mask;
+      if (default_icon_info->pixmap)
+        g_object_ref (default_icon_info->pixmap);
+      if (default_icon_info->mask)
+        g_object_ref (default_icon_info->mask);
+
+      *pmap_return = default_icon_info->pixmap;
+      *mask_return = default_icon_info->mask;
     }
   else if (parent_info && parent_info->icon_pixmap)
     {
       if (parent_info->icon_pixmap)
-        g_object_ref (G_OBJECT (parent_info->icon_pixmap));
+        g_object_ref (parent_info->icon_pixmap);
       if (parent_info->icon_mask)
-        g_object_ref (G_OBJECT (parent_info->icon_mask));
+        g_object_ref (parent_info->icon_mask);
       
       *pmap_return = parent_info->icon_pixmap;
       *mask_return = parent_info->icon_mask;
@@ -1984,7 +2678,7 @@ get_pixmap_and_mask (GtkWindowIconInfo  *parent_info,
 
       if (best_icon)
         gdk_pixbuf_render_pixmap_and_mask_for_colormap (best_icon,
-                                                       gdk_colormap_get_system (),
+                                                       gdk_screen_get_system_colormap (screen),
                                                        pmap_return,
                                                        mask_return,
                                                        128);
@@ -1996,32 +2690,71 @@ get_pixmap_and_mask (GtkWindowIconInfo  *parent_info,
           parent_info->icon_mask = *mask_return;
 
           if (parent_info->icon_pixmap)
-            g_object_ref (G_OBJECT (parent_info->icon_pixmap));
+            g_object_ref (parent_info->icon_pixmap);
           if (parent_info->icon_mask)
-            g_object_ref (G_OBJECT (parent_info->icon_mask));
+            g_object_ref (parent_info->icon_mask);
         }
       else if (is_default_list)
         {
-          default_icon_pixmap = *pmap_return;
-          default_icon_mask = *mask_return;
-
-          if (default_icon_pixmap)
-            g_object_add_weak_pointer (G_OBJECT (default_icon_pixmap),
-                                       (gpointer*)&default_icon_pixmap);
-          if (default_icon_mask)
-            g_object_add_weak_pointer (G_OBJECT (default_icon_mask),
-                                       (gpointer*)&default_icon_mask);
+          default_icon_info->pixmap = *pmap_return;
+          default_icon_info->mask = *mask_return;
+
+          if (default_icon_info->pixmap)
+           g_object_add_weak_pointer (G_OBJECT (default_icon_info->pixmap),
+                                      (gpointer*)&default_icon_info->pixmap);
+          if (default_icon_info->mask) 
+           g_object_add_weak_pointer (G_OBJECT (default_icon_info->mask),
+                                      (gpointer*)&default_icon_info->mask);
         }
     }
 }
 
+static GList *
+icon_list_from_theme (GtkWidget    *widget,
+                     const gchar  *name)
+{
+  GList *list;
+
+  GtkIconTheme *icon_theme;
+  GdkPixbuf *icon;
+  gint *sizes;
+  gint i;
+
+  icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (widget));
+
+  sizes = gtk_icon_theme_get_icon_sizes (icon_theme, name);
+
+  list = NULL;
+  for (i = 0; sizes[i]; i++)
+    {      
+      /* FIXME
+       * We need an EWMH extension to handle scalable icons 
+       * by passing their name to the WM. For now just use a 
+       * fixed size of 48.
+       */ 
+      if (sizes[i] == -1)
+       icon = gtk_icon_theme_load_icon (icon_theme, name,
+                                        48, 0, NULL);
+      else
+       icon = gtk_icon_theme_load_icon (icon_theme, name,
+                                        sizes[i], 0, NULL);
+      if (icon)
+       list = g_list_append (list, icon);
+    }
+
+  g_free (sizes);
+
+  return list;
+}
+
+
 static void
 gtk_window_realize_icon (GtkWindow *window)
 {
   GtkWidget *widget;
   GtkWindowIconInfo *info;
   GList *icon_list;
-  
+
   widget = GTK_WIDGET (window);
 
   g_return_if_fail (widget->window != NULL);
@@ -2042,9 +2775,18 @@ gtk_window_realize_icon (GtkWindow *window)
   
   info->using_default_icon = FALSE;
   info->using_parent_icon = FALSE;
+  info->using_themed_icon = FALSE;
   
   icon_list = info->icon_list;
-  
+
+  /* Look up themed icon */
+  if (icon_list == NULL && info->icon_name) 
+    {
+      icon_list = icon_list_from_theme (widget, info->icon_name);
+      if (icon_list)
+       info->using_themed_icon = TRUE;
+    }
+
   /* Inherit from transient parent */
   if (icon_list == NULL && window->transient_parent)
     {
@@ -2060,11 +2802,19 @@ gtk_window_realize_icon (GtkWindow *window)
       if (icon_list)
         info->using_default_icon = TRUE;
     }
+
+  /* Look up themed icon */
+  if (icon_list == NULL && default_icon_name) 
+    {
+      icon_list = icon_list_from_theme (widget, default_icon_name);
+      info->using_default_icon = TRUE;
+      info->using_themed_icon = TRUE;  
+    }
   
   gdk_window_set_icon_list (widget->window, icon_list);
 
-  get_pixmap_and_mask (info->using_parent_icon ?
-                       ensure_icon_info (window->transient_parent) : NULL,
+  get_pixmap_and_mask (widget->window,
+                      info->using_parent_icon ? ensure_icon_info (window->transient_parent) : NULL,
                        info->using_default_icon,
                        icon_list,
                        &info->icon_pixmap,
@@ -2079,6 +2829,18 @@ gtk_window_realize_icon (GtkWindow *window)
                        info->icon_mask);
 
   info->realized = TRUE;
+  
+  if (info->using_themed_icon) 
+    {
+      GtkIconTheme *icon_theme;
+
+      g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
+      g_list_free (icon_list);
+      icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (window)));
+      g_signal_connect (icon_theme, "changed",
+                       G_CALLBACK (update_themed_icon), window);
+    }
 }
 
 static void
@@ -2095,19 +2857,29 @@ gtk_window_unrealize_icon (GtkWindow *window)
     return;
   
   if (info->icon_pixmap)
-    g_object_unref (G_OBJECT (info->icon_pixmap));
+    g_object_unref (info->icon_pixmap);
 
   if (info->icon_mask)
-    g_object_unref (G_OBJECT (info->icon_mask));
+    g_object_unref (info->icon_mask);
 
   info->icon_pixmap = NULL;
   info->icon_mask = NULL;
 
+  if (info->using_themed_icon)
+    {
+      GtkIconTheme *icon_theme;
+
+      icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (window)));
+
+      g_signal_handlers_disconnect_by_func (icon_theme, update_themed_icon, window);
+    }
+    
   /* We don't clear the properties on the window, just figure the
    * window is going away.
    */
 
   info->realized = FALSE;
+
 }
 
 /**
@@ -2153,14 +2925,15 @@ gtk_window_set_icon_list (GtkWindow  *window,
   if (info->icon_list == list) /* check for NULL mostly */
     return;
 
+  g_list_foreach (list,
+                  (GFunc) g_object_ref, NULL);
+
   g_list_foreach (info->icon_list,
                   (GFunc) g_object_unref, NULL);
 
   g_list_free (info->icon_list);
 
   info->icon_list = g_list_copy (list);
-  g_list_foreach (info->icon_list,
-                  (GFunc) g_object_ref, NULL);
 
   g_object_notify (G_OBJECT (window), "icon");
   
@@ -2171,7 +2944,7 @@ gtk_window_set_icon_list (GtkWindow  *window,
 
   /* We could try to update our transient children, but I don't think
    * it's really worth it. If we did it, the best way would probably
-   * be to have children connect to notify::icon_list
+   * be to have children connect to notify::icon-list
    */
 }
 
@@ -2234,11 +3007,88 @@ gtk_window_set_icon (GtkWindow  *window,
   g_return_if_fail (icon == NULL || GDK_IS_PIXBUF (icon));
 
   list = NULL;
-  list = g_list_append (list, icon);
+
+  if (icon)
+    list = g_list_append (list, icon);
+  
   gtk_window_set_icon_list (window, list);
   g_list_free (list);  
 }
 
+
+static void 
+update_themed_icon (GtkIconTheme *icon_theme,
+                   GtkWindow    *window)
+{
+  g_object_notify (G_OBJECT (window), "icon");
+  
+  gtk_window_unrealize_icon (window);
+  
+  if (GTK_WIDGET_REALIZED (window))
+    gtk_window_realize_icon (window);  
+}
+
+/**
+ * gtk_window_set_icon_name:
+ * @window: a #GtkWindow
+ * @name: the name of the themed icon
+ *
+ * Sets the icon for the window from a named themed icon. See
+ * the docs for #GtkIconTheme for more details. 
+ * 
+ * Note that this has nothing to do with the WM_ICON_NAME 
+ * property which is mentioned in the ICCCM.
+ *
+ * Since: 2.6
+ */
+void 
+gtk_window_set_icon_name (GtkWindow   *window,
+                         const gchar *name)
+{
+  GtkWindowIconInfo *info;
+  gchar *tmp;
+  
+  g_return_if_fail (GTK_IS_WINDOW (window));
+
+  info = ensure_icon_info (window);
+
+  tmp = info->icon_name;
+  info->icon_name = g_strdup (name);
+  g_free (tmp);
+
+  g_list_foreach (info->icon_list, (GFunc) g_object_unref, NULL);
+  g_list_free (info->icon_list);
+  info->icon_list = NULL;
+  
+  update_themed_icon (NULL, window);
+
+  g_object_notify (G_OBJECT (window), "icon-name");
+}
+
+/**
+ * gtk_window_get_icon_name:
+ * @window: a #GtkWindow
+ *
+ * Returns the name of the themed icon for the window,
+ * see gtk_window_set_icon_name().
+ *
+ * Returns: the icon name or %NULL if the window has 
+ * no themed icon
+ *
+ * Since: 2.6
+ */
+G_CONST_RETURN gchar *
+gtk_window_get_icon_name (GtkWindow *window)
+{
+  GtkWindowIconInfo *info;
+
+  g_return_val_if_fail (GTK_IS_WINDOW (window), NULL);
+
+  info = ensure_icon_info (window);
+
+  return info->icon_name;
+}
+
 /**
  * gtk_window_get_icon:
  * @window: a #GtkWindow
@@ -2254,11 +3104,73 @@ gtk_window_get_icon (GtkWindow  *window)
 {
   GtkWindowIconInfo *info;
 
+  g_return_val_if_fail (GTK_IS_WINDOW (window), NULL);
+
   info = get_icon_info (window);
   if (info && info->icon_list)
     return GDK_PIXBUF (info->icon_list->data);
   else
-    return NULL;
+    return NULL;
+}
+
+/* Load pixbuf, printing warning on failure if error == NULL
+ */
+static GdkPixbuf *
+load_pixbuf_verbosely (const char *filename,
+                      GError    **err)
+{
+  GError *local_err = NULL;
+  GdkPixbuf *pixbuf;
+
+  pixbuf = gdk_pixbuf_new_from_file (filename, &local_err);
+
+  if (!pixbuf)
+    {
+      if (err)
+       *err = local_err;
+      else
+       {
+         g_warning ("Error loading icon from file '%s':\n\t%s",
+                    filename, local_err->message);
+         g_error_free (local_err);
+       }
+    }
+
+  return pixbuf;
+}
+
+/**
+ * gtk_window_set_icon_from_file:
+ * @window: a #GtkWindow
+ * @filename: location of icon file
+ * @err: location to store error, or %NULL.
+ *
+ * Sets the icon for @window.  
+ * Warns on failure if @err is %NULL.
+ *
+ * This function is equivalent to calling gtk_window_set_icon()
+ * with a pixbuf created by loading the image from @filename.
+ *
+ * Returns: %TRUE if setting the icon succeeded.
+ *
+ * Since: 2.2
+ **/
+gboolean
+gtk_window_set_icon_from_file (GtkWindow   *window,
+                              const gchar *filename,
+                              GError     **err)
+{
+  GdkPixbuf *pixbuf = load_pixbuf_verbosely (filename, err);
+
+  if (pixbuf)
+    {
+      gtk_window_set_icon (window, pixbuf);
+      g_object_unref (pixbuf);
+      
+      return TRUE;
+    }
+  else
+    return FALSE;
 }
 
 /**
@@ -2281,22 +3193,19 @@ gtk_window_set_default_icon_list (GList *list)
   if (list == default_icon_list)
     return;
 
-  if (default_icon_pixmap)
-    g_object_unref (G_OBJECT (default_icon_pixmap));
-  if (default_icon_mask)
-    g_object_unref (G_OBJECT (default_icon_mask));
-
-  default_icon_pixmap = NULL;
-  default_icon_mask = NULL;
+  /* Update serial so we don't used cached pixmaps/masks
+   */
+  default_icon_serial++;
   
+  g_list_foreach (list,
+                  (GFunc) g_object_ref, NULL);
+
   g_list_foreach (default_icon_list,
                   (GFunc) g_object_unref, NULL);
 
   g_list_free (default_icon_list);
 
   default_icon_list = g_list_copy (list);
-  g_list_foreach (default_icon_list,
-                  (GFunc) g_object_ref, NULL);
   
   /* Update all toplevels */
   toplevels = gtk_window_list_toplevels ();
@@ -2319,6 +3228,107 @@ gtk_window_set_default_icon_list (GList *list)
   g_list_free (toplevels);
 }
 
+/**
+ * gtk_window_set_default_icon:
+ * @icon: the icon
+ *
+ * Sets an icon to be used as fallback for windows that haven't
+ * had gtk_window_set_icon() called on them from a pixbuf.
+ *
+ * Since: 2.4
+ **/
+void
+gtk_window_set_default_icon (GdkPixbuf *icon)
+{
+  GList *list;
+  
+  g_return_if_fail (GDK_IS_PIXBUF (icon));
+
+  list = g_list_prepend (NULL, icon);
+  gtk_window_set_default_icon_list (list);
+  g_list_free (list);
+}
+
+/**
+ * gtk_window_set_default_icon_name:
+ * @name: the name of the themed icon
+ * 
+ * Sets an icon to be used as fallback for windows that haven't
+ * had gtk_window_set_icon_list() called on them from a named
+ * themed icon, see gtk_window_set_icon_name().
+ *
+ * Since: 2.6
+ **/
+void
+gtk_window_set_default_icon_name (const gchar *name)
+{
+  GList *tmp_list;
+  GList *toplevels;
+
+  /* Update serial so we don't used cached pixmaps/masks
+   */
+  default_icon_serial++;
+
+  g_free (default_icon_name);
+  default_icon_name = g_strdup (name);
+
+  g_list_foreach (default_icon_list,
+                  (GFunc) g_object_unref, NULL);
+
+  g_list_free (default_icon_list);
+  default_icon_list = NULL;
+  
+  /* Update all toplevels */
+  toplevels = gtk_window_list_toplevels ();
+  tmp_list = toplevels;
+  while (tmp_list != NULL)
+    {
+      GtkWindowIconInfo *info;
+      GtkWindow *w = tmp_list->data;
+      
+      info = get_icon_info (w);
+      if (info && info->using_default_icon && info->using_themed_icon)
+        {
+          gtk_window_unrealize_icon (w);
+          if (GTK_WIDGET_REALIZED (w))
+            gtk_window_realize_icon (w);
+        }
+
+      tmp_list = tmp_list->next;
+    }
+  g_list_free (toplevels);
+}
+
+/**
+ * gtk_window_set_default_icon_from_file:
+ * @filename: location of icon file
+ * @err: location to store error, or %NULL.
+ *
+ * Sets an icon to be used as fallback for windows that haven't
+ * had gtk_window_set_icon_list() called on them from a file
+ * on disk. Warns on failure if @err is %NULL.
+ *
+ * Returns: %TRUE if setting the icon succeeded.
+ *
+ * Since: 2.2
+ **/
+gboolean
+gtk_window_set_default_icon_from_file (const gchar *filename,
+                                      GError     **err)
+{
+  GdkPixbuf *pixbuf = load_pixbuf_verbosely (filename, err);
+
+  if (pixbuf)
+    {
+      gtk_window_set_default_icon (pixbuf);
+      g_object_unref (pixbuf);
+      
+      return TRUE;
+    }
+  else
+    return FALSE;
+}
+
 /**
  * gtk_window_get_default_icon_list:
  * 
@@ -2340,11 +3350,11 @@ gtk_window_set_default_size_internal (GtkWindow    *window,
                                       gboolean      change_width,
                                       gint          width,
                                       gboolean      change_height,
-                                      gint          height)
+                                      gint          height,
+                                     gboolean      is_geometry)
 {
   GtkWindowGeometryInfo *info;
 
-  g_return_if_fail (GTK_IS_WINDOW (window));
   g_return_if_fail (change_width == FALSE || width >= -1);
   g_return_if_fail (change_height == FALSE || height >= -1);
 
@@ -2352,6 +3362,8 @@ gtk_window_set_default_size_internal (GtkWindow    *window,
 
   g_object_freeze_notify (G_OBJECT (window));
 
+  info->default_is_geometry = is_geometry != FALSE;
+
   if (change_width)
     {
       if (width == 0)
@@ -2362,7 +3374,7 @@ gtk_window_set_default_size_internal (GtkWindow    *window,
 
       info->default_width = width;
 
-      g_object_notify (G_OBJECT (window), "default_width");
+      g_object_notify (G_OBJECT (window), "default-width");
     }
 
   if (change_height)
@@ -2375,7 +3387,7 @@ gtk_window_set_default_size_internal (GtkWindow    *window,
 
       info->default_height = height;
       
-      g_object_notify (G_OBJECT (window), "default_height");
+      g_object_notify (G_OBJECT (window), "default-height");
     }
   
   g_object_thaw_notify (G_OBJECT (window));
@@ -2406,11 +3418,6 @@ gtk_window_set_default_size_internal (GtkWindow    *window,
  * For more control over a window's initial size and how resizing works,
  * investigate gtk_window_set_geometry_hints().
  *
- * A useful feature: if you set the "geometry widget" via
- * gtk_window_set_geometry_hints(), the default size specified by
- * gtk_window_set_default_size() will be the default size of that
- * widget, not of the entire window.
- *
  * For some uses, gtk_window_resize() is a more appropriate function.
  * gtk_window_resize() changes the current size of the window, rather
  * than the size to be used on initial display. gtk_window_resize() always
@@ -2432,7 +3439,7 @@ gtk_window_set_default_size (GtkWindow   *window,
   g_return_if_fail (width >= -1);
   g_return_if_fail (height >= -1);
 
-  gtk_window_set_default_size_internal (window, TRUE, width, TRUE, height);
+  gtk_window_set_default_size_internal (window, TRUE, width, TRUE, height, FALSE);
 }
 
 /**
@@ -2459,17 +3466,17 @@ gtk_window_get_default_size (GtkWindow *window,
   info = gtk_window_get_geometry_info (window, FALSE);
 
   if (width)
-    *width = info->default_width;
+    *width = info ? info->default_width : -1;
 
   if (height)
-    *height = info->default_height;
+    *height = info ? info->default_height : -1;
 }
 
 /**
  * gtk_window_resize:
  * @window: a #GtkWindow
- * @width: width to resize the window to
- * @height: height to resize the window to
+ * @width: width in pixels to resize the window to
+ * @height: height in pixels to resize the window to
  *
  * Resizes the window as if the user had done so, obeying geometry
  * constraints. The default geometry constraint is that windows may
@@ -2627,9 +3634,9 @@ gtk_window_get_size (GtkWindow *window,
  * <literal>gtk_window_move (window, gdk_screen_width () - window_width,
  * gdk_screen_height () - window_height)</literal>.
  *
- * The extended window manager hints specification at <ulink 
- * url="http://www.freedesktop.org/standards/wm-spec.html"
- * >http://www.freedesktop.org/standards/wm-spec.html</ulink> has a 
+ * The Extended Window Manager Hints specification at <ulink 
+ * url="http://www.freedesktop.org/Standards/wm-spec">
+ * http://www.freedesktop.org/Standards/wm-spec</ulink> has a 
  * nice table of gravities in the "implementation notes" section.
  *
  * The gtk_window_get_position() documentation may also be relevant.
@@ -2887,12 +3894,10 @@ gtk_window_reshow_with_initial_size (GtkWindow *window)
 static void
 gtk_window_destroy (GtkObject *object)
 {
-  GtkWindow *window;
-
-  g_return_if_fail (GTK_IS_WINDOW (object));
-
-  window = GTK_WINDOW (object);
+  GtkWindow *window = GTK_WINDOW (object);
   
+  toplevel_list = g_slist_remove (toplevel_list, window);
+
   if (window->transient_parent)
     gtk_window_set_transient_for (window, NULL);
 
@@ -2902,72 +3907,44 @@ gtk_window_destroy (GtkObject *object)
   if (window->has_user_ref_count)
     {
       window->has_user_ref_count = FALSE;
-      gtk_widget_unref (GTK_WIDGET (window));
+      g_object_unref (window);
     }
 
   if (window->group)
     gtk_window_group_remove_window (window->group, window);
 
-  GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-static gboolean
-gtk_window_mnemonic_hash_remove (gpointer      key,
-                                gpointer       value,
-                                gpointer       user)
-{
-  GtkWindowMnemonic *mnemonic = key;
-  GtkWindow *window = user;
-
-  if (mnemonic->window == window)
-    {
-      if (mnemonic->targets)
-       {
-         gchar *name = gtk_accelerator_name (mnemonic->keyval, 0);
+   gtk_window_free_key_hash (window);
 
-         g_warning ("mnemonic \"%s\" wasn't removed for widget (%p)",
-                    name, mnemonic->targets->data);
-         g_free (name);
-       }
-      g_slist_free (mnemonic->targets);
-      g_free (mnemonic);
-      
-      return TRUE;
-    }
-  return FALSE;
+   GTK_OBJECT_CLASS (parent_class)->destroy (object);
 }
 
 static void
 gtk_window_finalize (GObject *object)
 {
-  GtkWindow *window;
-
-  g_return_if_fail (GTK_IS_WINDOW (object));
-
-  window = GTK_WINDOW (object);
-
-  toplevel_list = g_slist_remove (toplevel_list, window);
+  GtkWindow *window = GTK_WINDOW (object);
+  GtkMnemonicHash *mnemonic_hash;
 
   g_free (window->title);
   g_free (window->wmclass_name);
   g_free (window->wmclass_class);
   g_free (window->wm_role);
 
-  g_hash_table_foreach_remove (mnemonic_hash_table,
-                              gtk_window_mnemonic_hash_remove,
-                              window);
+  mnemonic_hash = gtk_window_get_mnemonic_hash (window, FALSE);
+  if (mnemonic_hash)
+    _gtk_mnemonic_hash_free (mnemonic_hash);
+
   if (window->geometry_info)
     {
       if (window->geometry_info->widget)
-       gtk_signal_disconnect_by_func (GTK_OBJECT (window->geometry_info->widget),
-                                      GTK_SIGNAL_FUNC (gtk_widget_destroyed),
-                                      &window->geometry_info->widget);
+       g_signal_handlers_disconnect_by_func (window->geometry_info->widget,
+                                             gtk_widget_destroyed,
+                                             &window->geometry_info->widget);
       g_free (window->geometry_info);
     }
 
   if (window->keys_changed_handler)
     {
-      gtk_idle_remove (window->keys_changed_handler);
+      g_source_remove (window->keys_changed_handler);
       window->keys_changed_handler = 0;
     }
 
@@ -3037,9 +4014,11 @@ gtk_window_show (GtkWidget *widget)
        * then we created it with widget->allocation anyhow.
        */
       if (!was_realized)
-       gdk_window_resize (widget->window,
-                           configure_request.width,
-                           configure_request.height);
+       gdk_window_move_resize (widget->window,
+                               configure_request.x,
+                               configure_request.y,
+                               configure_request.width,
+                               configure_request.height);
     }
   
   gtk_container_check_resize (container);
@@ -3048,7 +4027,7 @@ gtk_window_show (GtkWidget *widget)
 
   /* Try to make sure that we have some focused widget
    */
-  if (!window->focus_widget)
+  if (!window->focus_widget && !GTK_IS_PLUG (window))
     gtk_window_move_focus (window, GTK_DIR_TAB_FORWARD);
   
   if (window->modal)
@@ -3058,11 +4037,7 @@ gtk_window_show (GtkWidget *widget)
 static void
 gtk_window_hide (GtkWidget *widget)
 {
-  GtkWindow *window;
-
-  g_return_if_fail (GTK_IS_WINDOW (widget));
-
-  window = GTK_WINDOW (widget);
+  GtkWindow *window = GTK_WINDOW (widget);
 
   GTK_WIDGET_UNSET_FLAGS (widget, GTK_VISIBLE);
   gtk_widget_unmap (widget);
@@ -3074,15 +4049,12 @@ gtk_window_hide (GtkWidget *widget)
 static void
 gtk_window_map (GtkWidget *widget)
 {
-  GtkWindow *window;
+  GtkWindow *window = GTK_WINDOW (widget);
+  GtkWindowPrivate *priv = GTK_WINDOW_GET_PRIVATE (window);
   GdkWindow *toplevel;
-  
-  g_return_if_fail (GTK_IS_WINDOW (widget));
 
   GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
 
-  window = GTK_WINDOW (widget);
-
   if (window->bin.child &&
       GTK_WIDGET_VISIBLE (window->bin.child) &&
       !GTK_WIDGET_MAPPED (window->bin.child))
@@ -3108,6 +4080,15 @@ gtk_window_map (GtkWidget *widget)
   else
     gdk_window_deiconify (toplevel);
 
+  if (priv->fullscreen_initially)
+    gdk_window_fullscreen (toplevel);
+  else
+    gdk_window_unfullscreen (toplevel);
+  
+  gdk_window_set_keep_above (toplevel, priv->above_initially);
+
+  gdk_window_set_keep_below (toplevel, priv->below_initially);
+
   /* No longer use the default settings */
   window->need_default_size = FALSE;
   window->need_default_position = FALSE;
@@ -3116,15 +4097,22 @@ gtk_window_map (GtkWidget *widget)
 
   if (window->frame)
     gdk_window_show (window->frame);
+
+  if (!disable_startup_notification &&
+      !sent_startup_notification)
+    {
+      sent_startup_notification = TRUE;
+      gdk_notify_startup_complete ();
+    }
 }
 
 static void
 gtk_window_unmap (GtkWidget *widget)
 {
-  GtkWindow *window;
+  GtkWindow *window = GTK_WINDOW (widget);
+  GtkWindowPrivate *priv = GTK_WINDOW_GET_PRIVATE (widget);
   GtkWindowGeometryInfo *info;    
-  window = GTK_WINDOW (widget);
+  GdkWindowState state;
 
   GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
   if (window->frame)
@@ -3147,6 +4135,13 @@ gtk_window_unmap (GtkWidget *widget)
       info->initial_pos_set = FALSE;
       info->position_constraints_changed = FALSE;
     }
+
+  state = gdk_window_get_state (widget->window);
+  window->iconify_initially = state & GDK_WINDOW_STATE_ICONIFIED;
+  window->maximize_initially = state & GDK_WINDOW_STATE_MAXIMIZED;
+  window->stick_initially = state & GDK_WINDOW_STATE_STICKY;
+  priv->above_initially = state & GDK_WINDOW_STATE_ABOVE;
+  priv->below_initially = state & GDK_WINDOW_STATE_BELOW;
 }
 
 static void
@@ -3156,11 +4151,12 @@ gtk_window_realize (GtkWidget *widget)
   GdkWindow *parent_window;
   GdkWindowAttr attributes;
   gint attributes_mask;
+  GtkWindowPrivate *priv;
   
-  g_return_if_fail (GTK_IS_WINDOW (widget));
-
   window = GTK_WINDOW (widget);
 
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+
   /* ensure widget tree is properly size allocated */
   if (widget->allocation.x == -1 &&
       widget->allocation.y == -1 &&
@@ -3223,12 +4219,14 @@ gtk_window_realize (GtkWidget *widget)
       
       attributes_mask = GDK_WA_VISUAL | GDK_WA_COLORMAP;
       
-      window->frame = gdk_window_new (NULL, &attributes, attributes_mask);
+      window->frame = gdk_window_new (gtk_widget_get_root_window (widget),
+                                     &attributes, attributes_mask);
+                                                
       gdk_window_set_user_data (window->frame, widget);
       
       attributes.window_type = GDK_WINDOW_CHILD;
       attributes.x = window->frame_left;
-      attributes.y = window->frame_right;
+      attributes.y = window->frame_top;
     
       attributes_mask = GDK_WA_X | GDK_WA_Y;
 
@@ -3237,7 +4235,7 @@ gtk_window_realize (GtkWidget *widget)
   else
     {
       attributes_mask = 0;
-      parent_window = NULL;
+      parent_window = gtk_widget_get_root_window (widget);
     }
   
   attributes.width = widget->allocation.width;
@@ -3254,7 +4252,11 @@ gtk_window_realize (GtkWidget *widget)
   attributes_mask |= GDK_WA_VISUAL | GDK_WA_COLORMAP;
   attributes_mask |= (window->title ? GDK_WA_TITLE : 0);
   attributes_mask |= (window->wmclass_name ? GDK_WA_WMCLASS : 0);
+  
   widget->window = gdk_window_new (parent_window, &attributes, attributes_mask);
+
+  gdk_window_enable_synchronized_configure (widget->window);
+    
   gdk_window_set_user_data (widget->window, window);
       
   widget->style = gtk_style_attach (widget->style, widget->window);
@@ -3276,10 +4278,28 @@ gtk_window_realize (GtkWidget *widget)
   if (!window->decorated)
     gdk_window_set_decorations (widget->window, 0);
 
+  if (!priv->deletable)
+    gdk_window_set_functions (widget->window, GDK_FUNC_ALL | GDK_FUNC_CLOSE);
+
   gdk_window_set_type_hint (widget->window, window->type_hint);
 
-  /* transient_for must be set to allow the modal hint */
-  if (window->transient_parent && window->modal)
+  if (gtk_window_get_skip_pager_hint (window))
+    gdk_window_set_skip_pager_hint (widget->window, TRUE);
+
+  if (gtk_window_get_skip_taskbar_hint (window))
+    gdk_window_set_skip_taskbar_hint (widget->window, TRUE);
+
+  if (gtk_window_get_accept_focus (window))
+    gdk_window_set_accept_focus (widget->window, TRUE);
+  else
+    gdk_window_set_accept_focus (widget->window, FALSE);
+
+  if (gtk_window_get_focus_on_map (window))
+    gdk_window_set_focus_on_map (widget->window, TRUE);
+  else
+    gdk_window_set_focus_on_map (widget->window, FALSE);
+  
+  if (window->modal)
     gdk_window_set_modal_hint (widget->window, TRUE);
   else
     gdk_window_set_modal_hint (widget->window, FALSE);
@@ -3336,9 +4356,6 @@ gtk_window_size_request (GtkWidget      *widget,
   GtkWindow *window;
   GtkBin *bin;
 
-  g_return_if_fail (GTK_IS_WINDOW (widget));
-  g_return_if_fail (requisition != NULL);
-
   window = GTK_WINDOW (widget);
   bin = GTK_BIN (window);
   
@@ -3363,9 +4380,6 @@ gtk_window_size_allocate (GtkWidget     *widget,
   GtkWindow *window;
   GtkAllocation child_allocation;
 
-  g_return_if_fail (GTK_IS_WINDOW (widget));
-  g_return_if_fail (allocation != NULL);
-
   window = GTK_WINDOW (widget);
   widget->allocation = *allocation;
 
@@ -3395,10 +4409,6 @@ gtk_window_event (GtkWidget *widget, GdkEvent *event)
   GtkWindow *window;
   gboolean return_val;
 
-  
-  g_return_val_if_fail (GTK_IS_WINDOW (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-  
   window = GTK_WINDOW (widget);
 
   if (window->frame && (event->any.window == window->frame))
@@ -3407,9 +4417,9 @@ gtk_window_event (GtkWidget *widget, GdkEvent *event)
          (event->type != GDK_KEY_RELEASE) &&
          (event->type != GDK_FOCUS_CHANGE))
        {
-         gtk_signal_emit_stop_by_name (GTK_OBJECT (widget), "event");
+         g_signal_stop_emission_by_name (widget, "event");
          return_val = FALSE;
-         gtk_signal_emit (GTK_OBJECT (widget), window_signals[FRAME_EVENT], event, &return_val);
+         g_signal_emit (widget, window_signals[FRAME_EVENT], 0, event, &return_val);
          return TRUE;
        }
       else
@@ -3456,12 +4466,8 @@ static gint
 gtk_window_configure_event (GtkWidget         *widget,
                            GdkEventConfigure *event)
 {
-  GtkWindow *window;
-  
-  g_return_val_if_fail (GTK_IS_WINDOW (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-  
-  window = GTK_WINDOW (widget);
+  GtkWindow *window = GTK_WINDOW (widget);
+  gboolean expected_reply = window->configure_request_count > 0;
 
   /* window->configure_request_count incremented for each 
    * configure request, and decremented to a min of 0 for
@@ -3486,10 +4492,13 @@ gtk_window_configure_event (GtkWidget         *widget,
    *     notifies and can wait to resize when we get them
    */
   
-  if (window->configure_request_count > 0 ||
+  if (!expected_reply &&
       (widget->allocation.width == event->width &&
        widget->allocation.height == event->height))
-    return TRUE;
+    {
+      gdk_window_configure_finished (widget->window);
+      return TRUE;
+    }
 
   /*
    * If we do need to resize, we do that by:
@@ -3540,70 +4549,83 @@ _gtk_window_query_nonaccels (GtkWindow      *window,
   /* mnemonics are considered locked accels */
   if (accel_mods == window->mnemonic_modifier)
     {
-      GtkWindowMnemonic mkey;
-
-      mkey.window = window;
-      mkey.keyval = accel_key;
-      if (g_hash_table_lookup (mnemonic_hash_table, &mkey))
+      GtkMnemonicHash *mnemonic_hash = gtk_window_get_mnemonic_hash (window, FALSE);
+      if (mnemonic_hash && _gtk_mnemonic_hash_lookup (mnemonic_hash, accel_key))
        return TRUE;
     }
 
   return FALSE;
 }
 
-static gint
-gtk_window_key_press_event (GtkWidget   *widget,
-                           GdkEventKey *event)
+/**
+ * gtk_window_propagate_key_event:
+ * @window:  a #GtkWindow
+ * @event:   a #GdkEventKey
+ *
+ * Propagate a key press or release event to the focus widget and
+ * up the focus container chain until a widget handles @event.
+ * This is normally called by the default ::key_press_event and
+ * ::key_release_event handlers for toplevel windows,
+ * however in some cases it may be useful to call this directly when
+ * overriding the standard key handling for a toplevel window.
+ *
+ * Return value: %TRUE if a widget in the focus chain handled the event.
+ **/
+gboolean
+gtk_window_propagate_key_event (GtkWindow        *window,
+                                GdkEventKey      *event)
 {
-  GtkWindow *window;
-  GtkWidget *focus;
-  gboolean handled;
+  gboolean handled = FALSE;
+  GtkWidget *widget, *focus;
 
-  g_return_val_if_fail (GTK_IS_WINDOW (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
+  g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
 
-  window = GTK_WINDOW (widget);
+  widget = GTK_WIDGET (window);
+  focus = window->focus_widget;
+  if (focus)
+    g_object_ref (focus);
+  
+  while (!handled &&
+         focus && focus != widget &&
+         gtk_widget_get_toplevel (focus) == widget)
+    {
+      GtkWidget *parent;
+      
+      if (GTK_WIDGET_IS_SENSITIVE (focus))
+        handled = gtk_widget_event (focus, (GdkEvent*) event);
+      
+      parent = focus->parent;
+      if (parent)
+        g_object_ref (parent);
+      
+      g_object_unref (focus);
+      
+      focus = parent;
+    }
+  
+  if (focus)
+    g_object_unref (focus);
 
-  handled = FALSE;
+  return handled;
+}
 
-  if (!handled)
-    handled = gtk_window_mnemonic_activate (window,
-                                           event->keyval,
-                                           event->state);
+static gint
+gtk_window_key_press_event (GtkWidget   *widget,
+                           GdkEventKey *event)
+{
+  GtkWindow *window = GTK_WINDOW (widget);
+  gboolean handled = FALSE;
 
+  /* handle mnemonics and accelerators */
   if (!handled)
-    handled = gtk_accel_groups_activate (G_OBJECT (window), event->keyval, event->state);
+    handled = gtk_window_activate_key (window, event);
 
+  /* handle focus widget key events */
   if (!handled)
-    {
-      focus = window->focus_widget;
-      if (focus)
-       g_object_ref (focus);
-      
-      while (!handled &&
-            focus && focus != widget &&
-            gtk_widget_get_toplevel (focus) == widget)
-       {
-         GtkWidget *parent;
-         
-         if (GTK_WIDGET_IS_SENSITIVE (focus))
-           handled = gtk_widget_event (focus, (GdkEvent*) event);
-         
-         parent = focus->parent;
-         if (parent)
-           g_object_ref (parent);
-         
-         g_object_unref (focus);
-         
-         focus = parent;
-       }
-
-      if (focus)
-       g_object_unref (focus);
-    }
+    handled = gtk_window_propagate_key_event (window, event);
 
   /* Chain up, invokes binding set */
-  if (!handled && GTK_WIDGET_CLASS (parent_class)->key_press_event)
+  if (!handled)
     handled = GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, event);
 
   return handled;
@@ -3613,23 +4635,16 @@ static gint
 gtk_window_key_release_event (GtkWidget   *widget,
                              GdkEventKey *event)
 {
-  GtkWindow *window;
-  gint handled;
-  
-  g_return_val_if_fail (GTK_IS_WINDOW (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-  
-  window = GTK_WINDOW (widget);
-  handled = FALSE;
-  if (window->focus_widget &&
-      window->focus_widget != widget &&
-      GTK_WIDGET_SENSITIVE (window->focus_widget))
-    {
-      handled = gtk_widget_event (window->focus_widget, (GdkEvent*) event);
-    }
+  GtkWindow *window = GTK_WINDOW (widget);
+  gboolean handled = FALSE;
+
+  /* handle focus widget key events */
+  if (!handled)
+    handled = gtk_window_propagate_key_event (window, event);
 
-  if (!handled && GTK_WIDGET_CLASS (parent_class)->key_release_event)
-    handled = GTK_WIDGET_CLASS (parent_class)->key_release_event (widget, event);
+  /* Chain up, invokes binding set */
+  if (!handled)
+    handled = GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, event);
 
   return handled;
 }
@@ -3660,9 +4675,6 @@ static gint
 gtk_window_enter_notify_event (GtkWidget        *widget,
                               GdkEventCrossing *event)
 {
-  g_return_val_if_fail (GTK_IS_WINDOW (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-
   return FALSE;
 }
 
@@ -3670,18 +4682,41 @@ static gint
 gtk_window_leave_notify_event (GtkWidget        *widget,
                               GdkEventCrossing *event)
 {
-  g_return_val_if_fail (GTK_IS_WINDOW (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-
   return FALSE;
 }
 
+static void
+do_focus_change (GtkWidget *widget,
+                gboolean   in)
+{
+  GdkEvent *fevent = gdk_event_new (GDK_FOCUS_CHANGE);
+  
+  g_object_ref (widget);
+  
+  if (in)
+    GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
+  else
+    GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
+  
+  fevent->focus_change.type = GDK_FOCUS_CHANGE;
+  fevent->focus_change.window = widget->window;
+  if (widget->window)
+    g_object_ref (widget->window);
+  fevent->focus_change.in = in;
+  
+  gtk_widget_event (widget, fevent);
+  
+  g_object_notify (G_OBJECT (widget), "has-focus");
+
+  g_object_unref (widget);
+  gdk_event_free (fevent);
+}
+
 static gint
 gtk_window_focus_in_event (GtkWidget     *widget,
                           GdkEventFocus *event)
 {
   GtkWindow *window = GTK_WINDOW (widget);
-  GdkEventFocus fevent;
 
   /* It appears spurious focus in events can occur when
    *  the window is hidden. So we'll just check to see if
@@ -3690,20 +4725,10 @@ gtk_window_focus_in_event (GtkWidget     *widget,
    */
   if (GTK_WIDGET_VISIBLE (widget))
     {
-      window->has_focus = TRUE;
-      
-      if (window->focus_widget &&
-         window->focus_widget != widget &&
-         !GTK_WIDGET_HAS_FOCUS (window->focus_widget))
-       {
-         fevent.type = GDK_FOCUS_CHANGE;
-         fevent.window = window->focus_widget->window;
-         fevent.in = TRUE;
-
-         gtk_widget_event (window->focus_widget, (GdkEvent*) &fevent);
-       }
+      _gtk_window_set_has_toplevel_focus (window, TRUE);
+      _gtk_window_set_is_active (window, TRUE);
     }
-
+      
   return FALSE;
 }
 
@@ -3712,66 +4737,65 @@ gtk_window_focus_out_event (GtkWidget     *widget,
                            GdkEventFocus *event)
 {
   GtkWindow *window = GTK_WINDOW (widget);
-  GdkEventFocus fevent;
-
-  window->has_focus = FALSE;
-  
-  if (window->focus_widget &&
-      window->focus_widget != widget &&
-      GTK_WIDGET_HAS_FOCUS (window->focus_widget))
-    {
-      fevent.type = GDK_FOCUS_CHANGE;
-      fevent.window = window->focus_widget->window;
-      fevent.in = FALSE;
 
-      gtk_widget_event (window->focus_widget, (GdkEvent*) &fevent);
-    }
+  _gtk_window_set_has_toplevel_focus (window, FALSE);
+  _gtk_window_set_is_active (window, FALSE);
 
   return FALSE;
 }
 
 static GdkAtom atom_rcfiles = GDK_NONE;
+static GdkAtom atom_iconthemes = GDK_NONE;
 
 static void
-gtk_window_read_rcfiles (GtkWidget *widget,
-                        GdkEventClient *event)
+send_client_message_to_embedded_windows (GtkWidget *widget,
+                                        GdkAtom    message_type)
 {
   GList *embedded_windows;
 
-  embedded_windows = gtk_object_get_data (GTK_OBJECT (widget), "gtk-embedded");
+  embedded_windows = g_object_get_data (G_OBJECT (widget), "gtk-embedded");
   if (embedded_windows)
     {
-      GdkEventClient sev;
+      GdkEvent *send_event = gdk_event_new (GDK_CLIENT_EVENT);
       int i;
       
       for (i = 0; i < 5; i++)
-       sev.data.l[i] = 0;
-      sev.data_format = 32;
-      sev.message_type = atom_rcfiles;
+       send_event->client.data.l[i] = 0;
+      send_event->client.data_format = 32;
+      send_event->client.message_type = message_type;
       
       while (embedded_windows)
        {
          guint xid = GPOINTER_TO_UINT (embedded_windows->data);
-         gdk_event_send_client_message ((GdkEvent *) &sev, xid);
+         gdk_event_send_client_message_for_display (gtk_widget_get_display (widget), send_event, xid);
          embedded_windows = embedded_windows->next;
        }
-    }
 
-  gtk_rc_reparse_all ();
+      gdk_event_free (send_event);
+    }
 }
 
 static gint
 gtk_window_client_event (GtkWidget     *widget,
                         GdkEventClient *event)
 {
-  g_return_val_if_fail (GTK_IS_WINDOW (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-
   if (!atom_rcfiles)
-    atom_rcfiles = gdk_atom_intern ("_GTK_READ_RCFILES", FALSE);
+    {
+      atom_rcfiles = gdk_atom_intern ("_GTK_READ_RCFILES", FALSE);
+      atom_iconthemes = gdk_atom_intern ("_GTK_LOAD_ICONTHEMES", FALSE);
+    }
 
   if (event->message_type == atom_rcfiles) 
-    gtk_window_read_rcfiles (widget, event);    
+    {
+      send_client_message_to_embedded_windows (widget, atom_rcfiles);
+      gtk_rc_reparse_all_for_settings (gtk_widget_get_settings (widget), FALSE);
+    }
+
+  if (event->message_type == atom_iconthemes) 
+    {
+      send_client_message_to_embedded_windows (widget, atom_iconthemes);
+      _gtk_icon_theme_check_reload (gtk_widget_get_display (widget));    
+    }
 
   return FALSE;
 }
@@ -3779,11 +4803,7 @@ gtk_window_client_event (GtkWidget       *widget,
 static void
 gtk_window_check_resize (GtkContainer *container)
 {
-  GtkWindow *window;
-
-  g_return_if_fail (GTK_IS_WINDOW (container));
-
-  window = GTK_WINDOW (container);
+  GtkWindow *window = GTK_WINDOW (container);
 
   if (GTK_WIDGET_VISIBLE (container))
     gtk_window_move_resize (window);
@@ -3817,6 +4837,14 @@ gtk_window_focus (GtkWidget        *widget,
 
   if (window->focus_widget)
     {
+      if (direction == GTK_DIR_LEFT ||
+         direction == GTK_DIR_RIGHT ||
+         direction == GTK_DIR_UP ||
+         direction == GTK_DIR_DOWN)
+       {
+         return FALSE;
+       }
+      
       /* Wrapped off the end, clear the focus setting for the toplpevel */
       parent = window->focus_widget->parent;
       while (parent)
@@ -3842,13 +4870,26 @@ static void
 gtk_window_real_set_focus (GtkWindow *window,
                           GtkWidget *focus)
 {
-  GdkEventFocus event;
-  gboolean def_flags = 0;
+  GtkWidget *old_focus = window->focus_widget;
+  gboolean had_default = FALSE;
+  gboolean focus_had_default = FALSE;
+  gboolean old_focus_had_default = FALSE;
 
-  g_return_if_fail (GTK_IS_WINDOW (window));
+  if (old_focus)
+    {
+      g_object_ref (old_focus);
+      g_object_freeze_notify (G_OBJECT (old_focus));
+      old_focus_had_default = GTK_WIDGET_HAS_DEFAULT (old_focus);
+    }
+  if (focus)
+    {
+      g_object_ref (focus);
+      g_object_freeze_notify (G_OBJECT (focus));
+      focus_had_default = GTK_WIDGET_HAS_DEFAULT (focus);
+    }
   
   if (window->default_widget)
-    def_flags = GTK_WIDGET_HAS_DEFAULT (window->default_widget);
+    had_default = GTK_WIDGET_HAS_DEFAULT (window->default_widget);
   
   if (window->focus_widget)
     {
@@ -3856,25 +4897,27 @@ gtk_window_real_set_focus (GtkWindow *window,
          (window->focus_widget != window->default_widget))
         {
          GTK_WIDGET_UNSET_FLAGS (window->focus_widget, GTK_HAS_DEFAULT);
-
+         gtk_widget_queue_draw (window->focus_widget);
+         
          if (window->default_widget)
            GTK_WIDGET_SET_FLAGS (window->default_widget, GTK_HAS_DEFAULT);
-        }
+       }
+
+      window->focus_widget = NULL;
 
       if (window->has_focus)
-       {
-         event.type = GDK_FOCUS_CHANGE;
-         event.window = window->focus_widget->window;
-         event.in = FALSE;
-         
-         gtk_widget_event (window->focus_widget, (GdkEvent*) &event);
-       }
+       do_focus_change (old_focus, FALSE);
+
+      g_object_notify (G_OBJECT (old_focus), "is-focus");
     }
-  
-  window->focus_widget = focus;
-  
-  if (window->focus_widget)
+
+  /* The above notifications may have set a new focus widget,
+   * if so, we don't want to override it.
+   */
+  if (focus && !window->focus_widget)
     {
+      window->focus_widget = focus;
+  
       if (GTK_WIDGET_RECEIVES_DEFAULT (window->focus_widget) &&
          (window->focus_widget != window->default_widget))
        {
@@ -3886,18 +4929,78 @@ gtk_window_real_set_focus (GtkWindow *window,
        }
 
       if (window->has_focus)
-       {
-         event.type = GDK_FOCUS_CHANGE;
-         event.window = window->focus_widget->window;
-         event.in = TRUE;
-         
-         gtk_widget_event (window->focus_widget, (GdkEvent*) &event);
-       }
+       do_focus_change (window->focus_widget, TRUE);
+
+      g_object_notify (G_OBJECT (window->focus_widget), "is-focus");
     }
-  
+
+  /* If the default widget changed, a redraw will have been queued
+   * on the old and new default widgets by gtk_window_set_default(), so
+   * we only have to worry about the case where it didn't change.
+   * We'll sometimes queue a draw twice on the new widget but that
+   * is harmless.
+   */
   if (window->default_widget &&
-      (def_flags != GTK_WIDGET_FLAGS (window->default_widget)))
+      (had_default != GTK_WIDGET_HAS_DEFAULT (window->default_widget)))
     gtk_widget_queue_draw (window->default_widget);
+  
+  if (old_focus)
+    {
+      if (old_focus_had_default != GTK_WIDGET_HAS_DEFAULT (old_focus))
+       gtk_widget_queue_draw (old_focus);
+       
+      g_object_thaw_notify (G_OBJECT (old_focus));
+      g_object_unref (old_focus);
+    }
+  if (focus)
+    {
+      if (focus_had_default != GTK_WIDGET_HAS_DEFAULT (focus))
+       gtk_widget_queue_draw (focus);
+
+      g_object_thaw_notify (G_OBJECT (focus));
+      g_object_unref (focus);
+    }
+}
+
+/**
+ * _gtk_window_unset_focus_and_default:
+ * @window: a #GtkWindow
+ * @widget: a widget inside of @window
+ * 
+ * Checks whether the focus and default widgets of @window are
+ * @widget or a descendent of @widget, and if so, unset them.
+ **/
+void
+_gtk_window_unset_focus_and_default (GtkWindow *window,
+                                    GtkWidget *widget)
+
+{
+  GtkWidget *child;
+
+  g_object_ref (window);
+  g_object_ref (widget);
+      
+  if (GTK_CONTAINER (widget->parent)->focus_child == widget)
+    {
+      child = window->focus_widget;
+      
+      while (child && child != widget)
+       child = child->parent;
+  
+      if (child == widget)
+       gtk_window_set_focus (GTK_WINDOW (window), NULL);
+    }
+      
+  child = window->default_widget;
+      
+  while (child && child != widget)
+    child = child->parent;
+      
+  if (child == widget)
+    gtk_window_set_default (window, NULL);
+  
+  g_object_unref (widget);
+  g_object_unref (window);
 }
 
 /*********************************
@@ -3941,11 +5044,41 @@ gtk_window_compute_configure_request_size (GtkWindow *window,
 
        if (info)
          {
-           if (info->default_width > 0)
-             *width = info->default_width;
-           
-           if (info->default_height > 0)
-             *height = info->default_height;
+          gint base_width = 0;
+          gint base_height = 0;
+          gint width_inc = 1;
+          gint height_inc = 1;
+          
+          if (info->default_is_geometry &&
+              (info->default_width > 0 || info->default_height > 0))
+            {
+              GdkGeometry geometry;
+              guint flags;
+              
+              gtk_window_compute_hints (window, &geometry, &flags);
+
+              if (flags & GDK_HINT_BASE_SIZE)
+                {
+                  base_width = geometry.base_width;
+                  base_height = geometry.base_height;
+                }
+              else if (flags & GDK_HINT_MIN_SIZE)
+                {
+                  base_width = geometry.min_width;
+                  base_height = geometry.min_height;
+                }
+              if (flags & GDK_HINT_RESIZE_INC)
+                {
+                  width_inc = geometry.width_inc;
+                  height_inc = geometry.height_inc;
+                }
+            }
+            
+          if (info->default_width > 0)
+            *width = info->default_width * width_inc + base_width;
+          
+          if (info->default_height > 0)
+            *height = info->default_height * height_inc + base_height;
          }
     }
   else
@@ -3966,6 +5099,104 @@ gtk_window_compute_configure_request_size (GtkWindow *window,
     }
 }
 
+static GtkWindowPosition
+get_effective_position (GtkWindow *window)
+{
+  GtkWindowPosition pos = window->position;
+  if (pos == GTK_WIN_POS_CENTER_ON_PARENT &&
+      (window->transient_parent == NULL ||
+       !GTK_WIDGET_MAPPED (window->transient_parent)))
+    pos = GTK_WIN_POS_NONE;
+
+  return pos;
+}
+
+static int
+get_center_monitor_of_window (GtkWindow *window)
+{
+  /* We could try to sort out the relative positions of the monitors and
+   * stuff, or we could just be losers and assume you have a row
+   * or column of monitors.
+   */
+  return gdk_screen_get_n_monitors (gtk_window_check_screen (window)) / 2;
+}
+
+static int
+get_monitor_containing_pointer (GtkWindow *window)
+{
+  gint px, py;
+  gint monitor_num;
+  GdkScreen *window_screen;
+  GdkScreen *pointer_screen;
+
+  window_screen = gtk_window_check_screen (window);
+  gdk_display_get_pointer (gdk_screen_get_display (window_screen),
+                           &pointer_screen,
+                           &px, &py, NULL);
+
+  if (pointer_screen == window_screen)
+    monitor_num = gdk_screen_get_monitor_at_point (pointer_screen, px, py);
+  else
+    monitor_num = -1;
+
+  return monitor_num;
+}
+
+static void
+center_window_on_monitor (GtkWindow *window,
+                          gint       w,
+                          gint       h,
+                          gint      *x,
+                          gint      *y)
+{
+  GdkRectangle monitor;
+  int monitor_num;
+
+  monitor_num = get_monitor_containing_pointer (window);
+  
+  if (monitor_num == -1)
+    monitor_num = get_center_monitor_of_window (window);
+
+  gdk_screen_get_monitor_geometry (gtk_window_check_screen (window),
+                                  monitor_num, &monitor);
+  
+  *x = (monitor.width - w) / 2 + monitor.x;
+  *y = (monitor.height - h) / 2 + monitor.y;
+
+  /* Be sure we aren't off the monitor, ignoring _NET_WM_STRUT
+   * and WM decorations.
+   */
+  if (*x < monitor.x)
+    *x = monitor.x;
+  if (*y < monitor.y)
+    *y = monitor.y;
+}
+
+static void
+clamp_window_to_rectangle (gint               *x,
+                           gint               *y,
+                           gint                w,
+                           gint                h,
+                           const GdkRectangle *rect)
+{
+  gint outside_w, outside_h;
+  
+  outside_w = (*x + w) - (rect->x + rect->width);
+  if (outside_w > 0)
+    *x -= outside_w;
+
+  outside_h = (*y + h) - (rect->y + rect->height);
+  if (outside_h > 0)
+    *y -= outside_h; 
+
+  /* if larger than the screen, center on the screen. */
+  if (*x < rect->x)
+    *x += (rect->x - *x) / 2;
+  if (*y < rect->y)
+    *y += (rect->y - *y) / 2;
+}
+
+
 static void
 gtk_window_compute_configure_request (GtkWindow    *window,
                                       GdkRectangle *request,
@@ -3979,9 +5210,12 @@ gtk_window_compute_configure_request (GtkWindow    *window,
   GtkWindowPosition pos;
   GtkWidget *parent_widget;
   GtkWindowGeometryInfo *info;
+  GdkScreen *screen;
   int x, y;
   
   widget = GTK_WIDGET (window);
+
+  screen = gtk_window_check_screen (window);
   
   gtk_widget_size_request (widget, NULL);
   gtk_window_compute_configure_request_size (window, &w, &h);
@@ -3994,12 +5228,7 @@ gtk_window_compute_configure_request (GtkWindow    *window,
 
   parent_widget = (GtkWidget*) window->transient_parent;
   
-  pos = window->position;
-  if (pos == GTK_WIN_POS_CENTER_ON_PARENT &&
-      (parent_widget == NULL ||
-       !GTK_WIDGET_MAPPED (parent_widget)))
-    pos = GTK_WIN_POS_NONE;
-
+  pos = get_effective_position (window);
   info = gtk_window_get_geometry_info (window, TRUE);
 
   /* by default, don't change position requested */
@@ -4023,40 +5252,73 @@ gtk_window_compute_configure_request (GtkWindow    *window,
            */
         case GTK_WIN_POS_CENTER_ALWAYS:
         case GTK_WIN_POS_CENTER:
-          {
-            gint screen_width = gdk_screen_width ();
-            gint screen_height = gdk_screen_height ();
-            
-            x = (screen_width - w) / 2;
-            y = (screen_height - h) / 2;
-          }
+          center_window_on_monitor (window, w, h, &x, &y);
           break;
       
         case GTK_WIN_POS_CENTER_ON_PARENT:
           {
+            gint monitor_num;
+            GdkRectangle monitor;
             gint ox, oy;
             
             g_assert (GTK_WIDGET_MAPPED (parent_widget)); /* established earlier */
+
+            if (parent_widget->window != NULL)
+              monitor_num = gdk_screen_get_monitor_at_window (screen,
+                                                              parent_widget->window);
+            else
+              monitor_num = -1;
             
             gdk_window_get_origin (parent_widget->window,
                                    &ox, &oy);
             
             x = ox + (parent_widget->allocation.width - w) / 2;
             y = oy + (parent_widget->allocation.height - h) / 2;
+            
+            /* Clamp onto current monitor, ignoring _NET_WM_STRUT and
+             * WM decorations. If parent wasn't on a monitor, just
+             * give up.
+             */
+            if (monitor_num >= 0)
+              {
+                gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
+                clamp_window_to_rectangle (&x, &y, w, h, &monitor);
+              }
           }
           break;
 
         case GTK_WIN_POS_MOUSE:
           {
-            gint screen_width = gdk_screen_width ();
-            gint screen_height = gdk_screen_height ();
-            int px, py;
+            gint screen_width = gdk_screen_get_width (screen);
+            gint screen_height = gdk_screen_get_height (screen);
+           gint monitor_num;
+           GdkRectangle monitor;
+            GdkScreen *pointer_screen;
+            gint px, py;
+            
+            gdk_display_get_pointer (gdk_screen_get_display (screen),
+                                     &pointer_screen,
+                                     &px, &py, NULL);
+
+            if (pointer_screen == screen)
+              monitor_num = gdk_screen_get_monitor_at_point (screen, px, py);
+            else
+              monitor_num = -1;
             
-            gdk_window_get_pointer (NULL, &px, &py, NULL);
             x = px - w / 2;
             y = py - h / 2;
             x = CLAMP (x, 0, screen_width - w);
             y = CLAMP (y, 0, screen_height - h);
+
+            /* Clamp onto current monitor, ignoring _NET_WM_STRUT and
+             * WM decorations. Don't try to figure out what's going
+             * on if the mouse wasn't inside a monitor.
+             */
+            if (monitor_num >= 0)
+              {
+                gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
+                clamp_window_to_rectangle (&x, &y, w, h, &monitor);
+              }
           }
           break;
 
@@ -4097,11 +5359,8 @@ gtk_window_constrain_position (GtkWindow    *window,
   if (window->position == GTK_WIN_POS_CENTER_ALWAYS)
     {
       gint center_x, center_y;
-      gint screen_width = gdk_screen_width ();
-      gint screen_height = gdk_screen_height ();
-      
-      center_x = (screen_width - new_width) / 2;
-      center_y = (screen_height - new_height) / 2;
+
+      center_window_on_monitor (window, new_width, new_height, &center_x, &center_y);
       
       *x = center_x;
       *y = center_y;
@@ -4251,42 +5510,46 @@ gtk_window_move_resize (GtkWindow *window)
     }
 
 #if 0
-  {
-    int notify_x, notify_y;
+  if (window->type == GTK_WINDOW_TOPLEVEL)
+    {
+      int notify_x, notify_y;
 
-    /* this is the position from the last configure notify */
-    gdk_window_get_position (widget->window, &notify_x, &notify_y);
+      /* this is the position from the last configure notify */
+      gdk_window_get_position (widget->window, &notify_x, &notify_y);
     
-    g_print ("--- %s ---\n"
-             "last : %d,%d\t%d x %d\n"
-             "this : %d,%d\t%d x %d\n"
-             "alloc: %d,%d\t%d x %d\n"
-             "req  :      \t%d x %d\n"
-             "size_changed: %d pos_changed: %d hints_changed: %d\n"
-             "configure_notify_received: %d\n"
-             "configure_request_count: %d\n"
-             "position_constraints_changed: %d\n",
-             window->title ? window->title : "(no title)",
-             info->last.configure_request.x,
-             info->last.configure_request.y,
-             info->last.configure_request.width,
-             info->last.configure_request.height,
-             new_request.x,
-             new_request.y,
-             new_request.width,
-             new_request.height,
-             notify_x, notify_y,
-             widget->allocation.width,
-             widget->allocation.height,
-             widget->requisition.width,
-             widget->requisition.height,
-             configure_request_pos_changed,
-             configure_request_size_changed,
-             hints_changed,
-             window->configure_notify_received,
-             window->configure_request_count,
-             info->position_constraints_changed);
-  }
+      g_message ("--- %s ---\n"
+                "last  : %d,%d\t%d x %d\n"
+                "this  : %d,%d\t%d x %d\n"
+                "alloc : %d,%d\t%d x %d\n"
+                "req   :      \t%d x %d\n"
+                "resize:      \t%d x %d\n" 
+                "size_changed: %d pos_changed: %d hints_changed: %d\n"
+                "configure_notify_received: %d\n"
+                "configure_request_count: %d\n"
+                "position_constraints_changed: %d\n",
+                window->title ? window->title : "(no title)",
+                info->last.configure_request.x,
+                info->last.configure_request.y,
+                info->last.configure_request.width,
+                info->last.configure_request.height,
+                new_request.x,
+                new_request.y,
+                new_request.width,
+                new_request.height,
+                notify_x, notify_y,
+                widget->allocation.width,
+                widget->allocation.height,
+                widget->requisition.width,
+                widget->requisition.height,
+                info->resize_width,
+                info->resize_height,
+                configure_request_pos_changed,
+                configure_request_size_changed,
+                hints_changed,
+                window->configure_notify_received,
+                window->configure_request_count,
+                info->position_constraints_changed);
+    }
 #endif
   
   saved_last_info = info->last;
@@ -4312,7 +5575,7 @@ gtk_window_move_resize (GtkWindow *window)
   if ((configure_request_pos_changed ||
        info->initial_pos_set ||
        (window->need_default_position &&
-        window->position != GTK_WIN_POS_NONE)) &&
+        get_effective_position (window) != GTK_WIN_POS_NONE)) &&
       (new_flags & GDK_HINT_POS) == 0)
     {
       new_flags |= GDK_HINT_POS;
@@ -4325,7 +5588,7 @@ gtk_window_move_resize (GtkWindow *window)
     gdk_window_set_geometry_hints (widget->window,
                                   &new_geometry,
                                   new_flags);
-
+  
   /* handle resizing/moving and widget tree allocation
    */
   if (window->configure_notify_received)
@@ -4349,6 +5612,10 @@ gtk_window_move_resize (GtkWindow *window)
       allocation = widget->allocation;
       gtk_widget_size_allocate (widget, &allocation);
 
+      gdk_window_process_all_updates ();
+      
+      gdk_window_configure_finished (widget->window);
+
       /* If the configure request changed, it means that
        * we either:
        *   1) coincidentally changed hints or widget properties
@@ -4387,6 +5654,8 @@ gtk_window_move_resize (GtkWindow *window)
           
          gtk_widget_queue_resize (widget); /* migth recurse for GTK_RESIZE_IMMEDIATE */
        }
+
+      return;                  /* Bail out, we didn't really process the move/resize */
     }
   else if ((configure_request_size_changed || hints_changed) &&
           (widget->allocation.width != new_request.width ||
@@ -4418,13 +5687,13 @@ gtk_window_move_resize (GtkWindow *window)
                                       new_request.y - window->frame_top,
                                      new_request.width + window->frame_left + window->frame_right,
                                      new_request.height + window->frame_top + window->frame_bottom);
-             gdk_window_resize (GTK_WIDGET (window)->window,
+             gdk_window_resize (widget->window,
                                  new_request.width, new_request.height);
            }
          else
            gdk_window_move_resize (widget->window,
-                                    new_request.x, new_request.y,
-                                    new_request.width, new_request.height);
+                                   new_request.x, new_request.y,
+                                   new_request.width, new_request.height);
        }
       else  /* only size changed */
        {
@@ -4433,21 +5702,12 @@ gtk_window_move_resize (GtkWindow *window)
                               new_request.width + window->frame_left + window->frame_right,
                               new_request.height + window->frame_top + window->frame_bottom);
          gdk_window_resize (widget->window,
-                             new_request.width, new_request.height);
+                            new_request.width, new_request.height);
        }
       
       /* Increment the number of have-not-yet-received-notify requests */
       window->configure_request_count += 1;
 
-      /* We have now sent a request since the last position constraint
-       * change and definitely don't need a an initial size again (not
-       * resetting this here can lead to infinite loops for
-       * GTK_RESIZE_IMMEDIATE containers)
-       */
-      info->position_constraints_changed = FALSE;
-      window->need_default_position = FALSE;
-      info->initial_pos_set = FALSE;
-
       /* for GTK_RESIZE_QUEUE toplevels, we are now awaiting a new
        * configure event in response to our resizing request.
        * the configure event will cause a new resize with
@@ -4485,11 +5745,21 @@ gtk_window_move_resize (GtkWindow *window)
            gdk_window_move (widget->window,
                             new_request.x, new_request.y);
        }
-      
+
       /* And run the resize queue.
        */
       gtk_container_resize_children (container);
     }
+  
+  /* We have now processed a move/resize since the last position
+   * constraint change, setting of the initial position, or resize.
+   * (Not resetting these flags here can lead to infinite loops for
+   * GTK_RESIZE_IMMEDIATE containers)
+   */
+  info->position_constraints_changed = FALSE;
+  info->initial_pos_set = FALSE;
+  info->resize_width = -1;
+  info->resize_height = -1;
 }
 
 /* Compare two sets of Geometry hints for equality.
@@ -4591,8 +5861,6 @@ gtk_window_compute_hints (GtkWindow   *window,
   GtkWindowGeometryInfo *geometry_info;
   GtkRequisition requisition;
 
-  g_return_if_fail (GTK_IS_WINDOW (window));
-
   widget = GTK_WIDGET (window);
   
   gtk_widget_get_child_requisition (widget, &requisition);
@@ -4678,7 +5946,7 @@ gtk_window_compute_hints (GtkWindow   *window,
        new_geometry->max_width += extra_width;
 
       if (new_geometry->max_height < 0)
-       new_geometry->max_width = requisition.height;
+       new_geometry->max_height = requisition.height;
       else
        new_geometry->max_height += extra_height;
     }
@@ -4710,9 +5978,6 @@ static gint
 gtk_window_expose (GtkWidget      *widget,
                   GdkEventExpose *event)
 {
-  g_return_val_if_fail (GTK_IS_WINDOW (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-
   if (!GTK_WIDGET_APP_PAINTABLE (widget))
     gtk_window_paint (widget, &event->area);
   
@@ -4735,7 +6000,7 @@ gtk_window_expose (GtkWidget      *widget,
  * If this function is called on a window with setting of %TRUE, before
  * it is realized or showed, it will have a "frame" window around
  * @window->window, accessible in @window->frame. Using the signal 
- * frame_event you can recieve all events targeted at the frame.
+ * frame_event you can receive all events targeted at the frame.
  * 
  * This function is used by the linux-fb port to implement managed
  * windows, but it could concievably be used by X-programs that
@@ -4793,10 +6058,12 @@ gtk_window_set_frame_dimensions (GtkWindow *window,
                                 gint       right,
                                 gint       bottom)
 {
-  GtkWidget *widget = GTK_WIDGET (window);
+  GtkWidget *widget;
 
   g_return_if_fail (GTK_IS_WINDOW (window));
 
+  widget = GTK_WIDGET (window);
+
   if (window->frame_left == left &&
       window->frame_top == top &&
       window->frame_right == right && 
@@ -4837,10 +6104,32 @@ gtk_window_set_frame_dimensions (GtkWindow *window,
  * currently open, and the user chooses Preferences from the menu
  * a second time; use gtk_window_present() to move the already-open dialog
  * where the user can see it.
+ *
+ * If you are calling this function in response to a user interaction,
+ * it is preferable to use gdk_window_present_with_time().
  * 
  **/
 void
 gtk_window_present (GtkWindow *window)
+{
+  gtk_window_present_with_time (window, GDK_CURRENT_TIME);
+}
+
+/**
+ * gtk_window_present_with_time:
+ * @window: a #GtkWindow
+ * @timestamp: the timestamp of the user interaction (typically a 
+ *   button or key press event) which triggered this call
+ *
+ * Presents a window to the user in response to a user interaction.
+ * If you need to present a window without a timestamp, use 
+ * gtk_window_present(). See gtk_window_present() for details. 
+ * 
+ * Since: 2.8
+ **/
+void
+gtk_window_present_with_time (GtkWindow *window,
+                             guint32    timestamp)
 {
   GtkWidget *widget;
 
@@ -4854,11 +6143,20 @@ gtk_window_present (GtkWindow *window)
       
       gdk_window_show (widget->window);
 
-      /* note that gdk_window_focus() will also move the window to
-       * the current desktop, for WM spec compliant window managers.
-       */
-      gdk_window_focus (widget->window,
-                        gtk_get_current_event_time ());
+      /* Translate a timestamp of GDK_CURRENT_TIME appropriately */
+      if (timestamp == GDK_CURRENT_TIME)
+        {
+#ifdef GDK_WINDOWING_X11
+          GdkDisplay *display;
+
+          display = gtk_widget_get_display (GTK_WIDGET (window));
+          timestamp = gdk_x11_display_get_user_time (display);
+#else
+          timestamp = gtk_get_current_event_time ();
+#endif
+        }
+
+      gdk_window_focus (widget->window, timestamp);
     }
   else
     {
@@ -5029,68 +6327,256 @@ gtk_window_unstick (GtkWindow *window)
  * that crashes if not.
  *
  * It's permitted to call this function before showing a window,
- * in which case the window will be maximized when it appears onscreen
+ * in which case the window will be maximized when it appears onscreen
+ * initially.
+ *
+ * You can track maximization via the "window_state_event" signal
+ * on #GtkWidget.
+ * 
+ **/
+void
+gtk_window_maximize (GtkWindow *window)
+{
+  GtkWidget *widget;
+  GdkWindow *toplevel;
+  
+  g_return_if_fail (GTK_IS_WINDOW (window));
+
+  widget = GTK_WIDGET (window);
+
+  window->maximize_initially = TRUE;
+
+  if (window->frame)
+    toplevel = window->frame;
+  else
+    toplevel = widget->window;
+  
+  if (toplevel != NULL)
+    gdk_window_maximize (toplevel);
+}
+
+/**
+ * gtk_window_unmaximize:
+ * @window: a #GtkWindow
+ *
+ * Asks to unmaximize @window. Note that you shouldn't assume the
+ * window is definitely unmaximized afterward, because other entities
+ * (e.g. the user or <link linkend="gtk-X11-arch">window
+ * manager</link>) could maximize it again, and not all window
+ * managers honor requests to unmaximize. But normally the window will
+ * end up unmaximized. Just don't write code that crashes if not.
+ *
+ * You can track maximization via the "window_state_event" signal
+ * on #GtkWidget.
+ * 
+ **/
+void
+gtk_window_unmaximize (GtkWindow *window)
+{
+  GtkWidget *widget;
+  GdkWindow *toplevel;
+  
+  g_return_if_fail (GTK_IS_WINDOW (window));
+
+  widget = GTK_WIDGET (window);
+
+  window->maximize_initially = FALSE;
+
+  if (window->frame)
+    toplevel = window->frame;
+  else
+    toplevel = widget->window;
+  
+  if (toplevel != NULL)
+    gdk_window_unmaximize (toplevel);
+}
+
+/**
+ * gtk_window_fullscreen:
+ * @window: a #GtkWindow
+ *
+ * Asks to place @window in the fullscreen state. Note that you
+ * shouldn't assume the window is definitely full screen afterward,
+ * because other entities (e.g. the user or <link
+ * linkend="gtk-X11-arch">window manager</link>) could unfullscreen it
+ * again, and not all window managers honor requests to fullscreen
+ * windows. But normally the window will end up fullscreen. Just
+ * don't write code that crashes if not.
+ *
+ * You can track the fullscreen state via the "window_state_event" signal
+ * on #GtkWidget.
+ * 
+ * Since: 2.2
+ **/
+void
+gtk_window_fullscreen (GtkWindow *window)
+{
+  GtkWidget *widget;
+  GdkWindow *toplevel;
+  GtkWindowPrivate *priv;
+  
+  g_return_if_fail (GTK_IS_WINDOW (window));
+
+  widget = GTK_WIDGET (window);
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+  
+  priv->fullscreen_initially = TRUE;
+
+  if (window->frame)
+    toplevel = window->frame;
+  else
+    toplevel = widget->window;
+  
+  if (toplevel != NULL)
+    gdk_window_fullscreen (toplevel);
+}
+
+/**
+ * gtk_window_unfullscreen:
+ * @window: a #GtkWindow
+ *
+ * Asks to toggle off the fullscreen state for @window. Note that you
+ * shouldn't assume the window is definitely not full screen
+ * afterward, because other entities (e.g. the user or <link
+ * linkend="gtk-X11-arch">window manager</link>) could fullscreen it
+ * again, and not all window managers honor requests to unfullscreen
+ * windows. But normally the window will end up restored to its normal
+ * state. Just don't write code that crashes if not.
+ *
+ * You can track the fullscreen state via the "window_state_event" signal
+ * on #GtkWidget.
+ * 
+ * Since: 2.2
+ **/
+void
+gtk_window_unfullscreen (GtkWindow *window)
+{
+  GtkWidget *widget;
+  GdkWindow *toplevel;
+  GtkWindowPrivate *priv;
+  
+  g_return_if_fail (GTK_IS_WINDOW (window));
+
+  widget = GTK_WIDGET (window);
+  priv = GTK_WINDOW_GET_PRIVATE (window);
+  
+  priv->fullscreen_initially = FALSE;
+
+  if (window->frame)
+    toplevel = window->frame;
+  else
+    toplevel = widget->window;
+  
+  if (toplevel != NULL)
+    gdk_window_unfullscreen (toplevel);
+}
+
+/**
+ * gtk_window_set_keep_above:
+ * @window: a #GtkWindow
+ * @setting: whether to keep @window above other windows
+ *
+ * Asks to keep @window above, so that it stays on top. Note that
+ * you shouldn't assume the window is definitely above afterward,
+ * because other entities (e.g. the user or <link
+ * linkend="gtk-X11-arch">window manager</link>) could not keep it above,
+ * and not all window managers support keeping windows above. But
+ * normally the window will end kept above. Just don't write code
+ * that crashes if not.
+ *
+ * It's permitted to call this function before showing a window,
+ * in which case the window will be kept above when it appears onscreen
  * initially.
  *
- * You can track maximization via the "window_state_event" signal
+ * You can track the above state via the "window_state_event" signal
  * on #GtkWidget.
- * 
+ *
+ * Note that, according to the <ulink 
+ * url="http://www.freedesktop.org/Standards/wm-spec">Extended Window 
+ * Manager Hints</ulink> specification, the above state is mainly meant 
+ * for user preferences and should not be used by applications e.g. for 
+ * drawing attention to their dialogs.
+ *
+ * Since: 2.4
  **/
 void
-gtk_window_maximize (GtkWindow *window)
+gtk_window_set_keep_above (GtkWindow *window,
+                          gboolean   setting)
 {
   GtkWidget *widget;
+  GtkWindowPrivate *priv;
   GdkWindow *toplevel;
-  
+
   g_return_if_fail (GTK_IS_WINDOW (window));
 
   widget = GTK_WIDGET (window);
+  priv = GTK_WINDOW_GET_PRIVATE (window);
 
-  window->maximize_initially = TRUE;
+  priv->above_initially = setting;
+  if (setting)
+    priv->below_initially = FALSE;
 
   if (window->frame)
     toplevel = window->frame;
   else
     toplevel = widget->window;
-  
+
   if (toplevel != NULL)
-    gdk_window_maximize (toplevel);
+    gdk_window_set_keep_above (toplevel, setting);
 }
 
 /**
- * gtk_window_unmaximize:
+ * gtk_window_set_keep_below:
  * @window: a #GtkWindow
+ * @setting: whether to keep @window below other windows
  *
- * Asks to unmaximize @window. Note that you shouldn't assume the
- * window is definitely unmaximized afterward, because other entities
- * (e.g. the user or <link linkend="gtk-X11-arch">window
- * manager</link>) could maximize it again, and not all window
- * managers honor requests to unmaximize. But normally the window will
- * end up unmaximized. Just don't write code that crashes if not.
+ * Asks to keep @window below, so that it stays in bottom. Note that
+ * you shouldn't assume the window is definitely below afterward,
+ * because other entities (e.g. the user or <link
+ * linkend="gtk-X11-arch">window manager</link>) could not keep it below,
+ * and not all window managers support putting windows below. But
+ * normally the window will be kept below. Just don't write code
+ * that crashes if not.
  *
- * You can track maximization via the "window_state_event" signal
+ * It's permitted to call this function before showing a window,
+ * in which case the window will be kept below when it appears onscreen
+ * initially.
+ *
+ * You can track the below state via the "window_state_event" signal
  * on #GtkWidget.
- * 
+ *
+ * Note that, according to the <ulink 
+ * url="http://www.freedesktop.org/Standards/wm-spec">Extended Window 
+ * Manager Hints</ulink> specification, the above state is mainly meant 
+ * for user preferences and should not be used by applications e.g. for 
+ * drawing attention to their dialogs.
+ *
+ * Since: 2.4
  **/
 void
-gtk_window_unmaximize (GtkWindow *window)
+gtk_window_set_keep_below (GtkWindow *window,
+                          gboolean   setting)
 {
   GtkWidget *widget;
+  GtkWindowPrivate *priv;
   GdkWindow *toplevel;
-  
+
   g_return_if_fail (GTK_IS_WINDOW (window));
 
   widget = GTK_WIDGET (window);
+  priv = GTK_WINDOW_GET_PRIVATE (window);
 
-  window->maximize_initially = FALSE;
+  priv->below_initially = setting;
+  if (setting)
+    priv->above_initially = FALSE;
 
   if (window->frame)
     toplevel = window->frame;
   else
     toplevel = widget->window;
-  
+
   if (toplevel != NULL)
-    gdk_window_unmaximize (toplevel);
+    gdk_window_set_keep_below (toplevel, setting);
 }
 
 /**
@@ -5156,6 +6642,8 @@ gtk_window_set_gravity (GtkWindow *window,
       /* gtk_window_move_resize() will adapt gravity
        */
       gtk_widget_queue_resize (GTK_WIDGET (window));
+
+      g_object_notify (G_OBJECT (window), "gravity");
     }
 }
 
@@ -5299,16 +6787,136 @@ gtk_window_begin_move_drag  (GtkWindow *window,
                               timestamp);
 }
 
+/** 
+ * gtk_window_set_screen:
+ * @window: a #GtkWindow.
+ * @screen: a #GdkScreen.
+ *
+ * Sets the #GdkScreen where the @window is displayed; if
+ * the window is already mapped, it will be unmapped, and
+ * then remapped on the new screen.
+ *
+ * Since: 2.2
+ */
+void
+gtk_window_set_screen (GtkWindow *window,
+                      GdkScreen *screen)
+{
+  GtkWidget *widget;
+  GdkScreen *previous_screen;
+  gboolean was_mapped;
+  
+  g_return_if_fail (GTK_IS_WINDOW (window));
+  g_return_if_fail (GDK_IS_SCREEN (screen));
+
+  if (screen == window->screen)
+    return;
+
+  widget = GTK_WIDGET (window);
+
+  previous_screen = window->screen;
+  was_mapped = GTK_WIDGET_MAPPED (widget);
+
+  if (was_mapped)
+    gtk_widget_unmap (widget);
+  if (GTK_WIDGET_REALIZED (widget))
+    gtk_widget_unrealize (widget);
+      
+  gtk_window_free_key_hash (window);
+  window->screen = screen;
+  gtk_widget_reset_rc_styles (widget);
+  if (screen != previous_screen)
+    _gtk_widget_propagate_screen_changed (widget, previous_screen);
+  g_object_notify (G_OBJECT (window), "screen");
+
+  if (was_mapped)
+    gtk_widget_map (widget);
+}
+
+static GdkScreen *
+gtk_window_check_screen (GtkWindow *window)
+{
+  if (window->screen)
+    return window->screen;
+  else
+    {
+      g_warning ("Screen for GtkWindow not set; you must always set\n"
+                "a screen for a GtkWindow before using the window");
+      return NULL;
+    }
+}
+
+/** 
+ * gtk_window_get_screen:
+ * @window: a #GtkWindow.
+ *
+ * Returns the #GdkScreen associated with @window.
+ *
+ * Return value: a #GdkScreen.
+ *
+ * Since: 2.2
+ */
+GdkScreen*
+gtk_window_get_screen (GtkWindow *window)
+{
+  g_return_val_if_fail (GTK_IS_WINDOW (window), NULL);
+   
+  return window->screen;
+}
+
+/**
+ * gtk_window_is_active:
+ * @window: a #GtkWindow
+ * 
+ * Returns whether the window is part of the current active toplevel.
+ * (That is, the toplevel window receiving keystrokes.)
+ * The return value is %TRUE if the window is active toplevel
+ * itself, but also if it is, say, a #GtkPlug embedded in the active toplevel.
+ * You might use this function if you wanted to draw a widget
+ * differently in an active window from a widget in an inactive window.
+ * See gtk_window_has_toplevel_focus()
+ * 
+ * Return value: %TRUE if the window part of the current active window.
+ *
+ * Since: 2.4
+ **/
+gboolean
+gtk_window_is_active (GtkWindow *window)
+{
+  g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
+
+  return window->is_active;
+}
+
+/**
+ * gtk_window_has_toplevel_focus:
+ * @window: a #GtkWindow
+ * 
+ * Returns whether the input focus is within this GtkWindow.
+ * For real toplevel windows, this is identical to gtk_window_is_active(),
+ * but for embedded windows, like #GtkPlug, the results will differ.
+ * 
+ * Return value: %TRUE if the input focus is within this GtkWindow
+ *
+ * Since: 2.4
+ **/
+gboolean
+gtk_window_has_toplevel_focus (GtkWindow *window)
+{
+  g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
+
+  return window->has_toplevel_focus;
+}
 
 static void
 gtk_window_group_class_init (GtkWindowGroupClass *klass)
 {
 }
 
-GtkType
+GType
 gtk_window_group_get_type (void)
 {
-  static GtkType window_group_type = 0;
+  static GType window_group_type = 0;
 
   if (!window_group_type)
     {
@@ -5418,7 +7026,7 @@ gtk_window_group_remove_window (GtkWindowGroup *window_group,
   window_group_cleanup_grabs (window_group, window);
   window->group = NULL;
   
-  g_object_unref (G_OBJECT (window_group));
+  g_object_unref (window_group);
   g_object_unref (window);
 }
 
@@ -5440,6 +7048,15 @@ _gtk_window_get_group (GtkWindow *window)
     }
 }
 
+/* Return the current grab widget of the given group 
+ */
+GtkWidget *
+_gtk_window_group_get_current_grab (GtkWindowGroup *window_group)
+{
+  if (window_group->grabs)
+    return GTK_WIDGET (window_group->grabs->data);
+  return NULL;
+}
 
 /*
   Derived from XParseGeometry() in XFree86  
@@ -5643,7 +7260,58 @@ gtk_XParseGeometry (const char   *string,
  * indicating to the window manager that the size/position of
  * the window was user-specified. This causes most window
  * managers to honor the geometry.
+ *
+ * Note that for gtk_window_parse_geometry() to work as expected, it has
+ * to be called when the window has its "final" size, i.e. after calling
+ * gtk_widget_show_all() on the contents and gtk_window_set_geometry_hints()
+ * on the window.
  * 
+ * <informalexample><programlisting>
+ * #include &lt;gtk/gtk.h&gt;
+ *    
+ * static void
+ * fill_with_content (GtkWidget *vbox)
+ * {
+ *   /<!-- -->* fill with content... *<!-- -->/
+ * }
+ *    
+ * int
+ * main (int argc, char *argv[])
+ * {
+ *   GtkWidget *window, *vbox;
+ *   GdkGeometry size_hints = {
+ *     100, 50, 0, 0, 100, 50, 10, 10, 0.0, 0.0, GDK_GRAVITY_NORTH_WEST  
+ *   };
+ *    
+ *   gtk_init (&amp;argc, &amp;argv);
+ *   
+ *   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ *   vbox = gtk_vbox_new (FALSE, 0);
+ *   
+ *   gtk_container_add (GTK_CONTAINER (window), vbox);
+ *   fill_with_content (vbox);
+ *   gtk_widget_show_all (vbox);
+ *   
+ *   gtk_window_set_geometry_hints (GTK_WINDOW (window),
+ *                                 window,
+ *                                 &amp;size_hints,
+ *                                 GDK_HINT_MIN_SIZE | 
+ *                                 GDK_HINT_BASE_SIZE | 
+ *                                 GDK_HINT_RESIZE_INC);
+ *   
+ *   if (argc &gt; 1)
+ *     {
+ *       if (!gtk_window_parse_geometry (GTK_WINDOW (window), argv[1]))
+ *         fprintf (stderr, "Failed to parse '&percnt;s'\n", argv[1]);
+ *     }
+ *    
+ *   gtk_widget_show_all (window);
+ *   gtk_main ();
+ *    
+ *   return 0;
+ * }
+ * </programlisting></informalexample>
+ *
  * Return value: %TRUE if string was parsed successfully
  **/
 gboolean
@@ -5654,9 +7322,12 @@ gtk_window_parse_geometry (GtkWindow   *window,
   guint w, h;
   GdkGravity grav;
   gboolean size_set, pos_set;
+  GdkScreen *screen;
   
   g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
   g_return_val_if_fail (geometry != NULL, FALSE);
+
+  screen = gtk_window_check_screen (window);
   
   result = gtk_XParseGeometry (geometry, &x, &y, &w, &h);
 
@@ -5670,7 +7341,7 @@ gtk_window_parse_geometry (GtkWindow   *window,
   size_set = FALSE;
   if ((result & WidthValue) || (result & HeightValue))
     {
-      gtk_window_set_default_size (window, w, h);
+      gtk_window_set_default_size_internal (window, TRUE, w, TRUE, h, TRUE);
       size_set = TRUE;
     }
 
@@ -5690,15 +7361,18 @@ gtk_window_parse_geometry (GtkWindow   *window,
 
   if ((result & YValue) == 0)
     y = 0;
-  
+
   if (grav == GDK_GRAVITY_SOUTH_WEST ||
       grav == GDK_GRAVITY_SOUTH_EAST)
-    y = gdk_screen_height () - h;
+    y = gdk_screen_get_height (screen) - h + y;
 
   if (grav == GDK_GRAVITY_SOUTH_EAST ||
       grav == GDK_GRAVITY_NORTH_EAST)
-    x = gdk_screen_width () - w;
+    x = gdk_screen_get_width (screen) - w + x;
 
+  /* we don't let you put a window offscreen; maybe some people would
+   * prefer to be able to, but it's kind of a bogus thing to do.
+   */
   if (y < 0)
     y = 0;
 
@@ -5728,3 +7402,339 @@ gtk_window_parse_geometry (GtkWindow   *window,
   
   return result != 0;
 }
+
+static void
+gtk_window_mnemonic_hash_foreach (guint      keyval,
+                                 GSList    *targets,
+                                 gpointer   data)
+{
+  struct {
+    GtkWindow *window;
+    GtkWindowKeysForeachFunc func;
+    gpointer func_data;
+  } *info = data;
+
+  (*info->func) (info->window, keyval, info->window->mnemonic_modifier, TRUE, info->func_data);
+}
+
+void
+_gtk_window_keys_foreach (GtkWindow                *window,
+                         GtkWindowKeysForeachFunc func,
+                         gpointer                 func_data)
+{
+  GSList *groups;
+  GtkMnemonicHash *mnemonic_hash;
+
+  struct {
+    GtkWindow *window;
+    GtkWindowKeysForeachFunc func;
+    gpointer func_data;
+  } info;
+
+  info.window = window;
+  info.func = func;
+  info.func_data = func_data;
+
+  mnemonic_hash = gtk_window_get_mnemonic_hash (window, FALSE);
+  if (mnemonic_hash)
+    _gtk_mnemonic_hash_foreach (mnemonic_hash,
+                               gtk_window_mnemonic_hash_foreach, &info);
+
+  groups = gtk_accel_groups_from_object (G_OBJECT (window));
+  while (groups)
+    {
+      GtkAccelGroup *group = groups->data;
+      gint i;
+
+      for (i = 0; i < group->n_accels; i++)
+       {
+         GtkAccelKey *key = &group->priv_accels[i].key;
+         
+         if (key->accel_key)
+           (*func) (window, key->accel_key, key->accel_mods, FALSE, func_data);
+       }
+      
+      groups = groups->next;
+    }
+}
+
+static void
+gtk_window_keys_changed (GtkWindow *window)
+{
+  gtk_window_free_key_hash (window);
+  gtk_window_get_key_hash (window);
+}
+
+typedef struct _GtkWindowKeyEntry GtkWindowKeyEntry;
+
+struct _GtkWindowKeyEntry
+{
+  guint keyval;
+  guint modifiers;
+  gboolean is_mnemonic;
+};
+
+static void
+add_to_key_hash (GtkWindow      *window,
+                guint           keyval,
+                GdkModifierType modifiers,
+                gboolean        is_mnemonic,
+                gpointer        data)
+{
+  GtkKeyHash *key_hash = data;
+
+  GtkWindowKeyEntry *entry = g_new (GtkWindowKeyEntry, 1);
+
+  entry->keyval = keyval;
+  entry->modifiers = modifiers;
+  entry->is_mnemonic = is_mnemonic;
+
+  /* GtkAccelGroup stores lowercased accelerators. To deal
+   * with this, if <Shift> was specified, uppercase.
+   */
+  if (modifiers & GDK_SHIFT_MASK)
+    {
+      if (keyval == GDK_Tab)
+       keyval = GDK_ISO_Left_Tab;
+      else
+       keyval = gdk_keyval_to_upper (keyval);
+    }
+  
+  _gtk_key_hash_add_entry (key_hash, keyval, entry->modifiers, entry);
+}
+
+static GtkKeyHash *
+gtk_window_get_key_hash (GtkWindow *window)
+{
+  GdkScreen *screen = gtk_window_check_screen (window);
+  GtkKeyHash *key_hash = g_object_get_data (G_OBJECT (window), "gtk-window-key-hash");
+  
+  if (key_hash)
+    return key_hash;
+  
+  key_hash = _gtk_key_hash_new (gdk_keymap_get_for_display (gdk_screen_get_display (screen)),
+                               (GDestroyNotify)g_free);
+  _gtk_window_keys_foreach (window, add_to_key_hash, key_hash);
+  g_object_set_data (G_OBJECT (window), "gtk-window-key-hash", key_hash);
+
+  return key_hash;
+}
+
+static void
+gtk_window_free_key_hash (GtkWindow *window)
+{
+  GtkKeyHash *key_hash = g_object_get_data (G_OBJECT (window), "gtk-window-key-hash");
+  if (key_hash)
+    {
+      _gtk_key_hash_free (key_hash);
+      g_object_set_data (G_OBJECT (window), "gtk-window-key-hash", NULL);
+    }
+}
+
+/**
+ * gtk_window_activate_key:
+ * @window:  a #GtkWindow
+ * @event:   a #GdkEventKey
+ *
+ * Activates mnemonics and accelerators for this #GtkWindow. This is normally
+ * called by the default ::key_press_event handler for toplevel windows,
+ * however in some cases it may be useful to call this directly when
+ * overriding the standard key handling for a toplevel window.
+ * 
+ * Return value: %TRUE if a mnemonic or accelerator was found and activated.
+ **/
+gboolean
+gtk_window_activate_key (GtkWindow   *window,
+                        GdkEventKey *event)
+{
+  GtkKeyHash *key_hash = g_object_get_data (G_OBJECT (window), "gtk-window-key-hash");
+  GtkWindowKeyEntry *found_entry = NULL;
+
+  if (!key_hash)
+    {
+      gtk_window_keys_changed (window);
+      key_hash = g_object_get_data (G_OBJECT (window), "gtk-window-key-hash");
+    }
+  
+  if (key_hash)
+    {
+      GSList *entries = _gtk_key_hash_lookup (key_hash,
+                                             event->hardware_keycode,
+                                             event->state,
+                                             gtk_accelerator_get_default_mod_mask (),
+                                             event->group);
+      GSList *tmp_list;
+
+      for (tmp_list = entries; tmp_list; tmp_list = tmp_list->next)
+       {
+         GtkWindowKeyEntry *entry = tmp_list->data;
+         if (entry->is_mnemonic)
+           {
+             found_entry = entry;
+             break;
+           }
+       }
+      
+      if (!found_entry && entries)
+       found_entry = entries->data;
+
+      g_slist_free (entries);
+    }
+
+  if (found_entry)
+    {
+      if (found_entry->is_mnemonic)
+       return gtk_window_mnemonic_activate (window, found_entry->keyval, found_entry->modifiers);
+      else
+       return gtk_accel_groups_activate (G_OBJECT (window), found_entry->keyval, found_entry->modifiers);
+    }
+  else
+    return FALSE;
+}
+
+static void
+window_update_has_focus (GtkWindow *window)
+{
+  GtkWidget *widget = GTK_WIDGET (window);
+  gboolean has_focus = window->has_toplevel_focus && window->is_active;
+  
+  if (has_focus != window->has_focus)
+    {
+      window->has_focus = has_focus;
+      
+      if (has_focus)
+       {
+         if (window->focus_widget &&
+             window->focus_widget != widget &&
+             !GTK_WIDGET_HAS_FOCUS (window->focus_widget))
+           do_focus_change (window->focus_widget, TRUE);       
+       }
+      else
+       {
+         if (window->focus_widget &&
+             window->focus_widget != widget &&
+             GTK_WIDGET_HAS_FOCUS (window->focus_widget))
+           do_focus_change (window->focus_widget, FALSE);
+       }
+    }
+}
+
+/**
+ * _gtk_window_set_is_active:
+ * @window: a #GtkWindow
+ * @is_active: %TRUE if the window is in the currently active toplevel
+ * 
+ * Internal function that sets whether the #GtkWindow is part
+ * of the currently active toplevel window (taking into account inter-process
+ * embedding.)
+ **/
+void
+_gtk_window_set_is_active (GtkWindow *window,
+                          gboolean   is_active)
+{
+  g_return_if_fail (GTK_IS_WINDOW (window));
+
+  is_active = is_active != FALSE;
+
+  if (is_active != window->is_active)
+    {
+      window->is_active = is_active;
+      window_update_has_focus (window);
+
+      g_object_notify (G_OBJECT (window), "is-active");
+    }
+}
+
+/**
+ * _gtk_window_set_has_toplevel_focus:
+ * @window: a #GtkWindow
+ * @has_toplevel_focus: %TRUE if the in
+ * 
+ * Internal function that sets whether the keyboard focus for the
+ * toplevel window (taking into account inter-process embedding.)
+ **/
+void
+_gtk_window_set_has_toplevel_focus (GtkWindow *window,
+                                  gboolean   has_toplevel_focus)
+{
+  g_return_if_fail (GTK_IS_WINDOW (window));
+  
+  has_toplevel_focus = has_toplevel_focus != FALSE;
+
+  if (has_toplevel_focus != window->has_toplevel_focus)
+    {
+      window->has_toplevel_focus = has_toplevel_focus;
+      window_update_has_focus (window);
+
+      g_object_notify (G_OBJECT (window), "has-toplevel-focus");
+    }
+}
+
+/**
+ * gtk_window_set_auto_startup_notification:
+ * @setting: %TRUE to automatically do startup notification
+ *
+ * By default, after showing the first #GtkWindow for each #GdkScreen,
+ * GTK+ calls gdk_screen_notify_startup_complete().  Call this
+ * function to disable the automatic startup notification. You might
+ * do this if your first window is a splash screen, and you want to
+ * delay notification until after your real main window has been
+ * shown, for example.
+ *
+ * In that example, you would disable startup notification
+ * temporarily, show your splash screen, then re-enable it so that
+ * showing the main window would automatically result in notification.
+ * 
+ * Since: 2.2
+ **/
+void
+gtk_window_set_auto_startup_notification (gboolean setting)
+{
+  disable_startup_notification = !setting;
+}
+
+#ifdef G_OS_WIN32
+
+#undef gtk_window_set_icon_from_file
+
+gboolean
+gtk_window_set_icon_from_file (GtkWindow   *window,
+                              const gchar *filename,
+                              GError     **err)
+{
+  gchar *utf8_filename = g_locale_to_utf8 (filename, -1, NULL, NULL, err);
+  gboolean retval;
+
+  if (utf8_filename == NULL)
+    return FALSE;
+
+  retval = gtk_window_set_icon_from_file_utf8 (window, utf8_filename, err);
+
+  g_free (utf8_filename);
+
+  return retval;
+}
+
+#undef gtk_window_set_default_icon_from_file
+
+gboolean
+gtk_window_set_default_icon_from_file (const gchar *filename,
+                                      GError     **err)
+{
+  gchar *utf8_filename = g_locale_to_utf8 (filename, -1, NULL, NULL, err);
+  gboolean retval;
+
+  if (utf8_filename == NULL)
+    return FALSE;
+
+  retval = gtk_window_set_default_icon_from_file_utf8 (utf8_filename, err);
+
+  g_free (utf8_filename);
+
+  return retval;
+}
+
+#endif
+
+#define __GTK_WINDOW_C__
+#include "gtkaliasdef.c"