diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-03-27 06:38:11 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-03-27 06:38:11 +0000 |
| commit | 91e726a1c1cec64bcae64480db731da57db93f10 (patch) | |
| tree | 3edcdc1f8aa1a82b3ca029f5500a25ef0b466635 /apps/menu.h | |
| parent | 40595bd57ac138e1f6240a619a29a76c51b11b35 (diff) | |
| download | rockbox-91e726a1c1cec64bcae64480db731da57db93f10.tar.gz rockbox-91e726a1c1cec64bcae64480db731da57db93f10.tar.bz2 rockbox-91e726a1c1cec64bcae64480db731da57db93f10.zip | |
Move all valid menu return codes to a single file (root_menu.h) so we don't need to rely on GO_TO_ROOT == MENU_ATTACHED_USB.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12937 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menu.h')
| -rw-r--r-- | apps/menu.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/apps/menu.h b/apps/menu.h index aab2365a14..365af536e9 100644 --- a/apps/menu.h +++ b/apps/menu.h @@ -23,6 +23,7 @@ #include <stdbool.h> #include "icon.h" #include "icons.h" +#include "root_menu.h" /* needed for MENU_* return codes */ enum menu_item_type { @@ -193,12 +194,8 @@ int menu_init(const struct menu_item* mitems, int count, const char *button1, const char *button2, const char *button3); void menu_exit(int menu); - /* Returns below define, or number of selected menu item*/ + /* Returns MENU_* define from root_menu.h, or number of selected menu item*/ int menu_show(int m); -#define MENU_ATTACHED_USB -1 -#define MENU_SELECTED_EXIT -2 -#define MENU_EXIT_ALL -3 -#define MENU_RETURN_TO_WPS -4 bool menu_run(int menu); int menu_count(int menu); |