cleanup function declaration.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@465 bbd45198-f89e-11dd-88c7-29a3b14d5316

9 files changed, 16 insertions, 26 deletions

diff --git a/rtgui/include/rtgui/widgets/checkbox.h b/rtgui/include/rtgui/widgets/checkbox.h
index 0498435a4f..9e9c325ab2 100644
--- a/rtgui/include/rtgui/widgets/checkbox.h
+++ b/rtgui/include/rtgui/widgets/checkbox.h
@@ -27,10 +27,12 @@ typedef struct rtgui_checkbox rtgui_checkbox_t;
 

 rtgui_type_t *rtgui_checkbox_type_get(void);

 

-rtgui_checkbox_t* rtgui_checkbox_create(unsigned char* text);

+rtgui_checkbox_t* rtgui_checkbox_create(unsigned char* text, rt_bool_t checked);

 void rtgui_checkbox_destroy(rtgui_checkbox_t* checkbox);

 

-void rtgui_checkbox_ondraw(rtgui_checkbox_t* checkbox);

+void rtgui_checkbox_set_checked(rtgui_checkbox_t* checkbox, rt_bool_t checked);

+rt_bool_t rtgui_checkbox_get_checked(rtgui_checkbox_t* checkbox);

+

 rt_bool_t rtgui_checkbox_event_handler(struct rtgui_widget* widget, struct rtgui_event* event);

 

 #endif

diff --git a/rtgui/include/rtgui/widgets/filelist_view.h b/rtgui/include/rtgui/widgets/filelist_view.h
index 6114403104..8f608e6de1 100644
--- a/rtgui/include/rtgui/widgets/filelist_view.h
+++ b/rtgui/include/rtgui/widgets/filelist_view.h
@@ -48,8 +48,6 @@ rtgui_filelist_view_t* rtgui_filelist_view_create(rtgui_workbench_t* workbench,
 	const char* directory, const char* pattern, const rtgui_rect_t* rect);

 void rtgui_filelist_view_destroy(rtgui_filelist_view_t* view);

 

-void rtgui_filelist_view_clear(rtgui_filelist_view_t* view);

-

 rt_bool_t rtgui_filelist_view_event_handler(struct rtgui_widget* widget, struct rtgui_event* event);

 void rtgui_filelist_view_set_directory(rtgui_filelist_view_t* view, const char* directory);

 

