summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2008-05-29 09:14:32 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2008-05-29 09:14:32 +0000
commit43f0770943a3315561dbdcdb2bbb85b7026248b1 (patch)
treed6140e40c0b07f36f98aa86020d2c308d1acc960 /apps
parentfd3b46c22ca34eabf1e3697ae7d54fb17da804a4 (diff)
downloadrockbox-43f0770943a3315561dbdcdb2bbb85b7026248b1.tar.gz
rockbox-43f0770943a3315561dbdcdb2bbb85b7026248b1.tar.bz2
rockbox-43f0770943a3315561dbdcdb2bbb85b7026248b1.zip
move the HAS_BUTTONBAR define to the config-<target>.h files
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17652 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/gui/buttonbar.h12
-rw-r--r--apps/recorder/keyboard.c5
2 files changed, 7 insertions, 10 deletions
diff --git a/apps/gui/buttonbar.h b/apps/gui/buttonbar.h
index e7a366420c..3098ecce4f 100644
--- a/apps/gui/buttonbar.h
+++ b/apps/gui/buttonbar.h
@@ -21,13 +21,14 @@
#define _GUI_BUTTONBAR_H_
#include "config.h"
#include "button.h"
-#if CONFIG_KEYPAD == RECORDER_PAD
+#include "screen_access.h"
+
-#define HAS_BUTTONBAR
+#ifdef HAS_BUTTONBAR
#define BUTTONBAR_HEIGHT 8
#define BUTTONBAR_MAX_BUTTONS 3
#define BUTTONBAR_CAPTION_LENGTH 8
-#include "screen_access.h"
+
struct gui_buttonbar
{
@@ -76,6 +77,7 @@ extern void gui_buttonbar_draw(struct gui_buttonbar * buttonbar);
* - buttonbar : the buttonbar
*/
extern bool gui_buttonbar_isset(struct gui_buttonbar * buttonbar);
-
-#endif /* CONFIG_KEYPAD == RECORDER_PAD */
+#else
+#define BUTTONBAR_HEIGHT 0
+#endif
#endif /* _GUI_BUTTONBAR_H_ */
diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c
index ae7666f788..752e0369e9 100644
--- a/apps/recorder/keyboard.c
+++ b/apps/recorder/keyboard.c
@@ -40,11 +40,6 @@
#define O_BINARY 0
#endif
-#if CONFIG_KEYPAD == RECORDER_PAD
-#define BUTTONBAR_HEIGHT 8
-#else
-#define BUTTONBAR_HEIGHT 0
-#endif
#define DEFAULT_MARGIN 6
#define KBD_BUF_SIZE 500