When setting the focus to NULL, clear the existing focus chain so that

Tue Mar  5 19:19:19 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkwindow.c (gtk_window_set_focus): When setting
        the focus to NULL, clear the existing focus chain so
        that when we focus into the window again, we start
        at the beginning. (Pointed out by Tim Janik.)

diff --git a/ChangeLog b/ChangeLog
index a0391167dffb8499cea6ee4602fe9f4047199334..1cac638a6730bd7b35cdf133a5e80285294692fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Mar  5 19:19:19 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_set_focus): When setting
+       the focus to NULL, clear the existing focus chain so
+       that when we focus into the window again, we start
+       at the beginning. (Pointed out by Tim Janik.)
+
 2002-03-06  James Henstridge  <james@daa.com.au>
 
        * configure.in: libpango is now called libpango-1.0

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index a0391167dffb8499cea6ee4602fe9f4047199334..1cac638a6730bd7b35cdf133a5e80285294692fa 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Tue Mar  5 19:19:19 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_set_focus): When setting
+       the focus to NULL, clear the existing focus chain so
+       that when we focus into the window again, we start
+       at the beginning. (Pointed out by Tim Janik.)
+
 2002-03-06  James Henstridge  <james@daa.com.au>
 
        * configure.in: libpango is now called libpango-1.0

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a0391167dffb8499cea6ee4602fe9f4047199334..1cac638a6730bd7b35cdf133a5e80285294692fa 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Tue Mar  5 19:19:19 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_set_focus): When setting
+       the focus to NULL, clear the existing focus chain so
+       that when we focus into the window again, we start
+       at the beginning. (Pointed out by Tim Janik.)
+
 2002-03-06  James Henstridge  <james@daa.com.au>
 
        * configure.in: libpango is now called libpango-1.0

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a0391167dffb8499cea6ee4602fe9f4047199334..1cac638a6730bd7b35cdf133a5e80285294692fa 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Tue Mar  5 19:19:19 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_set_focus): When setting
+       the focus to NULL, clear the existing focus chain so
+       that when we focus into the window again, we start
+       at the beginning. (Pointed out by Tim Janik.)
+
 2002-03-06  James Henstridge  <james@daa.com.au>
 
        * configure.in: libpango is now called libpango-1.0

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a0391167dffb8499cea6ee4602fe9f4047199334..1cac638a6730bd7b35cdf133a5e80285294692fa 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Tue Mar  5 19:19:19 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_set_focus): When setting
+       the focus to NULL, clear the existing focus chain so
+       that when we focus into the window again, we start
+       at the beginning. (Pointed out by Tim Janik.)
+
 2002-03-06  James Henstridge  <james@daa.com.au>
 
        * configure.in: libpango is now called libpango-1.0

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a0391167dffb8499cea6ee4602fe9f4047199334..1cac638a6730bd7b35cdf133a5e80285294692fa 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Tue Mar  5 19:19:19 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_set_focus): When setting
+       the focus to NULL, clear the existing focus chain so
+       that when we focus into the window again, we start
+       at the beginning. (Pointed out by Tim Janik.)
+
 2002-03-06  James Henstridge  <james@daa.com.au>
 
        * configure.in: libpango is now called libpango-1.0

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a0391167dffb8499cea6ee4602fe9f4047199334..1cac638a6730bd7b35cdf133a5e80285294692fa 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Tue Mar  5 19:19:19 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_set_focus): When setting
+       the focus to NULL, clear the existing focus chain so
+       that when we focus into the window again, we start
+       at the beginning. (Pointed out by Tim Janik.)
+
 2002-03-06  James Henstridge  <james@daa.com.au>
 
        * configure.in: libpango is now called libpango-1.0

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index fa8f0264d51829f7eefb6ac70146606bcf3a0dc0..20a29d870e1c29c578c473cceb8961ad747d3692 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -961,7 +961,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