[gtk+/gtk-3-2] quartz: include all buttons' state in GdkEventMotion.state (cherry picked from commit 3b5c5710daa337

[Michael Natterer <mitch src gnome org>]

commit 5deb446b50fd31546cd1d1ca5653ee0a66ac1bcd
Author: Michael Natterer <mitch gimp org>
Date:   Wed Nov 9 00:34:45 2011 +0100

    quartz: include all buttons' state in GdkEventMotion.state
    (cherry picked from commit 3b5c5710daa337b61c9e2135e3e55c380e5bc991)

 gdk/quartz/gdkevents-quartz.c |   19 ++-----------------
 1 files changed, 2 insertions(+), 17 deletions(-)
---
diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
index edf56fb..cf9c4be 100644
--- a/gdk/quartz/gdkevents-quartz.c
+++ b/gdk/quartz/gdkevents-quartz.c
@@ -836,22 +836,6 @@ fill_motion_event (GdkWindow *window,
                    gint       x_root,
                    gint       y_root)
 {
-  GdkModifierType state;
-
-  state = get_keyboard_modifiers_from_ns_event (nsevent);
-
-  switch ([nsevent type])
-    {
-    case NSLeftMouseDragged:
-    case NSRightMouseDragged:
-    case NSOtherMouseDragged:
-      state |= get_mouse_button_modifiers_from_ns_event (nsevent);
-      break;
-
-    case NSMouseMoved:
-      break;
-    }
-
   event->any.type = GDK_MOTION_NOTIFY;
   event->motion.window = window;
   event->motion.time = get_time_from_ns_event (nsevent);
@@ -860,7 +844,8 @@ fill_motion_event (GdkWindow *window,
   event->motion.x_root = x_root;
   event->motion.y_root = y_root;
   /* FIXME event->axes */
-  event->motion.state = state;
+  event->motion.state = get_keyboard_modifiers_from_ns_event (nsevent) |
+                        _gdk_quartz_events_get_current_mouse_modifiers ();
   event->motion.is_hint = FALSE;
   event->motion.device = _gdk_display->core_pointer;
 }