From fb2e12e8c8887fae3056508ecce870cbb2fc8097 Mon Sep 17 00:00:00 2001 From: Soeren Sandmann Date: Thu, 20 Nov 2003 15:03:27 +0000 Subject: [PATCH] Use gtk_widget_is_focus() instead of GTK_WIDGET_HAS_FOCUS. (#122327, Owen Thu Nov 20 15:48:03 2003 Soeren Sandmann * gtk/gtksocket.c (gtk_socket_focus): Use gtk_widget_is_focus() instead of GTK_WIDGET_HAS_FOCUS. (#122327, Owen Taylor. Reported by Frederic Crozat). --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtksocket.c | 2 +- 6 files changed, 31 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d87c7e9fca..7e17bda3ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Nov 20 15:48:03 2003 Soeren Sandmann + + * gtk/gtksocket.c (gtk_socket_focus): Use gtk_widget_is_focus() + instead of GTK_WIDGET_HAS_FOCUS. (#122327, Owen Taylor. Reported + by Frederic Crozat). + Thu Nov 20 13:10:29 GMT 2003 Tony Gale * docs/faq/gtk-faq.sgml: Update Section 3 to 2.x diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d87c7e9fca..7e17bda3ed 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Thu Nov 20 15:48:03 2003 Soeren Sandmann + + * gtk/gtksocket.c (gtk_socket_focus): Use gtk_widget_is_focus() + instead of GTK_WIDGET_HAS_FOCUS. (#122327, Owen Taylor. Reported + by Frederic Crozat). + Thu Nov 20 13:10:29 GMT 2003 Tony Gale * docs/faq/gtk-faq.sgml: Update Section 3 to 2.x diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d87c7e9fca..7e17bda3ed 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Thu Nov 20 15:48:03 2003 Soeren Sandmann + + * gtk/gtksocket.c (gtk_socket_focus): Use gtk_widget_is_focus() + instead of GTK_WIDGET_HAS_FOCUS. (#122327, Owen Taylor. Reported + by Frederic Crozat). + Thu Nov 20 13:10:29 GMT 2003 Tony Gale * docs/faq/gtk-faq.sgml: Update Section 3 to 2.x diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d87c7e9fca..7e17bda3ed 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Thu Nov 20 15:48:03 2003 Soeren Sandmann + + * gtk/gtksocket.c (gtk_socket_focus): Use gtk_widget_is_focus() + instead of GTK_WIDGET_HAS_FOCUS. (#122327, Owen Taylor. Reported + by Frederic Crozat). + Thu Nov 20 13:10:29 GMT 2003 Tony Gale * docs/faq/gtk-faq.sgml: Update Section 3 to 2.x diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d87c7e9fca..7e17bda3ed 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Thu Nov 20 15:48:03 2003 Soeren Sandmann + + * gtk/gtksocket.c (gtk_socket_focus): Use gtk_widget_is_focus() + instead of GTK_WIDGET_HAS_FOCUS. (#122327, Owen Taylor. Reported + by Frederic Crozat). + Thu Nov 20 13:10:29 GMT 2003 Tony Gale * docs/faq/gtk-faq.sgml: Update Section 3 to 2.x diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c index 0c3068ae03..3a76cfbe50 100644 --- a/gtk/gtksocket.c +++ b/gtk/gtksocket.c @@ -840,7 +840,7 @@ gtk_socket_focus (GtkWidget *widget, GtkDirectionType direction) if (socket->plug_widget) return gtk_widget_child_focus (socket->plug_widget, direction); - if (!GTK_WIDGET_HAS_FOCUS (widget)) + if (!gtk_widget_is_focus (widget)) { switch (direction) {