[gtk+/gtk-2-24] Bug 722815 - Deliver GdkModifierType during 'drag-motion'

[Matthias Clasen <matthiasc src gnome org>]

commit 679d2a45afb5496b4b4e1b3901a972a9e5c57663
Author: Hans Breuer <hans breuer org>
Date:   Fri Nov 7 16:44:17 2014 +0100

    Bug 722815 - Deliver GdkModifierType during 'drag-motion'
    
    This bug was also found by clang:
    
    gdkwindow-quartz.c:1956:11: warning: implicit conversion from enumeration type 'GdkEventMask' to
          different enumeration type 'GdkModifierType' [-Wenum-conversion]
      *mask = _gdk_quartz_events_get_current_event_mask ();
            ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    1 warning generated.

 gdk/quartz/gdkwindow-quartz.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index 7b43257..7cd7789 100644
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -1953,7 +1953,8 @@ gdk_window_quartz_get_pointer_helper (GdkWindow       *window,
   
   toplevel = GDK_WINDOW_OBJECT (gdk_window_get_effective_toplevel (window));
 
-  *mask = _gdk_quartz_events_get_current_event_mask ();
+  *mask = _gdk_quartz_events_get_current_keyboard_modifiers ()
+       | _gdk_quartz_events_get_current_mouse_modifiers ();
 
   /* Get the y coordinate, needs to be flipped. */
   if (window == _gdk_root)