X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fgui%2Fmenu.c;h=d897ae946825284ca40eb1ce4357374423565cda;hb=ce455a07c3f2d0055f3b7971e91fe5a6e3903395;hp=146b3c1ffd0f6741d8a04bcb234db577aa71a8fc;hpb=4cc44c9888a0336b9d01121ec0b7ad95f4a76195;p=bertos.git diff --git a/bertos/gui/menu.c b/bertos/gui/menu.c index 146b3c1f..d897ae94 100644 --- a/bertos/gui/menu.c +++ b/bertos/gui/menu.c @@ -42,6 +42,7 @@ #include "menu.h" #include "cfg/cfg_gfx.h" +#include "cfg/cfg_arch.h" #include #include @@ -168,9 +169,7 @@ static void menu_defaultRenderHook(struct Bitmap *bm, int ypos, bool selected, c } } -#warning FIXME:REVISE this code! -#if 0 -//#if CPU_HARVARD +#if CPU_HARVARD ((item->flags & MIF_RAMLABEL) ? text_xyprintf : text_xyprintf_P) #else text_xyprintf @@ -278,6 +277,9 @@ static void menu_layout( if (!(item->flags & MIF_HIDDEN)) { /* Check if a special render function is supplied, otherwise use defaults */ + #if (ARCH & ARCH_NIGHTTEST) + #warning __FILTER_NEXT_WARNING__ + #endif RenderHook renderhook = (item->flags & MIF_RENDERHOOK) ? (RenderHook)item->label : menu_defaultRenderHook; /* Render menuitem */ @@ -540,6 +542,9 @@ iptr_t menu_handle(const struct Menu *menu) /* Store currently selected item before leaving. */ if (menu->flags & MF_SAVESEL) + #if (ARCH & ARCH_NIGHTTEST) + #warning __FILTER_NEXT_WARNING__ + #endif CONST_CAST(struct Menu *, menu)->selected = selected; return result;