diff options
Diffstat (limited to 'apps/gui/icon.h')
-rw-r--r-- | apps/gui/icon.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/apps/gui/icon.h b/apps/gui/icon.h index e095ccfc4c..88449c61ca 100644 --- a/apps/gui/icon.h +++ b/apps/gui/icon.h | |||
@@ -89,10 +89,6 @@ extern void screen_put_cursorxy(struct screen * screen, int x, int y, bool on); | |||
89 | */ | 89 | */ |
90 | extern void screen_put_iconxy(struct screen * screen, | 90 | extern void screen_put_iconxy(struct screen * screen, |
91 | int x, int y, enum themable_icons icon); | 91 | int x, int y, enum themable_icons icon); |
92 | #ifdef HAVE_LCD_CHARCELLS | ||
93 | # define screen_put_icon(s, x, y, i) screen_put_iconxy(s, x, y, i) | ||
94 | # define screen_put_icon_with_offset(s, x, y, w, h, i) screen_put_icon(s, x, y, i) | ||
95 | #else | ||
96 | /* For both of these, the icon will be placed in the center of the rectangle */ | 92 | /* For both of these, the icon will be placed in the center of the rectangle */ |
97 | /* as above, but x,y are letter position, NOT PIXEL */ | 93 | /* as above, but x,y are letter position, NOT PIXEL */ |
98 | extern void screen_put_icon(struct screen * screen, | 94 | extern void screen_put_icon(struct screen * screen, |
@@ -101,23 +97,14 @@ extern void screen_put_icon(struct screen * screen, | |||
101 | extern void screen_put_icon_with_offset(struct screen * display, | 97 | extern void screen_put_icon_with_offset(struct screen * display, |
102 | int x, int y, int off_x, int off_y, | 98 | int x, int y, int off_x, int off_y, |
103 | enum themable_icons icon); | 99 | enum themable_icons icon); |
104 | #endif | ||
105 | |||
106 | void icons_init(void); | 100 | void icons_init(void); |
107 | 101 | ||
108 | 102 | ||
109 | #ifdef HAVE_LCD_CHARCELLS | ||
110 | # define CURSOR_CHAR 0xe10c | ||
111 | # define get_icon_width(a) 1 | ||
112 | # define get_icon_height(a) 1 /* needs to be verified */ | ||
113 | #else | ||
114 | int get_icon_width(enum screen_type screen_type); | 103 | int get_icon_width(enum screen_type screen_type); |
115 | int get_icon_height(enum screen_type screen_type); | 104 | int get_icon_height(enum screen_type screen_type); |
116 | int get_icon_format(enum screen_type screen_type); | 105 | int get_icon_format(enum screen_type screen_type); |
117 | #endif | ||
118 | 106 | ||
119 | #if (LCD_DEPTH > 1) || defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1) \ | 107 | #if (LCD_DEPTH > 1) || defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1) |
120 | && !defined(HAVE_LCD_CHARCELLS) | ||
121 | int get_icon_format(enum screen_type screen_type); | 108 | int get_icon_format(enum screen_type screen_type); |
122 | #else | 109 | #else |
123 | # define get_icon_format(a) FORMAT_MONO | 110 | # define get_icon_format(a) FORMAT_MONO |