X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fgui%2Fmenu.c;h=6874e3c4b5d4853f1048e83d01825c7cbb3f9fd0;hb=4c53946de9c068b07dcb5fb643c270dc608fe179;hp=ac8e45e1d44fb90ace02d5718998ca2eeff65ab3;hpb=ee429f52edb679145d037fbe045d94550906e156;p=bertos.git diff --git a/bertos/gui/menu.c b/bertos/gui/menu.c index ac8e45e1..6874e3c4 100644 --- a/bertos/gui/menu.c +++ b/bertos/gui/menu.c @@ -27,13 +27,13 @@ * the GNU General Public License. * * Copyright 2003, 2004, 2006 Develer S.r.l. (http://www.develer.com/) - * Copyright 2000 Bernardo Innocenti + * Copyright 2000 Bernie Innocenti * * --> * * \version $Id$ * - * \author Bernardo Innocenti + * \author Bernie Innocenti * \author Stefano Fedrigo * * \brief General pourpose menu handling functions @@ -41,8 +41,7 @@ #include "menu.h" -#include - +#include "cfg/cfg_gfx.h" #include #include @@ -169,9 +168,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 @@ -199,7 +196,7 @@ static void menu_layout( ypos = bm->cr.ymin; -#if 0 +#if 1 if (redraw) { /* Clear screen */