diff --git a/src/libinput.h b/src/libinput.h index 96da0e0b..d765ced2 100644 --- a/src/libinput.h +++ b/src/libinput.h @@ -167,12 +167,6 @@ enum libinput_button_state { enum libinput_pointer_axis { LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL = 0, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL = 1, - - - /** @deprecated Use @ref LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL instead */ - LIBINPUT_POINTER_AXIS_VERTICAL_SCROLL = LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, - /** @deprecated Use @ref LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL instead */ - LIBINPUT_POINTER_AXIS_HORIZONTAL_SCROLL = LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL }; /** diff --git a/tools/event-gui.c b/tools/event-gui.c index 9475e778..234ece93 100644 --- a/tools/event-gui.c +++ b/tools/event-gui.c @@ -284,11 +284,11 @@ handle_event_axis(struct libinput_event *ev, struct window *w) double v = libinput_event_pointer_get_axis_value(p); switch (axis) { - case LIBINPUT_POINTER_AXIS_VERTICAL_SCROLL: + case LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL: w->vy += (int)v; w->vy = clip(w->vy, 0, w->height); break; - case LIBINPUT_POINTER_AXIS_HORIZONTAL_SCROLL: + case LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL: w->hx += (int)v; w->hx = clip(w->hx, 0, w->width); break;