diff options
| author | bernard.xiong <[email protected]> | 2010-02-17 23:56:49 +0000 |
|---|---|---|
| committer | bernard.xiong <[email protected]> | 2010-02-17 23:56:49 +0000 |
| commit | 860d1ddfd4a069c75ee66eea09f07b6b61b997be (patch) | |
| tree | 2e612efb2f8b0ea98483e6c25123fdd06bafd231 /rtgui | |
| parent | 332d0d00e2c94807546bba4bcb3c7b07ab8cdede (diff) | |
add radio station selection; remove list and filelist view implementation in STM32 radio; remove warning of RTGUI.
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@419 bbd45198-f89e-11dd-88c7-29a3b14d5316
Diffstat (limited to 'rtgui')
| -rw-r--r-- | rtgui/common/dc.c | 2 | ||||
| -rw-r--r-- | rtgui/common/font.c | 14 | ||||
| -rw-r--r-- | rtgui/common/font_hz_bmp.c | 8 | ||||
| -rw-r--r-- | rtgui/common/font_hz_file.c | 8 | ||||
| -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 | ||||
| -rw-r--r-- | rtgui/widgets/button.c | 4 | ||||
| -rw-r--r-- | rtgui/widgets/filelist_view.c | 17 | ||||
| -rw-r--r-- | rtgui/widgets/iconbox.c | 4 | ||||
| -rw-r--r-- | rtgui/widgets/label.c | 10 | ||||
| -rw-r--r-- | rtgui/widgets/list_view.c | 6 | ||||
| -rw-r--r-- | rtgui/widgets/textbox.c | 6 | ||||
| -rw-r--r-- | rtgui/widgets/title.c | 8 |
20 files changed, 71 insertions, 69 deletions
diff --git a/rtgui/common/dc.c b/rtgui/common/dc.c index 68a02e863b..41967bb92e 100644 --- a/rtgui/common/dc.c +++ b/rtgui/common/dc.c @@ -167,7 +167,7 @@ void rtgui_dc_blit(struct rtgui_dc* dc, struct rtgui_point* dc_point, struct rtg dc->blit(dc, dc_point, dest, 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) { rt_uint32_t len; struct rtgui_font *font; diff --git a/rtgui/common/font.c b/rtgui/common/font.c index 475effa726..9e9f63c7e4 100644 --- a/rtgui/common/font.c +++ b/rtgui/common/font.c @@ -120,7 +120,7 @@ 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) +void rtgui_font_draw(struct rtgui_font* font, struct rtgui_dc* dc, const char* text, rt_ubase_t len, struct rtgui_rect* rect) { RT_ASSERT(font != RT_NULL); @@ -131,7 +131,7 @@ void rtgui_font_draw(struct rtgui_font* font, struct rtgui_dc* dc, const rt_uint } } -int rtgui_font_get_string_width(struct rtgui_font* font, const rt_uint8_t* text) +int rtgui_font_get_string_width(struct rtgui_font* font, const char* text) { rtgui_rect_t rect; @@ -141,7 +141,7 @@ int rtgui_font_get_string_width(struct rtgui_font* font, const rt_uint8_t* text) return rect.x2 - rect.x1; } -void rtgui_font_get_metrics(struct rtgui_font* font, const rt_uint8_t* text, rtgui_rect_t* rect) +void rtgui_font_get_metrics(struct rtgui_font* font, const char* text, rtgui_rect_t* rect) { RT_ASSERT(font != RT_NULL); @@ -157,8 +157,8 @@ void rtgui_font_get_metrics(struct rtgui_font* font, const rt_uint8_t* text, rtg } } -static void rtgui_bitmap_font_draw_text(struct rtgui_font* font, struct rtgui_dc* dc, const rt_uint8_t* text, rt_ubase_t len, struct rtgui_rect* rect); -static void rtgui_bitmap_font_get_metrics(struct rtgui_font* font, const rt_uint8_t* text, rtgui_rect_t* rect); +static void rtgui_bitmap_font_draw_text(struct rtgui_font* font, struct rtgui_dc* dc, const char* text, rt_ubase_t len, struct rtgui_rect* rect); +static void rtgui_bitmap_font_get_metrics(struct rtgui_font* font, const char* text, rtgui_rect_t* rect); struct rtgui_font_engine bmp_font_engine = { RT_NULL, @@ -197,7 +197,7 @@ void rtgui_bitmap_font_draw_char(struct rtgui_font_bitmap* font, struct rtgui_dc } } -static void rtgui_bitmap_font_draw_text(struct rtgui_font* font, struct rtgui_dc* dc, const rt_uint8_t* text, rt_ubase_t len, struct rtgui_rect* rect) +static void rtgui_bitmap_font_draw_text(struct rtgui_font* font, struct rtgui_dc* dc, const char* text, rt_ubase_t len, struct rtgui_rect* rect) { struct rtgui_font_bitmap* bmp_font = (struct rtgui_font_bitmap*)(font->data); @@ -213,7 +213,7 @@ static void rtgui_bitmap_font_draw_text(struct rtgui_font* font, struct rtgui_dc } } -static void rtgui_bitmap_font_get_metrics(struct rtgui_font* font, const rt_uint8_t* text, rtgui_rect_t* rect) +static void rtgui_bitmap_font_get_metrics(struct rtgui_font* font, const char* text, rtgui_rect_t* rect) { struct rtgui_font_bitmap* bmp_font = (struct rtgui_font_bitmap*)(font->data); diff --git a/rtgui/common/font_hz_bmp.c b/rtgui/common/font_hz_bmp.c index 239f6f9fe9..1190cb473c 100644 --- a/rtgui/common/font_hz_bmp.c +++ b/rtgui/common/font_hz_bmp.c @@ -4,8 +4,8 @@ #ifdef RTGUI_USING_HZ_BMP -static void rtgui_hz_bitmap_font_draw_text(struct rtgui_font* font, struct rtgui_dc* dc, const rt_uint8_t* text, rt_ubase_t len, struct rtgui_rect* rect); -static void rtgui_hz_bitmap_font_get_metrics(struct rtgui_font* font, const rt_uint8_t* text, rtgui_rect_t* rect); +static void rtgui_hz_bitmap_font_draw_text(struct rtgui_font* font, struct rtgui_dc* dc, const char* text, rt_ubase_t len, struct rtgui_rect* rect); +static void rtgui_hz_bitmap_font_get_metrics(struct rtgui_font* font, const char* text, rtgui_rect_t* rect); struct rtgui_font_engine hz_bmp_font_engine = { RT_NULL, @@ -14,7 +14,7 @@ struct rtgui_font_engine hz_bmp_font_engine = rtgui_hz_bitmap_font_get_metrics }; -static void rtgui_hz_bitmap_font_draw_text(struct rtgui_font* font, struct rtgui_dc* dc, const rt_uint8_t* text, rt_ubase_t len, struct rtgui_rect* rect) +static void rtgui_hz_bitmap_font_draw_text(struct rtgui_font* font, struct rtgui_dc* dc, const char* text, rt_ubase_t len, struct rtgui_rect* rect) { rt_base_t h; rt_uint8_t* str; @@ -61,7 +61,7 @@ static void rtgui_hz_bitmap_font_draw_text(struct rtgui_font* font, struct rtgui } } -static void rtgui_hz_bitmap_font_get_metrics(struct rtgui_font* font, const rt_uint8_t* text, rtgui_rect_t* rect) +static void rtgui_hz_bitmap_font_get_metrics(struct rtgui_font* font, const char* text, rtgui_rect_t* rect) { struct rtgui_font_bitmap* bmp_font = (struct rtgui_font_bitmap*)(font->data); diff --git a/rtgui/common/font_hz_file.c b/rtgui/common/font_hz_file.c index 11ee300f86..b805de5ad4 100644 --- a/rtgui/common/font_hz_file.c +++ b/rtgui/common/font_hz_file.c @@ -13,8 +13,8 @@ static int _font_cache_compare(struct hz_cache* node1, struct hz_cache* node2); static void rtgui_hz_file_font_load(struct rtgui_font* font); -static void rtgui_hz_file_font_draw_text(struct rtgui_font* font, struct rtgui_dc* dc, const rt_uint8_t* text, rt_ubase_t len, struct rtgui_rect* rect); -static void rtgui_hz_file_font_get_metrics(struct rtgui_font* font, const rt_uint8_t* text, rtgui_rect_t* rect); +static void rtgui_hz_file_font_draw_text(struct rtgui_font* font, struct rtgui_dc* dc, const char* text, rt_ubase_t len, struct rtgui_rect* rect); +static void rtgui_hz_file_font_get_metrics(struct rtgui_font* font, const char* text, rtgui_rect_t* rect); struct rtgui_font_engine rtgui_hz_file_font_engine = { RT_NULL, @@ -91,7 +91,7 @@ static void rtgui_hz_file_font_load(struct rtgui_font* font) hz_file_font->fd = open(hz_file_font->font_fn, O_RDONLY, 0); } -static void rtgui_hz_file_font_draw_text(struct rtgui_font* font, struct rtgui_dc* dc, const rt_uint8_t* text, rt_ubase_t len, struct rtgui_rect* rect) +static void rtgui_hz_file_font_draw_text(struct rtgui_font* font, struct rtgui_dc* dc, const char* text, rt_ubase_t len, struct rtgui_rect* rect) { rt_base_t h; rt_uint8_t* str; @@ -133,7 +133,7 @@ static void rtgui_hz_file_font_draw_text(struct rtgui_font* font, struct rtgui_d } } -static void rtgui_hz_file_font_get_metrics(struct rtgui_font* font, const rt_uint8_t* text, rtgui_rect_t* rect) +static void rtgui_hz_file_font_get_metrics(struct rtgui_font* font, const char* text, rtgui_rect_t* rect) { struct rtgui_hz_file_font* hz_file_font = (struct rtgui_hz_file_font*)font->data; RT_ASSERT(hz_file_font != RT_NULL); 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
diff --git a/rtgui/widgets/button.c b/rtgui/widgets/button.c index 45db6239fb..36e010f28a 100644 --- a/rtgui/widgets/button.c +++ b/rtgui/widgets/button.c @@ -188,7 +188,7 @@ rt_bool_t rtgui_button_event_handler(struct rtgui_widget* widget, struct rtgui_e return RT_FALSE; } -rtgui_button_t* rtgui_button_create(unsigned char* text) +rtgui_button_t* rtgui_button_create(char* text) { struct rtgui_button* btn; @@ -208,7 +208,7 @@ rtgui_button_t* rtgui_button_create(unsigned char* text) return btn; } -rtgui_button_t* rtgui_pushbutton_create(unsigned char* text) +rtgui_button_t* rtgui_pushbutton_create(char* text) { rtgui_button_t* btn; diff --git a/rtgui/widgets/filelist_view.c b/rtgui/widgets/filelist_view.c index 3724b84d6d..bef3f90030 100644 --- a/rtgui/widgets/filelist_view.c +++ b/rtgui/widgets/filelist_view.c @@ -219,7 +219,6 @@ const static char * folder_xpm[] = { /* image for file and folder */
static rtgui_image_t *file_image, *folder_image;
-static struct rtgui_filelist_view *filelist_view = RT_NULL; /* only one view in global */
static void _rtgui_filelist_view_constructor(struct rtgui_filelist_view *view)
{
@@ -489,7 +488,7 @@ rt_bool_t rtgui_filelist_view_event_handler(struct rtgui_widget* widget, struct if (strcmp(view->items[view->current_item].name, ".") == 0) return RT_FALSE;
if (strcmp(view->items[view->current_item].name, "..") == 0)
{
- rt_uint8_t *ptr;
+ char *ptr;
ptr = strrchr(view->current_directory, PATH_SEPARATOR);
if (ptr == RT_NULL) return RT_FALSE;
@@ -526,11 +525,11 @@ rt_bool_t rtgui_filelist_view_event_handler(struct rtgui_widget* widget, struct else
{
if (view->current_directory[strlen(view->current_directory) - 1] != PATH_SEPARATOR)
- sprintf(new_path, "%s%c%s",view->current_directory, PATH_SEPARATOR,
+ rt_snprintf(new_path, sizeof(new_path), "%s%c%s",view->current_directory, PATH_SEPARATOR,
view->items[view->current_item].name);
else
- sprintf(new_path, "%s%s",view->current_directory,
- view->items[view->current_item].name);
+ rt_snprintf(new_path, sizeof(new_path), "%s%s",view->current_directory,
+ view->items[view->current_item].name);
}
rtgui_filelist_view_set_directory(view, new_path);
}
@@ -616,7 +615,7 @@ void rtgui_filelist_view_clear(rtgui_filelist_view_t* view) void rtgui_filelist_view_set_directory(rtgui_filelist_view_t* view, const char* directory)
{
- rt_uint8_t fullpath[256];
+ char fullpath[256];
struct rtgui_file_item *item;
RT_ASSERT(view != RT_NULL);
@@ -693,9 +692,9 @@ void rtgui_filelist_view_set_directory(rtgui_filelist_view_t* view, const char* /* build full path for the file */
if (directory[strlen(directory) - 1] != PATH_SEPARATOR)
- sprintf(fullpath, "%s%c%s", directory, PATH_SEPARATOR, dirent->d_name);
+ rt_sprintf(fullpath, "%s%c%s", directory, PATH_SEPARATOR, dirent->d_name);
else
- sprintf(fullpath, "%s%s", directory, dirent->d_name);
+ rt_sprintf(fullpath, "%s%s", directory, dirent->d_name);
stat(fullpath, &s);
if ( s.st_mode & S_IFDIR )
@@ -726,4 +725,4 @@ void rtgui_filelist_get_fullpath(rtgui_filelist_view_t* view, char* path, rt_siz rt_sprintf(path, "%s%c%s", view->current_directory, PATH_SEPARATOR,
view->items[view->current_item].name);
-}
\ No newline at end of file +}
diff --git a/rtgui/widgets/iconbox.c b/rtgui/widgets/iconbox.c index 65f094e64f..7a25f3df26 100644 --- a/rtgui/widgets/iconbox.c +++ b/rtgui/widgets/iconbox.c @@ -76,7 +76,7 @@ rt_bool_t rtgui_iconbox_event_handler(struct rtgui_widget* widget, struct rtgui_ } struct rtgui_iconbox* rtgui_iconbox_create(struct rtgui_image* image, - const unsigned char* text, + const char* text, int position) { struct rtgui_iconbox* iconbox; @@ -115,7 +115,7 @@ struct rtgui_iconbox* rtgui_iconbox_create(struct rtgui_image* image, /* set image and text position */ iconbox->image = image; - iconbox->text = (unsigned char*)rt_strdup((const char*)text); + iconbox->text = (char*)rt_strdup((const char*)text); iconbox->text_position = position; } diff --git a/rtgui/widgets/label.c b/rtgui/widgets/label.c index 574ec7cea7..ae5448080c 100644 --- a/rtgui/widgets/label.c +++ b/rtgui/widgets/label.c @@ -64,7 +64,7 @@ rt_bool_t rtgui_label_event_handler(struct rtgui_widget* widget, struct rtgui_ev return RT_FALSE; } -rtgui_label_t* rtgui_label_create(const unsigned char* text) +rtgui_label_t* rtgui_label_create(const char* text) { struct rtgui_label* label; @@ -80,7 +80,7 @@ rtgui_label_t* rtgui_label_create(const unsigned char* text) rtgui_widget_set_rect(RTGUI_WIDGET(label), &rect); /* set text */ - label->text = (unsigned char*)rt_strdup((const char*)text); + label->text = (char*)rt_strdup((const char*)text); } return label; @@ -91,14 +91,14 @@ void rtgui_label_destroy(rtgui_label_t* label) rtgui_widget_destroy(RTGUI_WIDGET(label)); } -unsigned char* rtgui_label_get_text(rtgui_label_t* label) +char* rtgui_label_get_text(rtgui_label_t* label) { RT_ASSERT(label != RT_NULL); return label->text; } -void rtgui_label_set_text(rtgui_label_t* label, const unsigned char* text) +void rtgui_label_set_text(rtgui_label_t* label, const char* text) { RT_ASSERT(label != RT_NULL); @@ -108,7 +108,7 @@ void rtgui_label_set_text(rtgui_label_t* label, const unsigned char* text) rt_free(label->text); } - if (text != RT_NULL) label->text = (unsigned char*)rt_strdup((const char*)text); + if (text != RT_NULL) label->text = (char*)rt_strdup((const char*)text); else label->text = RT_NULL; /* update widget */ diff --git a/rtgui/widgets/list_view.c b/rtgui/widgets/list_view.c index 42f50b702c..857a9454a1 100644 --- a/rtgui/widgets/list_view.c +++ b/rtgui/widgets/list_view.c @@ -54,7 +54,7 @@ void rtgui_list_view_ondraw(struct rtgui_list_view* view) struct rtgui_rect rect, item_rect;
struct rtgui_dc* dc;
rt_uint16_t page_index, index;
- struct rtgui_list_item* item;
+ const struct rtgui_list_item* item;
dc = rtgui_dc_begin_drawing(RTGUI_WIDGET(view));
if (dc == RT_NULL) return;
@@ -103,7 +103,7 @@ void rtgui_list_view_ondraw(struct rtgui_list_view* view) void rtgui_list_view_update_current(struct rtgui_list_view* view, rt_uint16_t old_item)
{
struct rtgui_dc* dc;
- struct rtgui_list_item* item;
+ const struct rtgui_list_item* item;
rtgui_rect_t rect, item_rect;
if (old_item/view->page_items != view->current_item/view->page_items)
@@ -267,7 +267,7 @@ rt_bool_t rtgui_list_view_event_handler(struct rtgui_widget* widget, struct rtgu return rtgui_view_event_handler(widget, event);
}
-rtgui_list_view_t* rtgui_list_view_create(struct rtgui_list_item* items, rt_uint16_t count, rtgui_rect_t *rect)
+rtgui_list_view_t* rtgui_list_view_create(const struct rtgui_list_item* items, rt_uint16_t count, rtgui_rect_t *rect)
{
struct rtgui_list_view* view = RT_NULL;
diff --git a/rtgui/widgets/textbox.c b/rtgui/widgets/textbox.c index c28f193b37..d7e6ca798d 100644 --- a/rtgui/widgets/textbox.c +++ b/rtgui/widgets/textbox.c @@ -156,7 +156,7 @@ static void rtgui_textbox_onkey(struct rtgui_textbox* box, struct rtgui_event_kb } else { - unsigned char *c; + char *c; /* remove character */ for (c = &box->text[box->position]; c[1] != '\0'; c++) @@ -176,7 +176,7 @@ static void rtgui_textbox_onkey(struct rtgui_textbox* box, struct rtgui_event_kb /* remove current character */ if (box->position != 0) { - unsigned char *c; + char *c; /* remove character */ for (c = &box->text[box->position - 1]; c[1] != '\0'; c++) @@ -218,7 +218,7 @@ static void rtgui_textbox_onkey(struct rtgui_textbox* box, struct rtgui_event_kb if (box->position < length - 1) { - unsigned char* c; + char* c; for (c = &box->text[length]; c != &box->text[box->position]; c--) *c = *(c-1); diff --git a/rtgui/widgets/title.c b/rtgui/widgets/title.c index 005f125ee2..c1b2419f37 100644 --- a/rtgui/widgets/title.c +++ b/rtgui/widgets/title.c @@ -43,7 +43,7 @@ rtgui_type_t* rtgui_wintitle_type_get() return wintitle_type; } -rtgui_wintitle_t* rtgui_wintitle_create(const rt_uint8_t* title) +rtgui_wintitle_t* rtgui_wintitle_create(const char* title) { rtgui_wintitle_t* wintitle; @@ -61,7 +61,7 @@ void rtgui_wintitle_destroy(rtgui_wintitle_t* wintitle) rtgui_widget_destroy(RTGUI_WIDGET(wintitle)); } -void rtgui_wintitle_set_title(rtgui_wintitle_t* wintitle, const rt_uint8_t* title) +void rtgui_wintitle_set_title(rtgui_wintitle_t* wintitle, const char* title) { RT_ASSERT(wintitle != RT_NULL); @@ -70,11 +70,11 @@ void rtgui_wintitle_set_title(rtgui_wintitle_t* wintitle, const rt_uint8_t* titl rtgui_free(wintitle->title); } - if (title != RT_NULL) wintitle->title = (unsigned char*)rt_strdup((const char*)title); + if (title != RT_NULL) wintitle->title = (char*)rt_strdup((const char*)title); else wintitle->title = RT_NULL; } -rt_uint8_t *rtgui_wintitle_get_title(rtgui_wintitle_t* wintitle) +char *rtgui_wintitle_get_title(rtgui_wintitle_t* wintitle) { RT_ASSERT(wintitle != RT_NULL); |