diff --git a/rtgui/include/rtgui/widgets/list_view.h b/rtgui/include/rtgui/widgets/list_view.h
index d15671eca0..6d7732f491 100644
--- a/rtgui/include/rtgui/widgets/list_view.h
+++ b/rtgui/include/rtgui/widgets/list_view.h
@@ -61,8 +61,6 @@ rtgui_list_view_t* rtgui_list_view_create(const struct rtgui_list_item* items, r
     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/radiobox.h b/rtgui/include/rtgui/widgets/radiobox.h
index 52bbd84ff3..f2b8f0bf50 100644
--- a/rtgui/include/rtgui/widgets/radiobox.h
+++ b/rtgui/include/rtgui/widgets/radiobox.h
@@ -42,3 +42,4 @@ rt_bool_t rtgui_radiobox_event_handler(struct rtgui_widget* widget, struct rtgui
 void rtgui_radiobox_set_orientation(struct rtgui_radiobox* radiobox, int orientation);

 

 #endif

+

diff --git a/rtgui/include/rtgui/widgets/textbox.h b/rtgui/include/rtgui/widgets/textbox.h
index 5dfc64d8c6..65d6b253c5 100644
--- a/rtgui/include/rtgui/widgets/textbox.h
+++ b/rtgui/include/rtgui/widgets/textbox.h
@@ -61,7 +61,9 @@ struct rtgui_textbox
 };

 typedef struct rtgui_textbox rtgui_textbox_t;

 

-struct rtgui_textbox* rtgui_textbox_create(const char* text);

+rtgui_type_t *rtgui_textbox_type_get(void);

+

+struct rtgui_textbox* rtgui_textbox_create(const char* text, rt_uint8_t flag);

 void rtgui_textbox_destroy(struct rtgui_textbox* box);

 

 rt_bool_t rtgui_textbox_event_handler(struct rtgui_widget* widget, struct rtgui_event* event);

@@ -69,6 +71,6 @@ rt_bool_t rtgui_textbox_event_handler(struct rtgui_widget* widget, struct rtgui_
 void rtgui_textbox_set_value(struct rtgui_textbox* box, const char* text);

 const char* rtgui_textbox_get_value(struct rtgui_textbox* box);

 

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

 

 #endif

diff --git a/rtgui/include/rtgui/widgets/view.h b/rtgui/include/rtgui/widgets/view.h
index 6d8311fc61..7e28a4ea93 100644
--- a/rtgui/include/rtgui/widgets/view.h
+++ b/rtgui/include/rtgui/widgets/view.h
@@ -49,7 +49,9 @@ void rtgui_view_destroy(rtgui_view_t* view);
 

 rt_bool_t rtgui_view_event_handler(struct rtgui_widget* widget, struct rtgui_event* event);

 

+#ifndef RTGUI_USING_SMALL_SIZE

 void rtgui_view_set_box(rtgui_view_t* view, rtgui_box_t* box);

+#endif

 

 rtgui_modal_code_t rtgui_view_show(rtgui_view_t* view, rt_bool_t is_modal);

 void rtgui_view_hide(rtgui_view_t* view);

diff --git a/rtgui/include/rtgui/widgets/widget.h b/rtgui/include/rtgui/widgets/widget.h
index 8f71629031..eb925d040f 100644
--- a/rtgui/include/rtgui/widgets/widget.h
+++ b/rtgui/include/rtgui/widgets/widget.h
@@ -127,27 +127,11 @@ rtgui_type_t *rtgui_widget_type_get(void);
 rtgui_widget_t *rtgui_widget_create(rtgui_type_t *widget_type);
 void rtgui_widget_destroy(rtgui_widget_t* widget);
 
-/* initial a widget */
-void rtgui_widget_init(rtgui_widget_t* widget, rtgui_type_t type, rtgui_rect_t* rect);
-/* detach a widget */
-void rtgui_widget_detach(rtgui_widget_t* widget);
-
-/* update toplevel widget */
-void rtgui_widget_update_toplevel(rtgui_widget_t* widget);
-
 /* set the event handler of widget */
 void rtgui_widget_set_event_handler(rtgui_widget_t* widget, rtgui_event_handler_ptr handler);
 /* widget default event handler */
 rt_bool_t rtgui_widget_event_handler(rtgui_widget_t* widget, rtgui_event_t* event);
 
-/* dispatch event to child widget */
-rt_bool_t rtgui_widget_dispatch_event(rtgui_widget_t* widget, rtgui_event_t* event);
-rt_bool_t rtgui_widget_dispatch_mouse_event(rtgui_widget_t* widget, struct rtgui_event_mouse* event);
-
-/* set and get widget label */
-char* rtgui_widget_get_label(rtgui_widget_t* widget);
-void rtgui_widget_set_label(rtgui_widget_t* widget, const char* label);
-
 /* focus and unfocus */
 void rtgui_widget_focus(rtgui_widget_t * widget);
 void rtgui_widget_unfocus(rtgui_widget_t *widget);
diff --git a/rtgui/include/rtgui/widgets/window.h b/rtgui/include/rtgui/widgets/window.h
index 75c53eb69b..1f63a666b6 100644
--- a/rtgui/include/rtgui/widgets/window.h
+++ b/rtgui/include/rtgui/widgets/window.h
@@ -85,7 +85,10 @@ void rtgui_win_move(struct rtgui_win* win, int x, int y);
 

 /* reset extent of window */

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

+#endif

 

 void rtgui_win_set_onactivate(rtgui_win_t* win, rtgui_event_handler_ptr handler);

 void rtgui_win_set_ondeactivate(rtgui_win_t* win, rtgui_event_handler_ptr handler);

diff --git a/rtgui/include/rtgui/widgets/workbench.h b/rtgui/include/rtgui/widgets/workbench.h
index ba863f080e..1038c92e09 100644
--- a/rtgui/include/rtgui/widgets/workbench.h
+++ b/rtgui/include/rtgui/widgets/workbench.h
@@ -60,11 +60,11 @@ struct rtgui_workbench
 	rtgui_view_t* current_view;

 };

 

+rtgui_type_t* rtgui_workbench_type_get(void);

+

 rtgui_workbench_t *rtgui_workbench_create(const char* panel_name, const unsigned char* title);

 void rtgui_workbench_destroy(rtgui_workbench_t* workbench);

 

-rtgui_type_t* rtgui_workbench_type_get(void);

-

 rt_bool_t rtgui_workbench_event_handler(rtgui_widget_t* widget, rtgui_event_t* event);

 

 void rtgui_workbench_set_flag(rtgui_workbench_t* workbench, rt_uint8_t flag);