projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix the bug related to the empty version list
[bertos.git]
/
bertos
/
gui
/
menu.c
diff --git
a/bertos/gui/menu.c
b/bertos/gui/menu.c
index ac8e45e1d44fb90ace02d5718998ca2eeff65ab3..6874e3c4b5d4853f1048e83d01825c7cbb3f9fd0 100644
(file)
--- 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/)
* the GNU General Public License.
*
* Copyright 2003, 2004, 2006 Develer S.r.l. (http://www.develer.com/)
- * Copyright 2000 Bern
ardo
Innocenti <bernie@codewiz.org>
+ * Copyright 2000 Bern
ie
Innocenti <bernie@codewiz.org>
*
* -->
*
* \version $Id$
*
*
* -->
*
* \version $Id$
*
- * \author Bern
ardo Innocenti <bernie@develer.com
>
+ * \author Bern
ie Innocenti <bernie@codewiz.org
>
* \author Stefano Fedrigo <aleph@develer.com>
*
* \brief General pourpose menu handling functions
* \author Stefano Fedrigo <aleph@develer.com>
*
* \brief General pourpose menu handling functions
@@
-41,8
+41,7
@@
#include "menu.h"
#include "menu.h"
-#include <appconfig.h>
-
+#include "cfg/cfg_gfx.h"
#include <cfg/compiler.h>
#include <cfg/debug.h>
#include <cfg/compiler.h>
#include <cfg/debug.h>
@@
-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
((item->flags & MIF_RAMLABEL) ? text_xyprintf : text_xyprintf_P)
#else
text_xyprintf
@@
-199,7
+196,7
@@
static void menu_layout(
ypos = bm->cr.ymin;
ypos = bm->cr.ymin;
-#if
0
+#if
1
if (redraw)
{
/* Clear screen */
if (redraw)
{
/* Clear screen */