Replace a couple of inappropriate calls to GTK_WIDGET_HAS_FOCUS() with

Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkwidget.c: Replace a couple of inappropriate calls to
	GTK_WIDGET_HAS_FOCUS() with gtk_widget_is_focus(). (#57067)

ChangeLog

+Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.c: Replace a couple of inappropriate calls to 
+	GTK_WIDGET_HAS_FOCUS() with gtk_widget_is_focus(). (#57067)
+
 Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>
 	* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add

ChangeLog.pre-2-0

+Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.c: Replace a couple of inappropriate calls to 
+	GTK_WIDGET_HAS_FOCUS() with gtk_widget_is_focus(). (#57067)
+
 Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>
 	* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add

ChangeLog.pre-2-10

+Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.c: Replace a couple of inappropriate calls to 
+	GTK_WIDGET_HAS_FOCUS() with gtk_widget_is_focus(). (#57067)
+
 Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>
 	* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add

ChangeLog.pre-2-2

+Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.c: Replace a couple of inappropriate calls to 
+	GTK_WIDGET_HAS_FOCUS() with gtk_widget_is_focus(). (#57067)
+
 Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>
 	* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add

ChangeLog.pre-2-4

+Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.c: Replace a couple of inappropriate calls to 
+	GTK_WIDGET_HAS_FOCUS() with gtk_widget_is_focus(). (#57067)
+
 Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>
 	* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add

ChangeLog.pre-2-6

+Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.c: Replace a couple of inappropriate calls to 
+	GTK_WIDGET_HAS_FOCUS() with gtk_widget_is_focus(). (#57067)
+
 Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>
 	* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add

ChangeLog.pre-2-8

+Thu Jul 12 16:51:34 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.c: Replace a couple of inappropriate calls to 
+	GTK_WIDGET_HAS_FOCUS() with gtk_widget_is_focus(). (#57067)
+
 Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>
 	* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add

gtk/gtkwidget.c

@@ -3158,7 +3158,7 @@ gtk_widget_real_focus (GtkWidget         *widget,
   if (!GTK_WIDGET_CAN_FOCUS (widget))
     return FALSE;
   
-  if (!GTK_WIDGET_HAS_FOCUS (widget))
+  if (!gtk_widget_is_focus (widget))
     {
       gtk_widget_grab_focus (widget);
       return TRUE;
@@ -5382,7 +5382,7 @@ gtk_widget_propagate_state (GtkWidget           *widget,
       GTK_WIDGET_STATE (widget) = GTK_STATE_INSENSITIVE;
     }
 
-  if (GTK_WIDGET_HAS_FOCUS (widget) && !GTK_WIDGET_IS_SENSITIVE (widget))
+  if (gtk_widget_is_focus (widget) && !GTK_WIDGET_IS_SENSITIVE (widget))
     {
       GtkWidget *window;