Look at both GDK_SCROLL_MASK and GDK_BUTTON_PRESS_MASK. (#139628)

2006-05-09  Tor Lillqvist  <tml@novell.com>

	* gdk/win32/gdkevents-win32.c (doesnt_want_scroll): Look at both
	GDK_SCROLL_MASK and GDK_BUTTON_PRESS_MASK. (#139628)
This commit is contained in:
Tor Lillqvist 2006-05-09 15:54:22 +00:00 committed by Tor Lillqvist
parent d93027ea32
commit 6a652781ac
3 changed files with 16 additions and 5 deletions

View File

@ -1,3 +1,8 @@
2006-05-09 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkevents-win32.c (doesnt_want_scroll): Look at both
GDK_SCROLL_MASK and GDK_BUTTON_PRESS_MASK. (#139628)
2006-05-09 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Add a :cursor-position

View File

@ -1,3 +1,8 @@
2006-05-09 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkevents-win32.c (doesnt_want_scroll): Look at both
GDK_SCROLL_MASK and GDK_BUTTON_PRESS_MASK. (#139628)
2006-05-09 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Add a :cursor-position

View File

@ -1801,11 +1801,12 @@ static gboolean
doesnt_want_scroll (gint mask,
MSG *msg)
{
#if 0
return !(mask & GDK_SCROLL_MASK);
#else
return !(mask & GDK_BUTTON_PRESS_MASK);
#endif
/* As there are no separate scroll events in X11, button press
* events are used, so higher level code might be selecting for
* either GDK_BUTTON_PRESS_MASK or GDK_SCROLL_MASK when it wants GDK
* scroll events. Make sure this works in the Win32 backend, too.
*/
return !(mask & (GDK_SCROLL_MASK|GDK_BUTTON_PRESS_MASK));
}
static void