diff options
| author | [email protected] <[email protected]> | 2012-07-26 06:36:49 +0000 |
|---|---|---|
| committer | [email protected] <[email protected]> | 2012-07-26 06:36:49 +0000 |
| commit | 08e05eb3b493cd92601217fcf86fe6daa196eec4 (patch) | |
| tree | 8a4d360ceb974599fd9c934b827519e5c3542abd /components/rtgui/include | |
| parent | f7fbd6bc6d72ba92e8d2c30176e94ab36e7c7c4e (diff) | |
sync with github bd3351e572
As always, full log is in GitHub.
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2234 bbd45198-f89e-11dd-88c7-29a3b14d5316
Diffstat (limited to 'components/rtgui/include')
| -rw-r--r-- | components/rtgui/include/rtgui/image.h | 1 | ||||
| -rw-r--r-- | components/rtgui/include/rtgui/widgets/notebook.h | 1 | ||||
| -rw-r--r-- | components/rtgui/include/rtgui/widgets/window.h | 4 |
3 files changed, 2 insertions, 4 deletions
diff --git a/components/rtgui/include/rtgui/image.h b/components/rtgui/include/rtgui/image.h index e876354286..3314c444a0 100644 --- a/components/rtgui/include/rtgui/image.h +++ b/components/rtgui/include/rtgui/image.h @@ -60,6 +60,7 @@ typedef struct rtgui_image rtgui_image_t; void rtgui_system_image_init(void); #if defined(RTGUI_USING_DFS_FILERW) || defined(RTGUI_USING_STDIO_FILERW) +struct rtgui_image_engine* rtgui_image_get_engine_by_filename(const char* fn); struct rtgui_image* rtgui_image_create_from_file(const char* type, const char* filename, rt_bool_t load); struct rtgui_image* rtgui_image_create(const char* filename, rt_bool_t load); #endif diff --git a/components/rtgui/include/rtgui/widgets/notebook.h b/components/rtgui/include/rtgui/widgets/notebook.h index 92fb9e6c4d..881f11fc17 100644 --- a/components/rtgui/include/rtgui/widgets/notebook.h +++ b/components/rtgui/include/rtgui/widgets/notebook.h @@ -34,6 +34,7 @@ struct rtgui_notebook* rtgui_notebook_create(const rtgui_rect_t* rect, rt_uint8_ void rtgui_notebook_destroy(struct rtgui_notebook* notebook); void rtgui_notebook_add(struct rtgui_notebook* notebook, const char* label, struct rtgui_widget* child); +void rtgui_notebook_remove(struct rtgui_notebook* notebook, rt_uint16_t index); struct rtgui_widget* rtgui_notebook_get_current(struct rtgui_notebook* notebook); rt_int16_t rtgui_notebook_get_current_index(struct rtgui_notebook* notebook); diff --git a/components/rtgui/include/rtgui/widgets/window.h b/components/rtgui/include/rtgui/widgets/window.h index ac3c2e7e36..7f2756905e 100644 --- a/components/rtgui/include/rtgui/widgets/window.h +++ b/components/rtgui/include/rtgui/widgets/window.h @@ -133,10 +133,6 @@ 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); void rtgui_win_set_onclose(rtgui_win_t* win, rtgui_event_handler_ptr handler); |