Index: gtk/gtk.symbols
===================================================================
--- gtk/gtk.symbols	(Revision 20397)
+++ gtk/gtk.symbols	(Arbeitskopie)
@@ -4765,6 +4765,7 @@ gtk_window_fullscreen
 gtk_window_get_accept_focus
 gtk_window_get_decorated
 gtk_window_get_deletable
+gtk_window_get_default_widget
 gtk_window_get_default_icon_list
 gtk_window_get_default_size
 gtk_window_get_destroy_with_parent
@@ -4817,6 +4818,7 @@ gtk_window_set_auto_startup_notification
 gtk_window_set_decorated
 gtk_window_set_deletable
 gtk_window_set_default
+gtk_window_set_default_widget
 gtk_window_set_default_icon
 gtk_window_set_default_icon_from_file PRIVATE
 #ifdef G_OS_WIN32
Index: gtk/gtkwindow.c
===================================================================
--- gtk/gtkwindow.c	(Revision 20397)
+++ gtk/gtkwindow.c	(Arbeitskopie)
@@ -93,6 +93,7 @@ enum {
   PROP_GRAVITY,
   PROP_TRANSIENT_FOR,
   PROP_OPACITY,
+  PROP_DEFAULT_WIDGET,
   
   /* Readonly properties */
   PROP_IS_ACTIVE,
@@ -763,6 +764,21 @@ gtk_window_class_init (GtkWindowClass *k
 							1.0,
 							GTK_PARAM_READWRITE));
 
+  /**
+   * GtkWindow:default-widget:
+   *
+   * The :default-widget of the window.
+   *
+   * Since: 2.14
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_DEFAULT_WIDGET,
+                                   g_param_spec_string ("default-widget",
+                                                        P_("Default Widget"),
+                                                        P_("The default-widget of the window"),
+							NULL,
+                                                        GTK_PARAM_READWRITE));
+
   window_signals[SET_FOCUS] =
     g_signal_new (I_("set_focus"),
                   G_TYPE_FROM_CLASS (gobject_class),
@@ -1010,6 +1026,9 @@ gtk_window_set_property (GObject      *o
     case PROP_OPACITY:
       gtk_window_set_opacity (window, g_value_get_double (value));
       break;
+    case PROP_DEFAULT_WIDGET:
+      gtk_window_set_default_widget (window, g_value_get_object (value));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1125,6 +1144,9 @@ gtk_window_get_property (GObject      *o
     case PROP_OPACITY:
       g_value_set_double (value, gtk_window_get_opacity (window));
       break;
+    case PROP_DEFAULT_WIDGET:
+      g_value_set_object (value, gtk_window_get_default_widget (window));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1453,10 +1475,28 @@ _gtk_window_internal_set_focus (GtkWindo
 }
 
 /**
+ *
  * gtk_window_set_default:
  * @window: a #GtkWindow
- * @default_widget: widget to be the default, or %NULL to unset the
- *                  default widget for the toplevel.
+ * @default_widget: widget to be the default, or %NULL to unset
+ *
+ * Sets the default widget of the window.
+ *
+ * Deprecated: gtk_window_set_default() is deprecated and
+ *   should not be used in newly-written code. Use
+ *   gtk_window_set_default_widget() instead.
+ **/
+void
+gtk_window_set_default (GtkWindow *window,
+			GtkWidget *default_widget)
+{
+  gtk_window_set_default_widget (window, default_widget);
+}
+
+/**
+ * gtk_window_set_default_widget:
+ * @window: a #GtkWindow
+ * @default_widget: widget to be the default, or %NULL to unset
  *
  * The default widget is the widget that's activated when the user
  * presses Enter in a dialog (for example). This function sets or
@@ -1465,10 +1505,12 @@ _gtk_window_internal_set_focus (GtkWindo
  * call gtk_widget_grab_focus() on the widget. Before making a widget
  * the default widget, you must set the #GTK_CAN_DEFAULT flag on the
  * widget you'd like to make the default using GTK_WIDGET_SET_FLAGS().
+ *
+ * Since:  2.14
  **/
 void
-gtk_window_set_default (GtkWindow *window,
-			GtkWidget *default_widget)
+gtk_window_set_default_widget (GtkWindow *window,
+			       GtkWidget *default_widget)
 {
   g_return_if_fail (GTK_IS_WINDOW (window));
 
@@ -1512,6 +1554,26 @@ gtk_window_set_default (GtkWindow *windo
 	}
     }
 }
+/**
+ * gtk_window_get_default_widget:
+ * @window: a #GtkWindow
+ *
+ * The default widget is the widget that's activated when the user
+ * presses Enter in a dialog (for example). This function retrieves the
+ * default widget for a #GtkWindow. You can set this widget with
+ * gtk_window_set_default().
+ *
+ * Return value: the default widget for the @window, or %NULL if there's none.
+ *
+ * Since: 2.14
+ **/
+GtkWidget *
+gtk_window_get_default_widget (GtkWindow *window)
+{
+  g_return_val_if_fail (GTK_IS_WINDOW (window), NULL);
+
+  return window->default_widget;
+}
 
 void
 gtk_window_set_policy (GtkWindow *window,
Index: gtk/gtkwindow.h
===================================================================
--- gtk/gtkwindow.h	(Revision 20397)
+++ gtk/gtkwindow.h	(Arbeitskopie)
@@ -200,8 +200,13 @@ gboolean   gtk_window_activate_focus	   
 void       gtk_window_set_focus                (GtkWindow           *window,
 						GtkWidget           *focus);
 GtkWidget *gtk_window_get_focus                (GtkWindow           *window);
+#ifndef GTK_DISABLE_DEPRECATED
 void       gtk_window_set_default              (GtkWindow           *window,
 						GtkWidget           *default_widget);
+#endif
+void       gtk_window_set_default_widget       (GtkWindow           *window,
+						GtkWidget           *default_widget);
+GtkWidget *gtk_window_get_default_widget       (GtkWindow           *window);
 gboolean   gtk_window_activate_default	       (GtkWindow           *window);
 
 void       gtk_window_set_transient_for        (GtkWindow           *window, 
Index: docs/reference/gtk/gtk-sections.txt
===================================================================
--- docs/reference/gtk/gtk-sections.txt	(Revision 20397)
+++ docs/reference/gtk/gtk-sections.txt	(Arbeitskopie)
@@ -5396,6 +5396,7 @@ gtk_window_propagate_key_event
 gtk_window_get_focus
 gtk_window_set_focus
 gtk_window_set_default
+gtk_window_set_default_widget
 gtk_window_present
 gtk_window_present_with_time
 gtk_window_iconify
@@ -5426,6 +5427,7 @@ gtk_window_set_startup_id
 gtk_window_set_role
 gtk_window_get_decorated
 gtk_window_get_deletable
+gtk_window_get_default_widget
 gtk_window_get_default_icon_list
 gtk_window_get_default_size
 gtk_window_get_destroy_with_parent
