forked from enlightenment/efl
edje: remove warning when building without Ecore_IMF.
SVN revision: 65440
This commit is contained in:
parent
cc02e46a18
commit
73c6c34cd6
|
@ -1508,9 +1508,9 @@ static void
|
||||||
_edje_key_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
|
_edje_key_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
|
||||||
{
|
{
|
||||||
Edje *ed = data;
|
Edje *ed = data;
|
||||||
Evas_Event_Key_Up *ev = event_info;
|
|
||||||
Edje_Real_Part *rp = ed->focused_part;
|
Edje_Real_Part *rp = ed->focused_part;
|
||||||
Entry *en;
|
Entry *en;
|
||||||
|
|
||||||
if (!rp) return;
|
if (!rp) return;
|
||||||
en = rp->entry_data;
|
en = rp->entry_data;
|
||||||
if ((!en) || (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) ||
|
if ((!en) || (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) ||
|
||||||
|
@ -1520,13 +1520,17 @@ _edje_key_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, voi
|
||||||
#ifdef HAVE_ECORE_IMF
|
#ifdef HAVE_ECORE_IMF
|
||||||
if (en->imf_context)
|
if (en->imf_context)
|
||||||
{
|
{
|
||||||
|
Evas_Event_Key_Up *ev = event_info;
|
||||||
Ecore_IMF_Event_Key_Up ecore_ev;
|
Ecore_IMF_Event_Key_Up ecore_ev;
|
||||||
|
|
||||||
ecore_imf_evas_event_key_up_wrap(ev, &ecore_ev);
|
ecore_imf_evas_event_key_up_wrap(ev, &ecore_ev);
|
||||||
if (ecore_imf_context_filter_event(en->imf_context,
|
if (ecore_imf_context_filter_event(en->imf_context,
|
||||||
ECORE_IMF_EVENT_KEY_UP,
|
ECORE_IMF_EVENT_KEY_UP,
|
||||||
(Ecore_IMF_Event *)&ecore_ev))
|
(Ecore_IMF_Event *)&ecore_ev))
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
(void) event_info;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2057,9 +2061,9 @@ _edje_entry_real_part_init(Edje_Real_Part *rp)
|
||||||
ecore_imf_context_input_mode_set(en->imf_context,
|
ecore_imf_context_input_mode_set(en->imf_context,
|
||||||
rp->part->entry_mode == EDJE_ENTRY_EDIT_MODE_PASSWORD ?
|
rp->part->entry_mode == EDJE_ENTRY_EDIT_MODE_PASSWORD ?
|
||||||
ECORE_IMF_INPUT_MODE_INVISIBLE : ECORE_IMF_INPUT_MODE_FULL);
|
ECORE_IMF_INPUT_MODE_INVISIBLE : ECORE_IMF_INPUT_MODE_FULL);
|
||||||
|
done:
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
done:
|
|
||||||
en->cursor = (Evas_Textblock_Cursor *)evas_object_textblock_cursor_get(rp->object);
|
en->cursor = (Evas_Textblock_Cursor *)evas_object_textblock_cursor_get(rp->object);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2489,10 +2493,13 @@ void
|
||||||
_edje_entry_input_panel_enabled_set(Edje_Real_Part *rp, Eina_Bool enabled)
|
_edje_entry_input_panel_enabled_set(Edje_Real_Part *rp, Eina_Bool enabled)
|
||||||
{
|
{
|
||||||
Entry *en = rp->entry_data;
|
Entry *en = rp->entry_data;
|
||||||
|
|
||||||
if (!en) return;
|
if (!en) return;
|
||||||
#ifdef HAVE_ECORE_IMF
|
#ifdef HAVE_ECORE_IMF
|
||||||
if (en->imf_context)
|
if (en->imf_context)
|
||||||
ecore_imf_context_input_panel_enabled_set(en->imf_context, enabled);
|
ecore_imf_context_input_panel_enabled_set(en->imf_context, enabled);
|
||||||
|
#else
|
||||||
|
(void) enabled;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2809,6 +2816,8 @@ _edje_entry_input_panel_layout_set(Edje_Real_Part *rp, Edje_Input_Panel_Layout l
|
||||||
#ifdef HAVE_ECORE_IMF
|
#ifdef HAVE_ECORE_IMF
|
||||||
if (en->imf_context)
|
if (en->imf_context)
|
||||||
ecore_imf_context_input_panel_layout_set(en->imf_context, layout);
|
ecore_imf_context_input_panel_layout_set(en->imf_context, layout);
|
||||||
|
#else
|
||||||
|
(void) layout;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2831,6 +2840,8 @@ _edje_entry_imf_context_reset(Entry *en)
|
||||||
#ifdef HAVE_ECORE_IMF
|
#ifdef HAVE_ECORE_IMF
|
||||||
if (en->imf_context)
|
if (en->imf_context)
|
||||||
ecore_imf_context_reset(en->imf_context);
|
ecore_imf_context_reset(en->imf_context);
|
||||||
|
#else
|
||||||
|
(void) en;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2846,6 +2857,8 @@ _edje_entry_imf_cursor_info_set(Entry *en)
|
||||||
ecore_imf_context_cursor_position_set(en->imf_context,
|
ecore_imf_context_cursor_position_set(en->imf_context,
|
||||||
evas_textblock_cursor_pos_get(en->cursor));
|
evas_textblock_cursor_pos_get(en->cursor));
|
||||||
ecore_imf_context_cursor_location_set(en->imf_context, cx, cy, cw, ch);
|
ecore_imf_context_cursor_location_set(en->imf_context, cx, cy, cw, ch);
|
||||||
|
#else
|
||||||
|
(void) en;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue