Commit bcb3a326 authored by Benjamin Otte's avatar Benjamin Otte

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
parents 3684b721 01455399
......@@ -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);
......
......@@ -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
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment