From b88ca3e6d113d161dd119bf1cec959c73b797af7 Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Wed, 18 Mar 2020 10:38:37 -0600 Subject: 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 --- source/blender/editors/interface/interface_context_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors/interface/interface_context_menu.c') 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. */ -- cgit v1.2.3