* surround member only used by charcells with #ifdef HAVE_LCD_CHARCELLS in struct scrollinfo in scroll_engine.h.

* remove function prototypes which are not actualy defined.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24693 a1c6a512-1295-4272-9138-f99709370657

4 files changed, 3 insertions, 11 deletions

diff --git a/apps/gui/list.h b/apps/gui/list.h
index 1d4a6bd5b4..92495d7408 100644
--- a/apps/gui/list.h
+++ b/apps/gui/list.h
@@ -166,7 +166,6 @@ extern void gui_synclist_select_item(struct gui_synclist * lists,
 extern void gui_synclist_add_item(struct gui_synclist * lists);
 extern void gui_synclist_del_item(struct gui_synclist * lists);
 extern void gui_synclist_limit_scroll(struct gui_synclist * lists, bool scroll);
-extern void gui_synclist_flash(struct gui_synclist * lists);
 extern void gui_synclist_set_title(struct gui_synclist * lists, char * title,
                                    enum themable_icons icon);
 extern void gui_synclist_hide_selection_marker(struct gui_synclist *lists,
@@ -256,7 +255,7 @@ void simplelist_addline(int line_number, const char *fmt, ...);
 */
 void simplelist_info_init(struct simplelist_info *info, char* title,
                           int count, void* data);
-                          
+
 /* show a list.
    if list->action_callback != NULL it is called with the action ACTION_REDRAW
     before the list is dislplayed for the first time */
diff --git a/apps/gui/skin_engine/skin_engine.h b/apps/gui/skin_engine/skin_engine.h
index 642f15aaad..90f38c9920 100644
--- a/apps/gui/skin_engine/skin_engine.h
+++ b/apps/gui/skin_engine/skin_engine.h
@@ -40,10 +40,6 @@ enum skinnable_screens {
 int wps_get_touchaction(struct wps_data *data);
 #endif
 
-/* setup and display a WPS for the first time */
-bool gui_wps_display(struct gui_wps *gwps);
- 
-
 /* Do a update_type update of the skinned screen */
 bool skin_update(struct gui_wps *gwps, unsigned int update_type);
 
@@ -54,10 +50,6 @@ bool skin_update(struct gui_wps *gwps, unsigned int update_type);
 bool skin_data_load(enum screen_type screen, struct wps_data *wps_data,
                     const char *buf, bool isfile);
 
-
-/* initial setup of wps_data */
-void skin_data_init(struct wps_data *wps_data);
-
 /* call this in statusbar toggle handlers if needed */
 void skin_statusbar_changed(struct gui_wps*);
 
diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c
index 586c74578f..8f0b61ef6a 100644
--- a/firmware/drivers/lcd-bitmap-common.c
+++ b/firmware/drivers/lcd-bitmap-common.c
@@ -367,7 +367,6 @@ void LCDFN(puts_scroll_style_offset)(int x, int y, const unsigned char *string,
 
     s->vp = current_vp;
     s->y = y;
-    s->len = utf8length(string);
     s->offset = offset;
     s->startx = x * LCDFN(getstringsize)(" ", NULL, NULL);
     s->backward = false;
diff --git a/firmware/export/scroll_engine.h b/firmware/export/scroll_engine.h
index 0fcb06af81..16b11c22ee 100644
--- a/firmware/export/scroll_engine.h
+++ b/firmware/export/scroll_engine.h
@@ -50,7 +50,9 @@ struct scrollinfo
 {
     struct viewport* vp;
     char line[SCROLL_LINE_SIZE];
+#ifdef HAVE_LCD_CHARCELLS
     int len;    /* length of line in chars */
+#endif
     int y;      /* Position of the line on the screen (char co-ordinates) */
     int offset;
     int startx;