From fd14cac7c2feb471f8bf546d10e15f1336657064 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Mon, 2 Mar 2009 19:25:50 +0000 Subject: Split HAVE_SCROLLWHEEL into HAVE_SCROLLWHEEL and HAVE_WHEEL_ACCELERATION, where the latter now activates the wheel acceleration code. HAVE_SCROLLWHEEL plainly indicates the existence of a scrollwheel, thus all ipods define it now (in addition to the ones and some sansas which did before). Same applies to the manual. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20177 a1c6a512-1295-4272-9138-f99709370657 --- apps/menus/display_menu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apps/menus') diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index dbc7206b91..d70cf37687 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c @@ -251,11 +251,11 @@ MENUITEM_SETTING(jump_scroll, &global_settings.jump_scroll, NULL); MENUITEM_SETTING(jump_scroll_delay, &global_settings.jump_scroll_delay, NULL); #endif /* list acceleration */ -#ifndef HAVE_SCROLLWHEEL +#ifndef HAVE_WHEEL_ACCELERATION MENUITEM_SETTING(list_accel_start_delay, &global_settings.list_accel_start_delay, NULL); MENUITEM_SETTING(list_accel_wait, &global_settings.list_accel_wait, NULL); -#endif /* HAVE_SCROLLWHEEL */ +#endif /* HAVE_WHEEL_ACCELERATION */ #ifdef HAVE_LCD_BITMAP static int screenscroll_callback(int action,const struct menu_item_ex *this_item) { @@ -290,7 +290,7 @@ MAKE_MENU(scroll_settings_menu, ID2P(LANG_SCROLL_MENU), 0, Icon_NOICON, &offset_out_of_view, &screen_scroll_step, #endif &scroll_paginated, -#ifndef HAVE_SCROLLWHEEL +#ifndef HAVE_WHEEL_ACCELERATION &list_accel_start_delay, &list_accel_wait #endif ); -- cgit v1.2.3