diff options
| author | bernard.xiong <[email protected]> | 2010-03-08 23:11:34 +0000 |
|---|---|---|
| committer | bernard.xiong <[email protected]> | 2010-03-08 23:11:34 +0000 |
| commit | 86f386885253fbe04a4c079a5e481b2539626f04 (patch) | |
| tree | b87b67ff85c3e79a8d4469a521522d914eebeacf /rtgui/widgets | |
| parent | 5e82a9a02205e053c281ac19b93ed896d2c88a5c (diff) | |
cleanup function declaration.
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@465 bbd45198-f89e-11dd-88c7-29a3b14d5316
Diffstat (limited to 'rtgui/widgets')
| -rw-r--r-- | rtgui/widgets/checkbox.c | 27 | ||||
| -rw-r--r-- | rtgui/widgets/filelist_view.c | 3 | ||||
| -rw-r--r-- | rtgui/widgets/textbox.c | 5 | ||||
| -rw-r--r-- | rtgui/widgets/view.c | 2 | ||||
| -rw-r--r-- | rtgui/widgets/window.c | 2 |
5 files changed, 35 insertions, 4 deletions
diff --git a/rtgui/widgets/checkbox.c b/rtgui/widgets/checkbox.c index e3677f0547..46844eec23 100644 --- a/rtgui/widgets/checkbox.c +++ b/rtgui/widgets/checkbox.c @@ -87,7 +87,7 @@ rt_bool_t rtgui_checkbox_event_handler(struct rtgui_widget* widget, struct rtgui return RT_FALSE;
}
-struct rtgui_checkbox* rtgui_checkbox_create(unsigned char* text)
+struct rtgui_checkbox* rtgui_checkbox_create(unsigned char* text, rt_bool_t checked)
{
struct rtgui_checkbox* box;
@@ -103,6 +103,11 @@ struct rtgui_checkbox* rtgui_checkbox_create(unsigned char* text) rtgui_widget_set_rect(RTGUI_WIDGET(box), &rect);
rtgui_label_set_text(RTGUI_LABEL(box), text);
+
+ if (checked == RT_TRUE)
+ box->status_down = RTGUI_CHECKBOX_STATUS_CHECKED;
+ else
+ box->status_down = RTGUI_CHECKBOX_STATUS_UNCHECKED;
}
return box;
@@ -113,3 +118,23 @@ void rtgui_checkbox_destroy(rtgui_checkbox_t* box) rtgui_widget_destroy(RTGUI_WIDGET(box));
}
+void rtgui_checkbox_set_checked(rtgui_checkbox_t* checkbox, rt_bool_t checked)
+{
+ RT_ASSERT(checkbox != RT_NULL);
+ if (checked == RT_TRUE)
+ checkbox->status_down = RTGUI_CHECKBOX_STATUS_CHECKED;
+ else
+ checkbox->status_down = RTGUI_CHECKBOX_STATUS_UNCHECKED;
+
+}
+
+rt_bool_t rtgui_checkbox_get_checked(rtgui_checkbox_t* checkbox)
+{
+ RT_ASSERT(checkbox != RT_NULL);
+
+ if (checkbox->status_down == RTGUI_CHECKBOX_STATUS_CHECKED)
+ return RT_TRUE;
+
+ return RT_FALSE;
+}
+
diff --git a/rtgui/widgets/filelist_view.c b/rtgui/widgets/filelist_view.c index bef3f90030..8a7f5f2457 100644 --- a/rtgui/widgets/filelist_view.c +++ b/rtgui/widgets/filelist_view.c @@ -219,6 +219,7 @@ const static char * folder_xpm[] = { /* image for file and folder */
static rtgui_image_t *file_image, *folder_image;
+static static void rtgui_filelist_view_clear(rtgui_filelist_view_t* view);
static void _rtgui_filelist_view_constructor(struct rtgui_filelist_view *view)
{
@@ -591,7 +592,7 @@ void rtgui_filelist_view_destroy(rtgui_filelist_view_t* view) }
/* clear all file items */
-void rtgui_filelist_view_clear(rtgui_filelist_view_t* view)
+static void rtgui_filelist_view_clear(rtgui_filelist_view_t* view)
{
rt_uint32_t index;
struct rtgui_file_item* item;
diff --git a/rtgui/widgets/textbox.c b/rtgui/widgets/textbox.c index d7e6ca798d..9fd86b7efd 100644 --- a/rtgui/widgets/textbox.c +++ b/rtgui/widgets/textbox.c @@ -295,7 +295,7 @@ rt_bool_t rtgui_textbox_event_handler(struct rtgui_widget* widget, struct rtgui_ return RT_FALSE; } -struct rtgui_textbox* rtgui_textbox_create(const char* text) +struct rtgui_textbox* rtgui_textbox_create(const char* text, rt_uint8_t flag) { struct rtgui_textbox* box; @@ -306,6 +306,7 @@ struct rtgui_textbox* rtgui_textbox_create(const char* text) /* allocate default line buffer */ rtgui_textbox_set_value(box, text); + box->flag = flag; rtgui_font_get_metrics(RTGUI_WIDGET(box)->gc.font, "h", &rect); } @@ -354,7 +355,7 @@ const char* rtgui_textbox_get_value(struct rtgui_textbox* box) return (const char*)box->text; } -void rtgui_widget_set_line_length(struct rtgui_textbox* box, rt_size_t length) +void rtgui_textbox_set_line_length(struct rtgui_textbox* box, rt_size_t length) { rt_uint8_t* new_line; diff --git a/rtgui/widgets/view.c b/rtgui/widgets/view.c index 3c2c714eca..04cbc79a34 100644 --- a/rtgui/widgets/view.c +++ b/rtgui/widgets/view.c @@ -122,6 +122,7 @@ void rtgui_view_destroy(rtgui_view_t* view) rtgui_widget_destroy(RTGUI_WIDGET(view)); } +#ifndef RTGUI_USING_SMALL_SIZE void rtgui_view_set_box(rtgui_view_t* view, rtgui_box_t* box) { if (view == RT_NULL || @@ -130,6 +131,7 @@ void rtgui_view_set_box(rtgui_view_t* view, rtgui_box_t* box) rtgui_container_add_child(RTGUI_CONTAINER(view), RTGUI_WIDGET(box)); rtgui_widget_set_rect(RTGUI_WIDGET(box), &(RTGUI_WIDGET(view)->extent)); } +#endif rtgui_modal_code_t rtgui_view_show(rtgui_view_t* view, rt_bool_t is_modal) { diff --git a/rtgui/widgets/window.c b/rtgui/widgets/window.c index 8cba39d0c2..268c9c50c4 100644 --- a/rtgui/widgets/window.c +++ b/rtgui/widgets/window.c @@ -568,6 +568,7 @@ void rtgui_win_set_rect(rtgui_win_t* win, rtgui_rect_t* rect) } } +#ifndef RTGUI_USING_SMALL_SIZE void rtgui_win_set_box(rtgui_win_t* win, rtgui_box_t* box) { if (win == RT_NULL || box == RT_NULL) return; @@ -575,6 +576,7 @@ void rtgui_win_set_box(rtgui_win_t* win, rtgui_box_t* box) rtgui_container_add_child(RTGUI_CONTAINER(win), RTGUI_WIDGET(box)); rtgui_widget_set_rect(RTGUI_WIDGET(box), &(RTGUI_WIDGET(win)->extent)); } +#endif void rtgui_win_set_onactivate(rtgui_win_t* win, rtgui_event_handler_ptr handler) { |
