diff options
| author | Bernard Xiong <[email protected]> | 2018-01-20 12:15:14 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-01-20 12:15:14 +0800 |
| commit | 7d049d57db1bbbb29123f1089acc04f886203d10 (patch) | |
| tree | 1da75d9520d964b35571a82465c8cf7e346adb43 /components/gui/include | |
| parent | 973a5fb885cb7edc55d5aed6ce2445cb457d7f6c (diff) | |
| parent | 0415298ceb1d4eb529165c6618b5f8eaea485641 (diff) | |
Merge pull request #1182 from yangfasheng/master
gui 引擎优化；
Diffstat (limited to 'components/gui/include')
| -rw-r--r-- | components/gui/include/rtgui/event.h | 6 | ||||
| -rw-r--r-- | components/gui/include/rtgui/rtgui.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/components/gui/include/rtgui/event.h b/components/gui/include/rtgui/event.h index 78f269a239..d1a8070af4 100644 --- a/components/gui/include/rtgui/event.h +++ b/components/gui/include/rtgui/event.h @@ -343,7 +343,7 @@ struct rtgui_event_gesture enum rtgui_gesture_type type; - rt_uint32_t win_acti_cnt; /* win id */ + rt_uint32_t win_acti_cnt; /* window activate count */ }; /* @@ -362,7 +362,7 @@ struct rtgui_event_mouse * different id. id should never be 0. */ rt_uint32_t id; - rt_uint32_t win_acti_cnt; /* win id */ + rt_uint32_t win_acti_cnt; /* window activate count */ }; #define RTGUI_MOUSE_BUTTON_LEFT 0x01 #define RTGUI_MOUSE_BUTTON_RIGHT 0x02 @@ -383,7 +383,7 @@ struct rtgui_event_kbd { _RTGUI_EVENT_WIN_ELEMENTS - rt_uint32_t win_acti_cnt; /* win id */ + rt_uint32_t win_acti_cnt; /* window activate count */ rt_uint16_t type; /* key down or up */ rt_uint16_t key; /* current key */ diff --git a/components/gui/include/rtgui/rtgui.h b/components/gui/include/rtgui/rtgui.h index 8f8fecb086..b918c78be1 100644 --- a/components/gui/include/rtgui/rtgui.h +++ b/components/gui/include/rtgui/rtgui.h @@ -173,7 +173,7 @@ enum RTGUI_MODAL_CODE { RTGUI_MODAL_OK, RTGUI_MODAL_CANCEL, - RTGUI_MODAL_MAX = 0xFFFFFFFF, + RTGUI_MODAL_MAX = 0xFFFF, }; typedef enum RTGUI_MODAL_CODE rtgui_modal_code_t; |