diff options
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/textarea.c | 4 | ||||
-rw-r--r-- | apps/gui/textarea.h | 6 | ||||
-rw-r--r-- | apps/gui/yesno.c | 14 | ||||
-rw-r--r-- | apps/gui/yesno.h | 10 |
4 files changed, 17 insertions, 17 deletions
diff --git a/apps/gui/textarea.c b/apps/gui/textarea.c index b30667df4e..dcffd0e621 100644 --- a/apps/gui/textarea.c +++ b/apps/gui/textarea.c | |||
@@ -47,7 +47,7 @@ void gui_textarea_update(struct screen * display) | |||
47 | } | 47 | } |
48 | 48 | ||
49 | int gui_textarea_put_message(struct screen * display, | 49 | int gui_textarea_put_message(struct screen * display, |
50 | struct text_message * message, | 50 | const struct text_message * message, |
51 | int ystart) | 51 | int ystart) |
52 | { | 52 | { |
53 | int i; | 53 | int i; |
@@ -78,7 +78,7 @@ void gui_textarea_update_nblines(struct screen * display) | |||
78 | display->nb_lines = height / display->char_height; | 78 | display->nb_lines = height / display->char_height; |
79 | } | 79 | } |
80 | 80 | ||
81 | void talk_text_message(struct text_message * message, bool enqueue) | 81 | void talk_text_message(const struct text_message * message, bool enqueue) |
82 | { | 82 | { |
83 | int line; | 83 | int line; |
84 | if(message) | 84 | if(message) |
diff --git a/apps/gui/textarea.h b/apps/gui/textarea.h index 765add084a..3f16dd440c 100644 --- a/apps/gui/textarea.h +++ b/apps/gui/textarea.h | |||
@@ -25,7 +25,7 @@ | |||
25 | 25 | ||
26 | struct text_message | 26 | struct text_message |
27 | { | 27 | { |
28 | char **message_lines; | 28 | const char **message_lines; |
29 | int nb_lines; | 29 | int nb_lines; |
30 | }; | 30 | }; |
31 | 31 | ||
@@ -50,7 +50,7 @@ extern void gui_textarea_update(struct screen * display); | |||
50 | * returns : the number of lines effectively displayed | 50 | * returns : the number of lines effectively displayed |
51 | */ | 51 | */ |
52 | extern int gui_textarea_put_message(struct screen * display, | 52 | extern int gui_textarea_put_message(struct screen * display, |
53 | struct text_message * message, | 53 | const struct text_message * message, |
54 | int ystart); | 54 | int ystart); |
55 | /* | 55 | /* |
56 | * Compute the number of text lines the display can draw with the current font | 56 | * Compute the number of text lines the display can draw with the current font |
@@ -63,7 +63,7 @@ extern void gui_textarea_update_nblines(struct screen * display); | |||
63 | * Speak a text_message. The message's lines may be virtual pointers | 63 | * Speak a text_message. The message's lines may be virtual pointers |
64 | * representing language / voicefont IDs (see settings.h). | 64 | * representing language / voicefont IDs (see settings.h). |
65 | */ | 65 | */ |
66 | extern void talk_text_message(struct text_message * message, bool enqueue); | 66 | extern void talk_text_message(const struct text_message * message, bool enqueue); |
67 | 67 | ||
68 | #ifdef HAVE_LCD_BITMAP | 68 | #ifdef HAVE_LCD_BITMAP |
69 | /* | 69 | /* |
diff --git a/apps/gui/yesno.c b/apps/gui/yesno.c index 891e73809b..51a1eabd60 100644 --- a/apps/gui/yesno.c +++ b/apps/gui/yesno.c | |||
@@ -33,9 +33,9 @@ | |||
33 | * - no_message : message displayed if answer is 'no' | 33 | * - no_message : message displayed if answer is 'no' |
34 | */ | 34 | */ |
35 | static void gui_yesno_init(struct gui_yesno * yn, | 35 | static void gui_yesno_init(struct gui_yesno * yn, |
36 | struct text_message * main_message, | 36 | const struct text_message * main_message, |
37 | struct text_message * yes_message, | 37 | const struct text_message * yes_message, |
38 | struct text_message * no_message) | 38 | const struct text_message * no_message) |
39 | { | 39 | { |
40 | yn->main_message=main_message; | 40 | yn->main_message=main_message; |
41 | yn->result_message[YESNO_YES]=yes_message; | 41 | yn->result_message[YESNO_YES]=yes_message; |
@@ -92,7 +92,7 @@ static void gui_yesno_draw(struct gui_yesno * yn) | |||
92 | */ | 92 | */ |
93 | static bool gui_yesno_draw_result(struct gui_yesno * yn, enum yesno_res result) | 93 | static bool gui_yesno_draw_result(struct gui_yesno * yn, enum yesno_res result) |
94 | { | 94 | { |
95 | struct text_message * message=yn->result_message[result]; | 95 | const struct text_message * message=yn->result_message[result]; |
96 | if(message==NULL) | 96 | if(message==NULL) |
97 | return false; | 97 | return false; |
98 | gui_textarea_put_message(yn->display, message, 0); | 98 | gui_textarea_put_message(yn->display, message, 0); |
@@ -101,9 +101,9 @@ static bool gui_yesno_draw_result(struct gui_yesno * yn, enum yesno_res result) | |||
101 | 101 | ||
102 | #include "debug.h" | 102 | #include "debug.h" |
103 | 103 | ||
104 | enum yesno_res gui_syncyesno_run(struct text_message * main_message, | 104 | enum yesno_res gui_syncyesno_run(const struct text_message * main_message, |
105 | struct text_message * yes_message, | 105 | const struct text_message * yes_message, |
106 | struct text_message * no_message) | 106 | const struct text_message * no_message) |
107 | { | 107 | { |
108 | int i; | 108 | int i; |
109 | unsigned button; | 109 | unsigned button; |
diff --git a/apps/gui/yesno.h b/apps/gui/yesno.h index 67456cf69b..b57ee89d48 100644 --- a/apps/gui/yesno.h +++ b/apps/gui/yesno.h | |||
@@ -32,8 +32,8 @@ enum yesno_res | |||
32 | 32 | ||
33 | struct gui_yesno | 33 | struct gui_yesno |
34 | { | 34 | { |
35 | struct text_message * main_message; | 35 | const struct text_message * main_message; |
36 | struct text_message * result_message[2]; | 36 | const struct text_message * result_message[2]; |
37 | 37 | ||
38 | struct screen * display; | 38 | struct screen * display; |
39 | }; | 39 | }; |
@@ -47,7 +47,7 @@ struct gui_yesno | |||
47 | * - no_message : message displayed if answer is 'no' | 47 | * - no_message : message displayed if answer is 'no' |
48 | */ | 48 | */ |
49 | extern enum yesno_res gui_syncyesno_run( | 49 | extern enum yesno_res gui_syncyesno_run( |
50 | struct text_message * main_message, | 50 | const struct text_message * main_message, |
51 | struct text_message * yes_message, | 51 | const struct text_message * yes_message, |
52 | struct text_message * no_message); | 52 | const struct text_message * no_message); |
53 | #endif /* _GUI_YESNO_H_ */ | 53 | #endif /* _GUI_YESNO_H_ */ |