summaryrefslogtreecommitdiff
path: root/apps/tree.c
diff options
context:
space:
mode:
authorPeter D'Hoye <peter.dhoye@gmail.com>2008-05-29 20:32:39 +0000
committerPeter D'Hoye <peter.dhoye@gmail.com>2008-05-29 20:32:39 +0000
commitf76122f0e7a3b82962dbe005d58a643c835013d0 (patch)
tree5c4e17d6bf78d70c5612191f9c2f70a561e35b77 /apps/tree.c
parent0792596e1757a5ad91c3959d3721d812c8a282eb (diff)
downloadrockbox-f76122f0e7a3b82962dbe005d58a643c835013d0.tar.gz
rockbox-f76122f0e7a3b82962dbe005d58a643c835013d0.zip
Accept FS #9052 by Alexander Levin with a fix by me. Changes HAS_BUTTONBAR into HAVE_BUTTONBAR to bring it in line with the other defines
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17655 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/tree.c')
-rw-r--r--apps/tree.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/tree.c b/apps/tree.c
index 5771311847..6e023b7a8c 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -89,7 +89,7 @@ struct gui_synclist tree_lists;
89 89
90/* I put it here because other files doesn't use it yet, 90/* I put it here because other files doesn't use it yet,
91 * but should be elsewhere since it will be used mostly everywhere */ 91 * but should be elsewhere since it will be used mostly everywhere */
92#ifdef HAS_BUTTONBAR 92#ifdef HAVE_BUTTONBAR
93struct gui_buttonbar tree_buttonbar; 93struct gui_buttonbar tree_buttonbar;
94#endif 94#endif
95static struct tree_context tc; 95static struct tree_context tc;
@@ -299,7 +299,7 @@ void tree_gui_init(void)
299 FOR_NB_SCREENS(i) 299 FOR_NB_SCREENS(i)
300 screens[i].double_height(false); 300 screens[i].double_height(false);
301#endif 301#endif
302#ifdef HAS_BUTTONBAR 302#ifdef HAVE_BUTTONBAR
303 gui_buttonbar_init(&tree_buttonbar); 303 gui_buttonbar_init(&tree_buttonbar);
304 /* since archos only have one screen, no need to create more than that */ 304 /* since archos only have one screen, no need to create more than that */
305 gui_buttonbar_set_display(&tree_buttonbar, &(screens[SCREEN_MAIN]) ); 305 gui_buttonbar_set_display(&tree_buttonbar, &(screens[SCREEN_MAIN]) );
@@ -463,7 +463,7 @@ static int update_dir(void)
463 tc.selected_item=tc.filesindir-1; 463 tc.selected_item=tc.filesindir-1;
464 464
465 gui_synclist_select_item(&tree_lists, tc.selected_item); 465 gui_synclist_select_item(&tree_lists, tc.selected_item);
466#ifdef HAS_BUTTONBAR 466#ifdef HAVE_BUTTONBAR
467 if (global_settings.buttonbar) { 467 if (global_settings.buttonbar) {
468 if (*tc.dirfilter < NUM_FILTER_MODES) 468 if (*tc.dirfilter < NUM_FILTER_MODES)
469 gui_buttonbar_set(&tree_buttonbar, str(LANG_SYSFONT_DIRBROWSE_F1), 469 gui_buttonbar_set(&tree_buttonbar, str(LANG_SYSFONT_DIRBROWSE_F1),