diff options
| author | Tor Lillqvist <tml@novell.com> | 2006-05-09 15:19:11 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2006-05-09 15:19:11 +0000 |
| commit | 2b72f53e6d1fc4218cf0a8cdae17ea4dbd9b7d38 (patch) | |
| tree | 931972a6a096900cae4c913d44a9df8c2a390004 | |
| parent | 7c72f54057b2ca536d3bc5901f3568f648e0a17b (diff) | |
| download | gdk-pixbuf-2b72f53e6d1fc4218cf0a8cdae17ea4dbd9b7d38.tar.gz | |
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)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | gdk/win32/gdkevents-win32.c | 11 |
3 files changed, 16 insertions, 5 deletions
@@ -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-03 Michael Natterer <mitch@imendio.com> * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_constructor): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index df1cce661..ea59000bd 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -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-03 Michael Natterer <mitch@imendio.com> * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_constructor): diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index a0235984b..b5617633e 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -1793,11 +1793,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 |