Compare only the HAS_DEFAULT flags. (#160711, Tommi Komulainen)

2004-12-13  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkwindow.c (gtk_window_real_set_focus): Compare only
	the HAS_DEFAULT flags.  (#160711, Tommi Komulainen)
This commit is contained in:
Matthias Clasen 2004-12-13 17:27:32 +00:00 committed by Matthias Clasen
parent 7a448075bc
commit d2cb503ec5
5 changed files with 15 additions and 3 deletions

View File

@ -1,5 +1,8 @@
2004-12-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkwindow.c (gtk_window_real_set_focus): Compare only
the HAS_DEFAULT flags. (#160711, Tommi Komulainen)
* gtk/gtkimage.c (gtk_image_set_property): Add a missing break
statement. (#161172, Damon Chaplin)

View File

@ -1,5 +1,8 @@
2004-12-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkwindow.c (gtk_window_real_set_focus): Compare only
the HAS_DEFAULT flags. (#160711, Tommi Komulainen)
* gtk/gtkimage.c (gtk_image_set_property): Add a missing break
statement. (#161172, Damon Chaplin)

View File

@ -1,5 +1,8 @@
2004-12-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkwindow.c (gtk_window_real_set_focus): Compare only
the HAS_DEFAULT flags. (#160711, Tommi Komulainen)
* gtk/gtkimage.c (gtk_image_set_property): Add a missing break
statement. (#161172, Damon Chaplin)

View File

@ -1,5 +1,8 @@
2004-12-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkwindow.c (gtk_window_real_set_focus): Compare only
the HAS_DEFAULT flags. (#160711, Tommi Komulainen)
* gtk/gtkimage.c (gtk_image_set_property): Add a missing break
statement. (#161172, Damon Chaplin)

View File

@ -4689,7 +4689,7 @@ gtk_window_real_set_focus (GtkWindow *window,
GtkWidget *focus)
{
GtkWidget *old_focus = window->focus_widget;
gboolean def_flags = 0;
gboolean had_default = FALSE;
if (old_focus)
{
@ -4703,7 +4703,7 @@ gtk_window_real_set_focus (GtkWindow *window,
}
if (window->default_widget)
def_flags = GTK_WIDGET_HAS_DEFAULT (window->default_widget);
had_default = GTK_WIDGET_HAS_DEFAULT (window->default_widget);
if (window->focus_widget)
{
@ -4754,7 +4754,7 @@ gtk_window_real_set_focus (GtkWindow *window,
* is harmless.
*/
if (window->default_widget &&
(def_flags != GTK_WIDGET_FLAGS (window->default_widget)))
(had_default != GTK_WIDGET_HAS_DEFAULT (window->default_widget)))
gtk_widget_queue_draw (window->default_widget);
if (old_focus)