summaryrefslogtreecommitdiff
path: root/src/lib/elementary/efl_ui_check.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/elementary/efl_ui_check.c')
-rw-r--r--src/lib/elementary/efl_ui_check.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c
index 6b5dd01..6056e5c 100644
--- a/src/lib/elementary/efl_ui_check.c
+++ b/src/lib/elementary/efl_ui_check.c
@@ -100,7 +100,7 @@ _activate(Evas_Object *obj)
100 100
101 if (_elm_config->atspi_mode) 101 if (_elm_config->atspi_mode)
102 efl_access_state_changed_signal_emit(obj, 102 efl_access_state_changed_signal_emit(obj,
103 EFL_ACCESS_STATE_CHECKED, 103 EFL_ACCESS_STATE_TYPE_CHECKED,
104 efl_ui_nstate_value_get(obj)); 104 efl_ui_nstate_value_get(obj));
105} 105}
106 106
@@ -112,7 +112,7 @@ _efl_ui_check_efl_access_object_state_set_get(const Eo *obj, Efl_Ui_Check_Data *
112 states = efl_access_object_state_set_get(efl_super(obj, EFL_UI_CHECK_CLASS)); 112 states = efl_access_object_state_set_get(efl_super(obj, EFL_UI_CHECK_CLASS));
113 113
114 if (elm_check_state_get(obj)) 114 if (elm_check_state_get(obj))
115 STATE_TYPE_SET(states, EFL_ACCESS_STATE_CHECKED); 115 STATE_TYPE_SET(states, EFL_ACCESS_STATE_TYPE_CHECKED);
116 116
117 return states; 117 return states;
118} 118}
@@ -135,16 +135,15 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
135 return EINA_TRUE; 135 return EINA_TRUE;
136} 136}
137 137
138EOLIAN static Efl_Ui_Theme_Apply_Result 138EOLIAN static Eina_Error
139_efl_ui_check_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUSED) 139_efl_ui_check_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUSED)
140{ 140{
141 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 141 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
142 142
143 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); 143 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
144 144
145 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 145 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
146 146 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
147 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL;
148 147
149 if (elm_widget_is_legacy(obj)) 148 if (elm_widget_is_legacy(obj))
150 { 149 {
@@ -234,7 +233,7 @@ _on_check_off(void *data,
234 233
235 if (_elm_config->atspi_mode) 234 if (_elm_config->atspi_mode)
236 efl_access_state_changed_signal_emit(data, 235 efl_access_state_changed_signal_emit(data,
237 EFL_ACCESS_STATE_CHECKED, 236 EFL_ACCESS_STATE_TYPE_CHECKED,
238 efl_ui_nstate_value_get(obj)); 237 efl_ui_nstate_value_get(obj));
239} 238}
240 239
@@ -259,7 +258,7 @@ _on_check_on(void *data,
259 258
260 if (_elm_config->atspi_mode) 259 if (_elm_config->atspi_mode)
261 efl_access_state_changed_signal_emit(data, 260 efl_access_state_changed_signal_emit(data,
262 EFL_ACCESS_STATE_CHECKED, 261 EFL_ACCESS_STATE_TYPE_CHECKED,
263 efl_ui_nstate_value_get(obj)); 262 efl_ui_nstate_value_get(obj));
264} 263}
265 264
@@ -449,8 +448,9 @@ ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
449 ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX) 448 ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX)
450 449
451#include "efl_ui_check.eo.c" 450#include "efl_ui_check.eo.c"
451#include "efl_ui_check_eo.legacy.c"
452 452
453#include "efl_ui_check_legacy.eo.h" 453#include "efl_ui_check_legacy_eo.h"
454#include "efl_ui_check_legacy_part.eo.h" 454#include "efl_ui_check_legacy_part.eo.h"
455 455
456#define MY_CLASS_NAME_LEGACY "elm_check" 456#define MY_CLASS_NAME_LEGACY "elm_check"
@@ -492,13 +492,13 @@ _icon_signal_emit(Evas_Object *obj)
492/* FIXME: replicated from elm_layout just because check's icon spot 492/* FIXME: replicated from elm_layout just because check's icon spot
493 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we 493 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
494 * can changed the theme API */ 494 * can changed the theme API */
495EOLIAN static Efl_Ui_Theme_Apply_Result 495EOLIAN static Eina_Error
496_efl_ui_check_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED) 496_efl_ui_check_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED)
497{ 497{
498 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 498 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
499 499
500 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_LEGACY_CLASS)); 500 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_LEGACY_CLASS));
501 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 501 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
502 502
503 _icon_signal_emit(obj); 503 _icon_signal_emit(obj);
504 504
@@ -558,4 +558,4 @@ elm_check_add(Evas_Object *parent)
558 return elm_legacy_add(EFL_UI_CHECK_LEGACY_CLASS, parent); 558 return elm_legacy_add(EFL_UI_CHECK_LEGACY_CLASS, parent);
559} 559}
560 560
561#include "efl_ui_check_legacy.eo.c" 561#include "efl_ui_check_legacy_eo.c"