diff options
author | Ray Molenkamp <github@lazydodo.com> | 2020-03-18 19:38:37 +0300 |
---|---|---|
committer | Ray Molenkamp <github@lazydodo.com> | 2020-03-18 19:38:37 +0300 |
commit | b88ca3e6d113d161dd119bf1cec959c73b797af7 (patch) | |
tree | 6a8b73ca95f8a21742cba1e764d1e24cc5ae8db5 /source/blender/editors/space_text | |
parent | 9e382dd2a3d8569201a3e5c1a8478166c77e9029 (diff) |
Cleanup: Resolve HKEY conflict
Both the MS headers and blender headers define the HKEY
which gives all kind of inclusion order issues.
This diff renames all *KEY constants to EVT_*KEY to resolve
this conflict.
Reviewed By: brecht , dfelinto
Differential Revision: http://developer.blender.org/D7164
Diffstat (limited to 'source/blender/editors/space_text')
-rw-r--r-- | source/blender/editors/space_text/text_autocomplete.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/editors/space_text/text_autocomplete.c b/source/blender/editors/space_text/text_autocomplete.c index 97ce7035222..7a74cf9fe80 100644 --- a/source/blender/editors/space_text/text_autocomplete.c +++ b/source/blender/editors/space_text/text_autocomplete.c @@ -394,7 +394,7 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e draw = 1; } break; - case ESCKEY: + case EVT_ESCKEY: if (event->val == KM_PRESS) { draw = swallow = 1; if (tools & TOOL_SUGG_LIST) { @@ -410,8 +410,8 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e retval = OPERATOR_CANCELLED; } break; - case RETKEY: - case PADENTER: + case EVT_RETKEY: + case EVT_PADENTER: if (event->val == KM_PRESS) { if (tools & TOOL_SUGG_LIST) { ED_text_undo_push_init(C); @@ -429,8 +429,8 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e retval = OPERATOR_FINISHED; } break; - case LEFTARROWKEY: - case BACKSPACEKEY: + case EVT_LEFTARROWKEY: + case EVT_BACKSPACEKEY: if (event->val == KM_PRESS) { if (tools & TOOL_SUGG_LIST) { if (event->ctrl) { @@ -462,7 +462,7 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e } } break; - case RIGHTARROWKEY: + case EVT_RIGHTARROWKEY: if (event->val == KM_PRESS) { if (tools & TOOL_SUGG_LIST) { if (event->ctrl) { @@ -494,11 +494,11 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e } } break; - case PAGEDOWNKEY: + case EVT_PAGEDOWNKEY: scroll = SUGG_LIST_SIZE - 1; ATTR_FALLTHROUGH; case WHEELDOWNMOUSE: - case DOWNARROWKEY: + case EVT_DOWNARROWKEY: if (event->val == KM_PRESS) { if (tools & TOOL_DOCUMENT) { doc_scroll++; @@ -528,11 +528,11 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e } } break; - case PAGEUPKEY: + case EVT_PAGEUPKEY: scroll = SUGG_LIST_SIZE - 1; ATTR_FALLTHROUGH; case WHEELUPMOUSE: - case UPARROWKEY: + case EVT_UPARROWKEY: if (event->val == KM_PRESS) { if (tools & TOOL_DOCUMENT) { if (doc_scroll > 0) { @@ -559,8 +559,8 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e } } break; - case RIGHTSHIFTKEY: - case LEFTSHIFTKEY: + case EVT_RIGHTSHIFTKEY: + case EVT_LEFTSHIFTKEY: break; #if 0 default: |