diff options
| author | bernard.xiong <[email protected]> | 2009-10-20 23:55:50 +0000 |
|---|---|---|
| committer | bernard.xiong <[email protected]> | 2009-10-20 23:55:50 +0000 |
| commit | a65a0c70ac8c82b5eb7f8b6bf258270585a4e001 (patch) | |
| tree | 4e4244a2b59ab111f518d087fe6e3041ae70d3da /rtgui/include | |
| parent | 9a7ae650851ee482a21062f1dfff08caf619bcc2 (diff) | |
update filerw ops with dfs filesystem interface; update window event loop handler.
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@114 bbd45198-f89e-11dd-88c7-29a3b14d5316
Diffstat (limited to 'rtgui/include')
| -rw-r--r-- | rtgui/include/rtgui/event.h | 3 | ||||
| -rw-r--r-- | rtgui/include/rtgui/rtgui_config.h | 3 | ||||
| -rw-r--r-- | rtgui/include/rtgui/rtgui_system.h | 3 | ||||
| -rw-r--r-- | rtgui/include/rtgui/widgets/window.h | 6 |
4 files changed, 11 insertions, 4 deletions
diff --git a/rtgui/include/rtgui/event.h b/rtgui/include/rtgui/event.h index 5a94107ee9..0ff94117ce 100644 --- a/rtgui/include/rtgui/event.h +++ b/rtgui/include/rtgui/event.h @@ -283,8 +283,7 @@ struct rtgui_event_timer {
struct rtgui_event parent;
- void (*callback)(struct rtgui_timer* timer, void* parameter);
- void *parameter;
+ struct rtgui_timer *timer;
};
struct rtgui_event_clip_info
diff --git a/rtgui/include/rtgui/rtgui_config.h b/rtgui/include/rtgui/rtgui_config.h index 11e77c2091..fc63f17d6c 100644 --- a/rtgui/include/rtgui/rtgui_config.h +++ b/rtgui/include/rtgui/rtgui_config.h @@ -24,7 +24,8 @@ /* #define RTGUI_USING_FONT16 */
-#define RT_USING_STDIO_FILERW
+// #define RT_USING_STDIO_FILERW
+#define RT_USING_DFS_FILERW
#define RTGUI_IMAGE_PNG
#define RTGUI_SVR_THREAD_PRIORITY 15
diff --git a/rtgui/include/rtgui/rtgui_system.h b/rtgui/include/rtgui/rtgui_system.h index e0ceae6f2b..9fd76b39c0 100644 --- a/rtgui/include/rtgui/rtgui_system.h +++ b/rtgui/include/rtgui/rtgui_system.h @@ -31,6 +31,9 @@ struct rtgui_thread /* the owner of thread */
struct rtgui_widget* widget;
+
+ /* quit of thread */
+ rt_bool_t is_quit;
};
typedef struct rtgui_thread rtgui_thread_t;
struct rtgui_timer;
diff --git a/rtgui/include/rtgui/widgets/window.h b/rtgui/include/rtgui/widgets/window.h index ee7f8a6b66..243ab75d26 100644 --- a/rtgui/include/rtgui/widgets/window.h +++ b/rtgui/include/rtgui/widgets/window.h @@ -47,6 +47,9 @@ struct rtgui_win /* inherit from toplevel */
struct rtgui_toplevel parent;
+ /* parent toplevel */
+ rtgui_toplevel_t* parent_toplevel;
+
/* top window style */
rt_uint32_t style;
@@ -64,7 +67,8 @@ struct rtgui_win rtgui_type_t *rtgui_win_type_get(void);
-rtgui_win_t* rtgui_win_create(const char* title, rtgui_rect_t *rect, rt_uint32_t flag);
+rtgui_win_t* rtgui_win_create(rtgui_toplevel_t* parent_toplevel, const char* title,
+ rtgui_rect_t *rect, rt_uint32_t flag);
void rtgui_win_destroy(rtgui_win_t* win);
void rtgui_win_show(rtgui_win_t* win);
|