Recreate 2.6 branch.

[bertos.git] / bertos / gui / menu.c

diff --git a/bertos/gui/menu.c b/bertos/gui/menu.c
index 86e8f17dd4453cfc4bd277f48b8c9190c6042454..556985f645a3ed7cf6c832f88f4664c2e0395122 100644 (file)
--- a/bertos/gui/menu.c
+++ b/bertos/gui/menu.c
@@ -26,13 +26,11 @@
  * invalidate any other reasons why the executable file might be covered by
  * the GNU General Public License.
  *
- * Copyright 2003, 2004, 2006 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2003, 2004, 2006, 2010 Develer S.r.l. (http://www.develer.com/)
  * Copyright 2000 Bernie Innocenti <bernie@codewiz.org>
  *
  * -->
  *
- * \version $Id$
- *
  * \author Bernie Innocenti <bernie@codewiz.org>
  * \author Stefano Fedrigo <aleph@develer.com>
  *
@@ -41,8 +39,9 @@
 
 #include "menu.h"
 
-#include "cfg/cfg_gfx.h"
+#include "cfg/cfg_menu.h"
 #include "cfg/cfg_arch.h"
+
 #include <cfg/compiler.h>
 #include <cfg/debug.h>
 
@@ -58,10 +57,6 @@
 #include <avr/pgmspace.h> /* strncpy_P() */
 #endif
 
-#if CONFIG_MENU_SMOOTH
-#include <drv/lcd_gfx.h>
-#endif
-
 #if (CONFIG_MENU_TIMEOUT != 0)
 #include <drv/timer.h>
 #endif
@@ -197,13 +192,11 @@ static void menu_layout(
 
        ypos = bm->cr.ymin;
 
-#if 1
        if (redraw)
        {
                /* Clear screen */
                text_clear(menu->bitmap);
        }
-#endif
 
        if (title)
        {
@@ -295,7 +288,7 @@ static void menu_layout(
                /* Clear rest of area */
                gfx_rectClear(bm, bm->cr.xmin, ypos, bm->cr.xmax, bm->cr.ymax);
 
-               lcd_blitBitmap(bm);
+               menu->lcd_blitBitmap(bm);
        }
 
        /* Restore old cliprect */