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/windowmanager/intern/wm_event_query.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/windowmanager/intern/wm_event_query.c') diff --git a/source/blender/windowmanager/intern/wm_event_query.c b/source/blender/windowmanager/intern/wm_event_query.c index f1a03efa49b..eaddbb25034 100644 --- a/source/blender/windowmanager/intern/wm_event_query.c +++ b/source/blender/windowmanager/intern/wm_event_query.c @@ -420,7 +420,7 @@ bool WM_event_is_tablet(const struct wmEvent *event) /* most os using ctrl/oskey + space to switch ime, avoid added space */ bool WM_event_is_ime_switch(const struct wmEvent *event) { - return event->val == KM_PRESS && event->type == SPACEKEY && + return event->val == KM_PRESS && event->type == EVT_SPACEKEY && (event->ctrl || event->oskey || event->shift || event->alt); } #endif -- cgit v1.2.3