diff options
| author | Tor Lillqvist <tml@novell.com> | 2006-05-09 15:54:22 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2006-05-09 15:54:22 +0000 |
| commit | 6a652781accede40a5b2b4f92d1630f7fd37f74e (patch) | |
| tree | 1212d2a62f42aaf7b57212d55c89e3881abffd10 /gdk | |
| parent | d93027ea32a7482e75b0d691c05b0a34899eb4db (diff) | |
| download | gtk+-6a652781accede40a5b2b4f92d1630f7fd37f74e.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)
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/win32/gdkevents-win32.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index 3683bc3a57..a6db62f952 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -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 |