diff options
| author | JasonJiaJie <[email protected]> | 2017-12-14 09:12:01 +0800 |
|---|---|---|
| committer | JasonJiaJie <[email protected]> | 2017-12-14 09:12:01 +0800 |
| commit | a2a8e2eee02e30803d813eafdde21a53459c5af9 (patch) | |
| tree | 48c9298e79df107ebbbf532091853c929a3944fd /components/gui/src/rtgui_system.c | |
| parent | bd4c90f61948810278b774a4ba1ad3440c7d1460 (diff) | |
| parent | b0f4ae246a7a0d958777e11ad2392f22f20a99e6 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'components/gui/src/rtgui_system.c')
| -rw-r--r-- | components/gui/src/rtgui_system.c | 7 |
1 files changed, 5 insertions, 2 deletions
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 |
