Merge branch 'window-activate-grab-4-2.4' into 'master'

gdk: do not deactivate surface on keyboard grab

Closes #85

See merge request GNOME/gtk!120
This commit is contained in:
Benjamin Otte
2018-04-30 09:48:25 +00:00
2 changed files with 2 additions and 2 deletions

View File

@@ -32,7 +32,7 @@
#define HAS_FOCUS(toplevel) \
((toplevel)->has_focus || (toplevel)->has_pointer_focus)
((toplevel)->has_focus_window || (toplevel)->has_pointer_focus)
static void gdk_x11_device_manager_core_finalize (GObject *object);
static void gdk_x11_device_manager_core_constructed (GObject *object);

View File

@@ -37,7 +37,7 @@ static void gdk_event_source_finalize (GSource *source);
static GQuark quark_needs_enter = 0;
#define HAS_FOCUS(toplevel) \
((toplevel)->has_focus || (toplevel)->has_pointer_focus)
((toplevel)->has_focus_window || (toplevel)->has_pointer_focus)
struct _GdkEventSource
{