[gtk/wip/matthiasc/focus3: 5/32] Move a check to gtk_window_set_focus

[Matthias Clasen <matthiasc src gnome org>]

commit d68523a16bcb3f188fb5d0517069860b35186023
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Mar 2 11:40:09 2019 -0500

    Move a check to gtk_window_set_focus
    
    gtk_widget_grab_focus is just a wrapper for
    gtk_window_set_focus. We should do all the enforcement
    there.

 gtk/gtkwidget.c | 3 ---
 gtk/gtkwindow.c | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 881cb9c2f1..0a4de53af6 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -5337,9 +5337,6 @@ gtk_widget_grab_focus (GtkWidget *widget)
 {
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
-  if (!gtk_widget_is_sensitive (widget))
-    return;
-
   GTK_WIDGET_GET_CLASS (widget)->grab_focus (widget);
 }
 
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 3af2dea877..97a886009c 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -7331,6 +7331,9 @@ static void
 gtk_window_real_set_focus (GtkWindow *window,
                           GtkWidget *focus)
 {
+  if (focus && !gtk_widget_is_sensitive (focus))
+    return;
+
   unset_focus_widget (window);
   set_focus_widget (window, focus);