From 30dbb957fefa876f3378cffb6e3c43095033d0c4 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 18 Jan 2006 11:30:46 +0000 Subject: removed a few ifdefs git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8367 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/viewer.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'apps/plugins') diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index a1de3f9017..79ee3d3f78 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c @@ -827,6 +827,8 @@ static void init_need_scrollbar(void) { draw_columns = need_scrollbar? display_columns-glyph_width['o'] : display_columns; par_indent_spaces = draw_columns/(5*glyph_width[' ']); } +#else +#define init_need_scrollbar() #endif static bool viewer_init(void) @@ -885,10 +887,8 @@ static bool viewer_init(void) init file_pos, buffer_end, screen_top_ptr */ viewer_top(); -#ifdef HAVE_LCD_BITMAP /* Init need_scrollbar value */ init_need_scrollbar(); -#endif return true; } @@ -935,9 +935,7 @@ static void viewer_load_settings(void) line_mode = rb->atoi(prefs->line_mode); view_mode = rb->atoi(prefs->view_mode); -#ifdef HAVE_LCD_BITMAP init_need_scrollbar(); -#endif /* the following settings are safety checked * (file may have changed on disk) */ @@ -1062,9 +1060,8 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file) if (++word_mode == WORD_MODES) word_mode = 0; -#ifdef HAVE_LCD_BITMAP init_need_scrollbar(); -#endif + viewer_draw(col); rb->splash(HZ, true, "%s %s", @@ -1088,9 +1085,8 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file) line_mode = 0; } -#ifdef HAVE_LCD_BITMAP init_need_scrollbar(); -#endif + viewer_draw(col); rb->splash(HZ, true, "%s %s", @@ -1125,9 +1121,8 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file) } ***********/ -#ifdef HAVE_LCD_BITMAP init_need_scrollbar(); -#endif + viewer_draw(col); rb->splash(HZ, true, "%s %s", -- cgit v1.2.3