X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=bertos%2Fgui%2Fmenu.c;h=6c3f8d0d8fef038c8980a521585c46efc65e2f30;hb=888da1bd988d54b4036a8a4bfd79a52ef9fd7486;hp=e689ff96cd96ef8362768ab4d5e20eb1dd434d3b;hpb=6450bc5d51cf02b42fe910f313e62155a2bf5e11;p=bertos.git

diff --git a/bertos/gui/menu.c b/bertos/gui/menu.c
index e689ff96..6c3f8d0d 100644
--- 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>
  *
@@ -280,7 +278,7 @@ static void menu_layout(
 			#if (ARCH & ARCH_NIGHTTEST)
 				#warning __FILTER_NEXT_WARNING__
 			#endif
-			RenderHook renderhook = (item->flags & MIF_RENDERHOOK) ? CONST_CAST(RenderHook, item->label) : menu_defaultRenderHook;
+			RenderHook renderhook = (item->flags & MIF_RENDERHOOK) ? (RenderHook)item->label : menu_defaultRenderHook;
 
 			/* Render menuitem */
 			renderhook(menu->bitmap, ypos++, (i == selected), item);
@@ -295,7 +293,7 @@ static void menu_layout(
 		/* Clear rest of area */
 		gfx_rectClear(bm, bm->cr.xmin, ypos, bm->cr.xmax, bm->cr.ymax);
 
-		lcd_blitBitmap(&lcd_bitmap);
+		lcd_blitBitmap(bm);
 	}
 
 	/* Restore old cliprect */
@@ -442,7 +440,7 @@ iptr_t menu_handle(const struct Menu *menu)
 
 
 	items_per_page =
-		(menu->bitmap->height / menu->bitmap->font->height)
+		(menu->bitmap->height / menu->bitmap->font->height - 1)
 #if CONFIG_MENU_MENUBAR
 		- 1 /* menu bar labels */
 #endif