summaryrefslogtreecommitdiffstats
path: root/apps/menu.c
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-07-17 10:31:31 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-07-24 21:20:13 +0000
commit658026e6267277b27d297c481728f74d160a8481 (patch)
tree915a9d2bb48469bdd5b9127dc19a61f230721a6c /apps/menu.c
parent8cb555460ff79e636a7907fb2589e16db98c8600 (diff)
downloadrockbox-658026e6267277b27d297c481728f74d160a8481.tar.gz
rockbox-658026e6267277b27d297c481728f74d160a8481.tar.bz2
rockbox-658026e6267277b27d297c481728f74d160a8481.zip
[4/4] Remove HAVE_LCD_BITMAP, as it's now the only choice.
Note: I left behind lcd_bitmap in features.txt, because removing it would require considerable work in the manual and the translations. Change-Id: Ia8ca7761f610d9332a0d22a7d189775fb15ec88a
Diffstat (limited to 'apps/menu.c')
-rw-r--r--apps/menu.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/apps/menu.c b/apps/menu.c
index 49e6c58b2b..1e0cb3668f 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -54,9 +54,7 @@
#include "quickscreen.h"
#include "shortcuts.h"
-#ifdef HAVE_LCD_BITMAP
#include "icons.h"
-#endif
/* gui api */
#include "list.h"
@@ -129,7 +127,7 @@ static const char* get_menu_item_name(int selected_item,
}
return P2STR(menu->callback_and_desc->desc);
}
-#ifdef HAVE_LCD_BITMAP
+
static enum themable_icons menu_get_icon(int selected_item, void * data)
{
const struct menu_item_ex *menu = (const struct menu_item_ex *)data;
@@ -168,7 +166,6 @@ static enum themable_icons menu_get_icon(int selected_item, void * data)
}
return menu_icon;
}
-#endif
static void init_menu_lists(const struct menu_item_ex *menu,
struct gui_synclist *lists, int selected, bool callback,
@@ -207,7 +204,6 @@ static void init_menu_lists(const struct menu_item_ex *menu,
current_submenus_menu = (struct menu_item_ex *)menu;
gui_synclist_init(lists,get_menu_item_name,(void*)menu,false,1, parent);
-#ifdef HAVE_LCD_BITMAP
if (menu->flags&MENU_HAS_DESC)
{
@@ -232,11 +228,6 @@ static void init_menu_lists(const struct menu_item_ex *menu,
icon = Icon_Submenu_Entered;
gui_synclist_set_title(lists, title, icon);
gui_synclist_set_icon_callback(lists, global_settings.show_icons?menu_get_icon:NULL);
-#else
- (void)icon;
- (void)title;
- gui_synclist_set_icon_callback(lists, NULL);
-#endif
if(global_settings.talk_menu)
gui_synclist_set_voice_callback(lists, talk_menu_item);
gui_synclist_set_nb_items(lists,current_subitems_count);