summaryrefslogtreecommitdiff
path: root/apps/menu.c
diff options
context:
space:
mode:
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 @@
54#include "quickscreen.h" 54#include "quickscreen.h"
55#include "shortcuts.h" 55#include "shortcuts.h"
56 56
57#ifdef HAVE_LCD_BITMAP
58#include "icons.h" 57#include "icons.h"
59#endif
60 58
61/* gui api */ 59/* gui api */
62#include "list.h" 60#include "list.h"
@@ -129,7 +127,7 @@ static const char* get_menu_item_name(int selected_item,
129 } 127 }
130 return P2STR(menu->callback_and_desc->desc); 128 return P2STR(menu->callback_and_desc->desc);
131} 129}
132#ifdef HAVE_LCD_BITMAP 130
133static enum themable_icons menu_get_icon(int selected_item, void * data) 131static enum themable_icons menu_get_icon(int selected_item, void * data)
134{ 132{
135 const struct menu_item_ex *menu = (const struct menu_item_ex *)data; 133 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)
168 } 166 }
169 return menu_icon; 167 return menu_icon;
170} 168}
171#endif
172 169
173static void init_menu_lists(const struct menu_item_ex *menu, 170static void init_menu_lists(const struct menu_item_ex *menu,
174 struct gui_synclist *lists, int selected, bool callback, 171 struct gui_synclist *lists, int selected, bool callback,
@@ -207,7 +204,6 @@ static void init_menu_lists(const struct menu_item_ex *menu,
207 current_submenus_menu = (struct menu_item_ex *)menu; 204 current_submenus_menu = (struct menu_item_ex *)menu;
208 205
209 gui_synclist_init(lists,get_menu_item_name,(void*)menu,false,1, parent); 206 gui_synclist_init(lists,get_menu_item_name,(void*)menu,false,1, parent);
210#ifdef HAVE_LCD_BITMAP
211 207
212 if (menu->flags&MENU_HAS_DESC) 208 if (menu->flags&MENU_HAS_DESC)
213 { 209 {
@@ -232,11 +228,6 @@ static void init_menu_lists(const struct menu_item_ex *menu,
232 icon = Icon_Submenu_Entered; 228 icon = Icon_Submenu_Entered;
233 gui_synclist_set_title(lists, title, icon); 229 gui_synclist_set_title(lists, title, icon);
234 gui_synclist_set_icon_callback(lists, global_settings.show_icons?menu_get_icon:NULL); 230 gui_synclist_set_icon_callback(lists, global_settings.show_icons?menu_get_icon:NULL);
235#else
236 (void)icon;
237 (void)title;
238 gui_synclist_set_icon_callback(lists, NULL);
239#endif
240 if(global_settings.talk_menu) 231 if(global_settings.talk_menu)
241 gui_synclist_set_voice_callback(lists, talk_menu_item); 232 gui_synclist_set_voice_callback(lists, talk_menu_item);
242 gui_synclist_set_nb_items(lists,current_subitems_count); 233 gui_synclist_set_nb_items(lists,current_subitems_count);