diff options
Diffstat (limited to 'rtgui/include')
| -rw-r--r-- | rtgui/include/rtgui/dc.h | 2 | ||||
| -rw-r--r-- | rtgui/include/rtgui/font.h | 10 | ||||
| -rw-r--r-- | rtgui/include/rtgui/widgets/button.h | 4 | ||||
| -rw-r--r-- | rtgui/include/rtgui/widgets/filelist_view.h | 6 | ||||
| -rw-r--r-- | rtgui/include/rtgui/widgets/iconbox.h | 4 | ||||
| -rw-r--r-- | rtgui/include/rtgui/widgets/label.h | 8 | ||||
| -rw-r--r-- | rtgui/include/rtgui/widgets/list_view.h | 7 | ||||
| -rw-r--r-- | rtgui/include/rtgui/widgets/textbox.h | 4 | ||||
| -rw-r--r-- | rtgui/include/rtgui/widgets/title.h | 8 |
9 files changed, 28 insertions, 25 deletions
diff --git a/rtgui/include/rtgui/dc.h b/rtgui/include/rtgui/dc.h index 43704d1785..955ef2c226 100644 --- a/rtgui/include/rtgui/dc.h +++ b/rtgui/include/rtgui/dc.h @@ -106,7 +106,7 @@ void rtgui_dc_draw_line (struct rtgui_dc* dc, int x1, int y1, int x2, int y2); void rtgui_dc_draw_rect (struct rtgui_dc* dc, struct rtgui_rect* rect);
void rtgui_dc_draw_round_rect(struct rtgui_dc* dc, struct rtgui_rect* rect); -void rtgui_dc_draw_text (struct rtgui_dc* dc, const rt_uint8_t* text, struct rtgui_rect* rect);
+void rtgui_dc_draw_text (struct rtgui_dc* dc, const char* text, struct rtgui_rect* rect);
void rtgui_dc_draw_byte(struct rtgui_dc*dc, int x, int y, int h, const rt_uint8_t* data);
void rtgui_dc_draw_word(struct rtgui_dc*dc, int x, int y, int h, const rt_uint8_t* data);
diff --git a/rtgui/include/rtgui/font.h b/rtgui/include/rtgui/font.h index 43af8fd6a3..512290efde 100644 --- a/rtgui/include/rtgui/font.h +++ b/rtgui/include/rtgui/font.h @@ -27,9 +27,9 @@ struct rtgui_font_engine void (*font_init)(struct rtgui_font* font);
void (*font_load)(struct rtgui_font* font);
- void (*font_draw_text)(struct rtgui_font* font, struct rtgui_dc* dc, const rt_uint8_t* text,
+ void (*font_draw_text)(struct rtgui_font* font, struct rtgui_dc* dc, const char* text,
rt_ubase_t len, struct rtgui_rect* rect);
- void (*font_get_metrics)(struct rtgui_font* font, const rt_uint8_t* text, struct rtgui_rect* rect);
+ void (*font_get_metrics)(struct rtgui_font* font, const char* text, struct rtgui_rect* rect);
};
/*
@@ -107,8 +107,8 @@ struct rtgui_font* rtgui_font_refer(const rt_uint8_t* family, rt_uint16_t height void rtgui_font_derefer(struct rtgui_font* font);
/* draw a text */
-void rtgui_font_draw(struct rtgui_font* font, struct rtgui_dc* dc, const rt_uint8_t* text, rt_ubase_t len, struct rtgui_rect* rect);
-int rtgui_font_get_string_width(struct rtgui_font* font, const rt_uint8_t* text);
-void rtgui_font_get_metrics(struct rtgui_font* font, const rt_uint8_t* text, struct rtgui_rect* rect);
+void rtgui_font_draw(struct rtgui_font* font, struct rtgui_dc* dc, const char* text, rt_ubase_t len, struct rtgui_rect* rect);
+int rtgui_font_get_string_width(struct rtgui_font* font, const char* text);
+void rtgui_font_get_metrics(struct rtgui_font* font, const char* text, struct rtgui_rect* rect);
#endif
diff --git a/rtgui/include/rtgui/widgets/button.h b/rtgui/include/rtgui/widgets/button.h index 7ecc574ad0..8b6b18fb73 100644 --- a/rtgui/include/rtgui/widgets/button.h +++ b/rtgui/include/rtgui/widgets/button.h @@ -62,8 +62,8 @@ typedef void (*rtgui_onbutton_func_t)(struct rtgui_widget* widget, rtgui_event_t rtgui_type_t *rtgui_button_type_get(void);
-rtgui_button_t* rtgui_button_create(unsigned char* text);
-rtgui_button_t* rtgui_pushbutton_create(unsigned char* text);
+rtgui_button_t* rtgui_button_create(char* text);
+rtgui_button_t* rtgui_pushbutton_create(char* text);
void rtgui_button_destroy(rtgui_button_t* btn);
void rtgui_button_set_pressed_image(rtgui_button_t* btn, rtgui_image_t* image);
diff --git a/rtgui/include/rtgui/widgets/filelist_view.h b/rtgui/include/rtgui/widgets/filelist_view.h index e3fab1fc90..6114403104 100644 --- a/rtgui/include/rtgui/widgets/filelist_view.h +++ b/rtgui/include/rtgui/widgets/filelist_view.h @@ -7,7 +7,7 @@ #define RTGUI_FITEM_DIR 0x1
struct rtgui_file_item
{
- rt_uint8_t* name;
+ char* name;
rt_uint32_t type;
rt_uint32_t size;
@@ -27,8 +27,8 @@ struct rtgui_filelist_view /* widget private data */
/* current directory */
- rt_uint8_t* current_directory;
- rt_uint8_t* pattern;
+ char* current_directory;
+ char* pattern;
/* the number of item in a page */
rt_uint16_t page_items;
diff --git a/rtgui/include/rtgui/widgets/iconbox.h b/rtgui/include/rtgui/widgets/iconbox.h index 73ebd682a6..c6807e2a9b 100644 --- a/rtgui/include/rtgui/widgets/iconbox.h +++ b/rtgui/include/rtgui/widgets/iconbox.h @@ -37,7 +37,7 @@ struct rtgui_iconbox /* widget private data */
struct rtgui_image* image;
- unsigned char *text;
+ char *text;
rt_ubase_t text_position;
rt_bool_t selected;
@@ -46,7 +46,7 @@ typedef struct rtgui_iconbox rtgui_iconbox_t; rtgui_type_t *rtgui_iconbox_type_get(void);
-struct rtgui_iconbox* rtgui_iconbox_create(struct rtgui_image* image, const unsigned char* text, int position);
+struct rtgui_iconbox* rtgui_iconbox_create(struct rtgui_image* image, const char* text, int position);
void rtgui_iconbox_destroy(struct rtgui_iconbox* iconbox);
rt_bool_t rtgui_iconbox_event_handler(struct rtgui_widget* widget, struct rtgui_event* event);
diff --git a/rtgui/include/rtgui/widgets/label.h b/rtgui/include/rtgui/widgets/label.h index d9f87d9b88..cced499f86 100644 --- a/rtgui/include/rtgui/widgets/label.h +++ b/rtgui/include/rtgui/widgets/label.h @@ -32,18 +32,18 @@ struct rtgui_label struct rtgui_widget parent;
/* label */
- unsigned char* text;
+ char* text;
};
typedef struct rtgui_label rtgui_label_t;
rtgui_type_t *rtgui_label_type_get(void);
-rtgui_label_t* rtgui_label_create(const unsigned char* text);
+rtgui_label_t* rtgui_label_create(const char* text);
void rtgui_label_destroy(rtgui_label_t* label);
rt_bool_t rtgui_label_event_handler(struct rtgui_widget* widget, struct rtgui_event* event);
-void rtgui_label_set_text(rtgui_label_t* label, const unsigned char* text);
-unsigned char* rtgui_label_get_text(rtgui_label_t* label);
+void rtgui_label_set_text(rtgui_label_t* label, const char* text);
+char* rtgui_label_get_text(rtgui_label_t* label);
#endif
diff --git a/rtgui/include/rtgui/widgets/list_view.h b/rtgui/include/rtgui/widgets/list_view.h index 69463eb98b..d15671eca0 100644 --- a/rtgui/include/rtgui/widgets/list_view.h +++ b/rtgui/include/rtgui/widgets/list_view.h @@ -44,7 +44,7 @@ struct rtgui_list_view /* widget private data */
/* list item */
- struct rtgui_list_item* items;
+ const struct rtgui_list_item* items;
/* total number of items */
rt_uint16_t items_count;
@@ -57,10 +57,13 @@ typedef struct rtgui_list_view rtgui_list_view_t; rtgui_type_t *rtgui_list_view_type_get(void);
-rtgui_list_view_t* rtgui_list_view_create(struct rtgui_list_item* items, rt_uint16_t count,
+rtgui_list_view_t* rtgui_list_view_create(const struct rtgui_list_item* items, rt_uint16_t count,
rtgui_rect_t *rect);
+void rtgui_list_view_destroy(rtgui_list_view_t* view);
+
void rtgui_list_view_clear(rtgui_list_view_t* view);
rt_bool_t rtgui_list_view_event_handler(struct rtgui_widget* widget, struct rtgui_event* event);
#endif
+
diff --git a/rtgui/include/rtgui/widgets/textbox.h b/rtgui/include/rtgui/widgets/textbox.h index c1378fd2fc..5dfc64d8c6 100644 --- a/rtgui/include/rtgui/widgets/textbox.h +++ b/rtgui/include/rtgui/widgets/textbox.h @@ -35,7 +35,7 @@ struct rtgui_textbox_line
{
- rt_uint8_t* line_text;
+ char* line_text;
struct rtgui_textbox_line *prev, *next;
};
@@ -51,7 +51,7 @@ struct rtgui_textbox /* current line and position */
rt_uint16_t line, line_begin, position, line_length;
- rt_uint8_t* text;
+ char* text;
rt_size_t font_width;
struct rtgui_timer* caret_timer;
diff --git a/rtgui/include/rtgui/widgets/title.h b/rtgui/include/rtgui/widgets/title.h index 0eda0f16a4..97f4463407 100644 --- a/rtgui/include/rtgui/widgets/title.h +++ b/rtgui/include/rtgui/widgets/title.h @@ -28,18 +28,18 @@ struct rtgui_wintitle struct rtgui_toplevel parent;
/* title */
- rt_uint8_t* title;
+ char* title;
};
typedef struct rtgui_wintitle rtgui_wintitle_t;
rtgui_type_t* rtgui_wintitle_type_get(void);
-rtgui_wintitle_t* rtgui_wintitle_create(const rt_uint8_t* title);
+rtgui_wintitle_t* rtgui_wintitle_create(const char* title);
void rtgui_wintitle_destroy(rtgui_wintitle_t* wintitle);
rt_bool_t rtgui_wintile_event_handler(rtgui_widget_t* widget, rtgui_event_t* event);
-void rtgui_wintitle_set_title(rtgui_wintitle_t* wintitle, const rt_uint8_t* title);
-rt_uint8_t *rtgui_wintitle_get_title(rtgui_wintitle_t* wintitle);
+void rtgui_wintitle_set_title(rtgui_wintitle_t* wintitle, const char* title);
+char *rtgui_wintitle_get_title(rtgui_wintitle_t* wintitle);
#endif
|