From 9dddc075d4a26c199477a23735fe81918e32dd39 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Mon, 17 Jul 2017 16:36:19 +0900 Subject: [PATCH] win: Amend previous commit about modifiers The code was invalid, so making it valid now. Explicitely marking the modifiers as unused, as mentionned in the documentation as well. See 9baa8752a9170e68e9430474f26cc1e672677d8e --- src/lib/elementary/efl_ui_win.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index dd23d99061..c7cfa7f67d 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -8073,21 +8073,26 @@ elm_win_resize_object_del(Eo *obj, Evas_Object *subobj) EAPI Eina_Bool elm_win_keygrab_set(Elm_Win *obj, const char *key, - Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, + Evas_Modifier_Mask modifiers EINA_UNUSED, + Evas_Modifier_Mask not_modifiers EINA_UNUSED, int priority, Elm_Win_Keygrab_Mode grab_mode) { + // Note: Not converting modifiers as they are not used in the implementation return efl_ui_win_keygrab_set(obj, key, - (Efl_Input_Modifier) modifiers, - (Efl_Input_Modifier) not_modifiers, + EFL_INPUT_MODIFIER_NONE, + EFL_INPUT_MODIFIER_NONE, priority, grab_mode); } EAPI Eina_Bool -elm_win_keygrab_unset(Elm_Win *obj, const char *key, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers) +elm_win_keygrab_unset(Elm_Win *obj, const char *key, + Evas_Modifier_Mask modifiers EINA_UNUSED, + Evas_Modifier_Mask not_modifiers EINA_UNUSED) { + // Note: Not converting modifiers as they are not used in the implementation return efl_ui_win_keygrab_unset(obj, key, - (Efl_Input_Modifier) modifiers, - (Efl_Input_Modifier) not_modifiers); + EFL_INPUT_MODIFIER_NONE, + EFL_INPUT_MODIFIER_NONE); } // deprecated