summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2019-10-07 15:36:51 +0100
committerEmmanuele Bassi <ebassi@gnome.org>2019-10-07 15:36:51 +0100
commit8467850709de97d0ddefef7e9074374612b18ac0 (patch)
tree589f30b6935f02ba3dc9a23f851cedf1f92c704a
parent56c6970b027740d1a35e8452a9172c9e7c2368d5 (diff)
downloadgtk+-8467850709de97d0ddefef7e9074374612b18ac0.tar.gz
win32: Remove extraneous changes
Commit 6ae30826033 included some changes from the gtk-3-24 branch that do not make sense in the context of the commit, and break the build of GTK 2 on Windows. The delta_x and delta_y fields do not exist in the GdkEventScroll in the gtk-2-24 branch.
-rw-r--r--gdk/win32/gdkevents-win32.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 6b373e8d84..b4b2a94dd7 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -2784,13 +2784,11 @@ gdk_event_translate (MSG *msg,
{
event->scroll.direction = (((short) HIWORD (msg->wParam)) > 0) ?
GDK_SCROLL_UP : GDK_SCROLL_DOWN;
- event->scroll.delta_y = (gdouble) GET_WHEEL_DELTA_WPARAM (msg->wParam) / 120.0;
}
else if (msg->message == WM_MOUSEHWHEEL)
{
event->scroll.direction = (((short) HIWORD (msg->wParam)) > 0) ?
GDK_SCROLL_RIGHT : GDK_SCROLL_LEFT;
- event->scroll.delta_x = (gdouble) GET_WHEEL_DELTA_WPARAM (msg->wParam) / 120.0;
}
event->scroll.time = _gdk_win32_get_next_tick (msg->time);
event->scroll.x = (gint16) point.x;