X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fgui%2Fmenu.c;h=e689ff96cd96ef8362768ab4d5e20eb1dd434d3b;hb=6450bc5d51cf02b42fe910f313e62155a2bf5e11;hp=6874e3c4b5d4853f1048e83d01825c7cbb3f9fd0;hpb=0fba49a224db1d44baa97d82aa5df546cbd3d606;p=bertos.git diff --git a/bertos/gui/menu.c b/bertos/gui/menu.c index 6874e3c4..e689ff96 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 @@ -276,7 +277,10 @@ static void menu_layout( if (!(item->flags & MIF_HIDDEN)) { /* Check if a special render function is supplied, otherwise use defaults */ - RenderHook renderhook = (item->flags & MIF_RENDERHOOK) ? (RenderHook)item->label : menu_defaultRenderHook; + #if (ARCH & ARCH_NIGHTTEST) + #warning __FILTER_NEXT_WARNING__ + #endif + RenderHook renderhook = (item->flags & MIF_RENDERHOOK) ? CONST_CAST(RenderHook, item->label) : menu_defaultRenderHook; /* Render menuitem */ renderhook(menu->bitmap, ypos++, (i == selected), item); @@ -538,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;