summaryrefslogtreecommitdiffstats
path: root/apps/menu.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/menu.c
parent0792596e1757a5ad91c3959d3721d812c8a282eb (diff)
downloadrockbox-f76122f0e7a3b82962dbe005d58a643c835013d0.tar.gz
rockbox-f76122f0e7a3b82962dbe005d58a643c835013d0.tar.bz2
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/menu.c')
-rw-r--r--apps/menu.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/menu.c b/apps/menu.c
index bbe3d697dd..64bb6e1847 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -299,7 +299,7 @@ static void init_default_menu_viewports(struct viewport parent[NB_SCREENS], bool
}
}
}
-#ifdef HAS_BUTTONBAR
+#ifdef HAVE_BUTTONBAR
if (!hide_bars && global_settings.buttonbar)
parent[0].height -= BUTTONBAR_HEIGHT;
#endif
@@ -383,7 +383,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
bool in_stringlist, done = false;
struct viewport *vps, menu_vp[NB_SCREENS]; /* menu_vp will hopefully be phased out */
-#ifdef HAS_BUTTONBAR
+#ifdef HAVE_BUTTONBAR
struct gui_buttonbar buttonbar;
gui_buttonbar_init(&buttonbar);
gui_buttonbar_set_display(&buttonbar, &(screens[SCREEN_MAIN]) );
@@ -418,7 +418,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
get_menu_callback(menu, &menu_callback);
-#ifdef HAS_BUTTONBAR
+#ifdef HAVE_BUTTONBAR
if (!hide_bars)
{
gui_buttonbar_set(&buttonbar, "<<<", "", "");
@@ -526,7 +526,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
else if (action == ACTION_STD_OK)
{
int type;
-#ifdef HAS_BUTTONBAR
+#ifdef HAVE_BUTTONBAR
if (!hide_bars)
{
gui_buttonbar_unset(&buttonbar);
@@ -633,7 +633,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
done = true;
break;
}
-#ifdef HAS_BUTTONBAR
+#ifdef HAVE_BUTTONBAR
if (!hide_bars)
{
gui_buttonbar_set(&buttonbar, "<<<", "", "");