diff options
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/icon.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/apps/gui/icon.c b/apps/gui/icon.c index 82f24d893b..37eb1a715f 100644 --- a/apps/gui/icon.c +++ b/apps/gui/icon.c | |||
@@ -29,7 +29,7 @@ | |||
29 | #include "filetypes.h" | 29 | #include "filetypes.h" |
30 | 30 | ||
31 | #include <default_icons.h> | 31 | #include <default_icons.h> |
32 | #ifdef HAVE_REMOTE_LCD | 32 | #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) |
33 | #include <remote_default_icons.h> | 33 | #include <remote_default_icons.h> |
34 | #endif | 34 | #endif |
35 | 35 | ||
@@ -47,14 +47,14 @@ | |||
47 | so storing them as void* is ok. (stops compile warning) */ | 47 | so storing them as void* is ok. (stops compile warning) */ |
48 | static const void * inbuilt_icons[NB_SCREENS] = { | 48 | static const void * inbuilt_icons[NB_SCREENS] = { |
49 | (void*)default_icons | 49 | (void*)default_icons |
50 | #ifdef HAVE_REMOTE_LCD | 50 | #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) |
51 | , (void*)remote_default_icons | 51 | , (void*)remote_default_icons |
52 | #endif | 52 | #endif |
53 | }; | 53 | }; |
54 | 54 | ||
55 | static const int default_width[NB_SCREENS] = { | 55 | static const int default_width[NB_SCREENS] = { |
56 | BMPWIDTH_default_icons | 56 | BMPWIDTH_default_icons |
57 | #ifdef HAVE_REMOTE_LCD | 57 | #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) |
58 | , BMPWIDTH_remote_default_icons | 58 | , BMPWIDTH_remote_default_icons |
59 | #endif | 59 | #endif |
60 | }; | 60 | }; |
@@ -62,7 +62,7 @@ static const int default_width[NB_SCREENS] = { | |||
62 | /* height of whole file */ | 62 | /* height of whole file */ |
63 | static const int default_height[NB_SCREENS] = { | 63 | static const int default_height[NB_SCREENS] = { |
64 | BMPHEIGHT_default_icons | 64 | BMPHEIGHT_default_icons |
65 | #ifdef HAVE_REMOTE_LCD | 65 | #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) |
66 | , BMPHEIGHT_remote_default_icons | 66 | , BMPHEIGHT_remote_default_icons |
67 | #endif | 67 | #endif |
68 | }; | 68 | }; |
@@ -131,7 +131,7 @@ void screen_put_iconxy(struct screen * display, | |||
131 | if (!viewer_icons_loaded[screen] || | 131 | if (!viewer_icons_loaded[screen] || |
132 | (icon * height > viewer_iconset[screen].height)) | 132 | (icon * height > viewer_iconset[screen].height)) |
133 | { | 133 | { |
134 | #ifdef HAVE_REMOTE_LCD | 134 | #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) |
135 | if (screen == SCREEN_REMOTE) | 135 | if (screen == SCREEN_REMOTE) |
136 | { | 136 | { |
137 | screen_put_iconxy(display, xpos, ypos, Icon_Questionmark); | 137 | screen_put_iconxy(display, xpos, ypos, Icon_Questionmark); |
@@ -177,7 +177,7 @@ void screen_put_cursorxy(struct screen * display, int x, int y, bool on) | |||
177 | enum Iconset { | 177 | enum Iconset { |
178 | Iconset_Mainscreen, | 178 | Iconset_Mainscreen, |
179 | Iconset_Mainscreen_viewers, | 179 | Iconset_Mainscreen_viewers, |
180 | #ifdef HAVE_REMOTE_LCD | 180 | #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) |
181 | Iconset_Remotescreen, | 181 | Iconset_Remotescreen, |
182 | Iconset_Remotescreen_viewers, | 182 | Iconset_Remotescreen_viewers, |
183 | #endif | 183 | #endif |
@@ -203,7 +203,7 @@ static void load_icons(const char* filename, enum Iconset iconset, | |||
203 | bmp = &viewer_iconset[SCREEN_MAIN]; | 203 | bmp = &viewer_iconset[SCREEN_MAIN]; |
204 | bmp->data = viewer_icon_buffer[SCREEN_MAIN]; | 204 | bmp->data = viewer_icon_buffer[SCREEN_MAIN]; |
205 | break; | 205 | break; |
206 | #ifdef HAVE_REMOTE_LCD | 206 | #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) |
207 | case Iconset_Remotescreen: | 207 | case Iconset_Remotescreen: |
208 | loaded_ok = &custom_icons_loaded[SCREEN_REMOTE]; | 208 | loaded_ok = &custom_icons_loaded[SCREEN_REMOTE]; |
209 | bmp = &user_iconset[SCREEN_REMOTE]; | 209 | bmp = &user_iconset[SCREEN_REMOTE]; |
@@ -249,7 +249,7 @@ void icons_init(void) | |||
249 | load_icons(DEFAULT_VIEWER_BMP, Iconset_Mainscreen_viewers, false); | 249 | load_icons(DEFAULT_VIEWER_BMP, Iconset_Mainscreen_viewers, false); |
250 | } | 250 | } |
251 | 251 | ||
252 | #ifdef HAVE_REMOTE_LCD | 252 | #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) |
253 | load_icons(global_settings.remote_icon_file, | 253 | load_icons(global_settings.remote_icon_file, |
254 | Iconset_Remotescreen, true); | 254 | Iconset_Remotescreen, true); |
255 | 255 | ||