From d43b85c7edefe0447a7ec307ec5ecacc5385da68 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Tue, 6 Sep 2011 14:07:27 +0000 Subject: fix the last of the error git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30464 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/skin_engine/skin_parser.c | 6 +++--- apps/gui/skin_engine/skin_render.c | 2 +- apps/misc.c | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 16aff1523d..373309ff51 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c @@ -1815,6 +1815,9 @@ static int skin_element_callback(struct skin_element* element, void* data) case SKIN_TOKEN_IMAGE_DISPLAY: function = parse_image_load; break; + case SKIN_TOKEN_LIST_ITEM_CFG: + function = parse_listitemviewport; + break; #endif #ifdef HAVE_TOUCHSCREEN case SKIN_TOKEN_TOUCHREGION: @@ -1840,9 +1843,6 @@ static int skin_element_callback(struct skin_element* element, void* data) function = parse_skinvar; break; #endif - case SKIN_TOKEN_LIST_ITEM_CFG: - function = parse_listitemviewport; - break; default: break; } diff --git a/apps/gui/skin_engine/skin_render.c b/apps/gui/skin_engine/skin_render.c index dd266b1ee6..994ca23553 100644 --- a/apps/gui/skin_engine/skin_render.c +++ b/apps/gui/skin_engine/skin_render.c @@ -143,12 +143,12 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info, } } break; +#ifdef HAVE_LCD_BITMAP case SKIN_TOKEN_LIST_ITEM_CFG: if (do_refresh) skinlist_set_cfg(gwps->display->screen_type, token->value.data); break; -#ifdef HAVE_LCD_BITMAP case SKIN_TOKEN_UIVIEWPORT_ENABLE: sb_set_info_vp(gwps->display->screen_type, token->value.data); diff --git a/apps/misc.c b/apps/misc.c index 0e24c82e64..66273b6cfa 100644 --- a/apps/misc.c +++ b/apps/misc.c @@ -1079,22 +1079,22 @@ static enum current_activity static int current_activity_top = 0; void push_current_activity(enum current_activity screen) { -#ifdef HAVE_LCD_BITMAP +#if defined(HAVE_LCD_BITMAP) && !defined(__PCTOOL__) int i; #endif current_activity[current_activity_top++] = screen; -#ifdef HAVE_LCD_BITMAP +#if defined(HAVE_LCD_BITMAP) && !defined(__PCTOOL__) FOR_NB_SCREENS(i) skinlist_set_cfg(i, NULL); #endif } void pop_current_activity(void) { -#ifdef HAVE_LCD_BITMAP +#if defined(HAVE_LCD_BITMAP) && !defined(__PCTOOL__) int i; #endif current_activity_top--; -#ifdef HAVE_LCD_BITMAP +#if defined(HAVE_LCD_BITMAP) && !defined(__PCTOOL__) FOR_NB_SCREENS(i) skinlist_set_cfg(i, NULL); #endif -- cgit v1.2.3