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/interface/interface_context_menu.c | |
| 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/interface/interface_context_menu.c')
| -rw-r--r-- | source/blender/editors/interface/interface_context_menu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_context_menu.c b/source/blender/editors/interface/interface_context_menu.c index f6da9663daf..7a300860583 100644 --- a/source/blender/editors/interface/interface_context_menu.c +++ b/source/blender/editors/interface/interface_context_menu.c @@ -233,7 +233,7 @@ static uiBlock *menu_add_shortcut(bContext *C, ARegion *region, void *arg) /* XXX this guess_opname can potentially return a different keymap * than being found on adding later... */ km = WM_keymap_guess_opname(C, idname); - kmi = WM_keymap_add_item(km, idname, AKEY, KM_PRESS, 0, 0); + kmi = WM_keymap_add_item(km, idname, EVT_AKEY, KM_PRESS, 0, 0); kmi_id = kmi->id; /* This takes ownership of prop, or prop can be NULL for reset. */ |