gtk+ r19599 - in branches/gtk-2-12: . gdk/quartz

[rhult svn gnome org]

Author: rhult
Date: Sat Feb 16 09:52:49 2008
New Revision: 19599
URL: http://svn.gnome.org/viewvc/gtk+?rev=19599&view=rev

Log:
2008-02-16  Richard Hult  <richard imendio com>

	Merged from trunk:

	* gdk/quartz/gdkevents-quartz.c (create_scroll_event): Add state
	to the scroll event (bug #516757, Paul Davis).


Modified:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/gdk/quartz/gdkevents-quartz.c

Modified: branches/gtk-2-12/gdk/quartz/gdkevents-quartz.c
==============================================================================
--- branches/gtk-2-12/gdk/quartz/gdkevents-quartz.c	(original)
+++ branches/gtk-2-12/gdk/quartz/gdkevents-quartz.c	Sat Feb 16 09:52:49 2008
@@ -1439,6 +1439,7 @@
   point = [nsevent locationInWindow];
   event->scroll.x = point.x;
   event->scroll.y = point.y;
+  event->scroll.state = get_keyboard_modifiers_from_ns_event (nsevent);
   convert_window_coordinates_to_root (window, event->scroll.x, event->scroll.y, 
 				      &event->scroll.x_root,
 				      &event->scroll.y_root);