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

7 files changed, 27 insertions, 28 deletions

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);