AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Replace a couple of inappropriate calls to GTK_WIDGET_HAS_FOCUS() with

Browse Source 
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)
This commit is contained in:
Owen Taylor 2001-07-12 20:59:42 +00:00 committed by Owen Taylor
parent 82ffb2f502
commit a70fca529b
8 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,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

5
ChangeLog.pre-2-0
View File

@ -1,3 +1,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

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,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

5
ChangeLog.pre-2-2
View File

@ -1,3 +1,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

5
ChangeLog.pre-2-4
View File

@ -1,3 +1,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

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,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

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,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

4
gtk/gtkwidget.c
View File

@ -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;