From 2d98c0e7be8e0803de4b4e8e9ba03635bcef91c8 Mon Sep 17 00:00:00 2001 From: yangfasheng Date: Tue, 12 Dec 2017 19:46:38 +0800 Subject: gui 引擎代码更新； MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/gui/src/rtgui_system.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'components/gui/src/rtgui_system.c') diff --git a/components/gui/src/rtgui_system.c b/components/gui/src/rtgui_system.c index f5da07ea4f..8cdfe763c7 100644 --- a/components/gui/src/rtgui_system.c +++ b/components/gui/src/rtgui_system.c @@ -351,7 +351,7 @@ void *rtgui_realloc(void *ptr, rt_size_t size) new_ptr = rtgui_malloc(size); if ((new_ptr != RT_NULL) && (ptr != RT_NULL)) { - rt_memcpy(new_ptr, ptr, size); + memcpy(new_ptr, ptr, size); rtgui_free(ptr); } #else @@ -417,6 +417,7 @@ const char *rtgui_event_string[] = "WIN_CLOSE", /* close a window */ "WIN_MOVE", /* move a window */ "WIN_RESIZE", /* resize a window */ + "WIN_UPDATE_END", "WIN_MODAL_ENTER", /* a window modals */ "SET_WM", /* set window manager */ @@ -546,6 +547,8 @@ static void rtgui_event_dump(struct rtgui_app* app, rtgui_event_t *event) break; case RTGUI_EVENT_WIN_ACTIVATE: + case RTGUI_EVENT_WIN_DESTROY: + case RTGUI_EVENT_WIN_CLOSE: case RTGUI_EVENT_WIN_DEACTIVATE: case RTGUI_EVENT_WIN_SHOW: case RTGUI_EVENT_WIN_HIDE: @@ -755,7 +758,7 @@ rt_err_t rtgui_recv_filter(rt_uint32_t type, rtgui_event_t *event, rt_size_t eve { if (e->type == type) { - rt_memcpy(event, e, event_size); + memcpy(event, e, event_size); return RT_EOK; } else -- cgit v1.3.1