Now it compiles without a warning under Visual C++ ... Why? Only because I wanted to have exceptions catched under Windows as we have on Linux. Most users are Windows. They will be all testers :)

This commit is contained in:
bsongis
2011-12-16 19:06:28 +00:00
parent 88fca5135d
commit 43ccaa60e6
10 changed files with 93 additions and 77 deletions
+4 -4
View File
@@ -101,9 +101,9 @@ typedef PROGMEM void (*MenuFuncP_PROGMEM)(uint8_t event);
#define TITLEP(pstr) lcd_putsAtt(0,0,pstr,INVERS)
#define TITLE(str) TITLEP(PSTR(str))
#define MENU(title, tab, menu, lines_count, lines...) \
#define MENU(title, tab, menu, lines_count, ...) \
TITLE(title); \
static prog_uint8_t APM mstate_tab[] = lines; \
static prog_uint8_t APM mstate_tab[] = __VA_ARGS__; \
if (!check(event,menu,tab,DIM(tab),mstate_tab,DIM(mstate_tab)-1,lines_count-1)) return;
#define SIMPLE_MENU_NOTITLE(tab, menu, lines_count) \
@@ -113,9 +113,9 @@ if (!check_simple(event,menu,tab,DIM(tab),lines_count-1)) return;
TITLE(title); \
SIMPLE_MENU_NOTITLE(tab, menu, lines_count)
#define SUBMENU(title, lines_count, lines...) \
#define SUBMENU(title, lines_count, ...) \
TITLE(title); \
static prog_uint8_t APM mstate_tab[] = lines; \
static prog_uint8_t APM mstate_tab[] = __VA_ARGS__; \
if (!check(event,0,NULL,0,mstate_tab,DIM(mstate_tab)-1,lines_count-1)) return;
#define SIMPLE_SUBMENU_NOTITLE(lines_count) \