Fix skin engine calling wps code to draw the statusbars (add a pointer to viewportmanager-suitable statusbar values, which are the same for all screens), and re-arrange statusbar related code slightly. No functional change.

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

1 files changed, 6 insertions, 4 deletions

diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h
index 20a9dde9f9..fbd18b9f73 100644
--- a/apps/gui/skin_engine/wps_internals.h
+++ b/apps/gui/skin_engine/wps_internals.h
@@ -286,10 +286,6 @@ struct wps_data
     unsigned int button_time_volume;
 };
 
-
-/* Redraw statusbars if necessary */
-void gwps_draw_statusbars(void);
-
 /* Returns the index of the last subline's token in the token array.
    line - 0-based line number
    subline - 0-based subline number within the line
@@ -332,6 +328,12 @@ struct gui_wps
     struct screen *display;
     struct wps_data *data;
     struct wps_state *state;
+
+    /* suitable for the viewportmanager, possibly only temporary here
+     * needs to be same for all screens! can't be split up for screens
+     * due to what viewportmanager_set_statusbar() accepts
+     * (FIXME?) */
+    int *statusbars;
 };
 
 /* gui_wps end */