summaryrefslogtreecommitdiff
path: root/src/lib/elementary/efl_ui_radio.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/elementary/efl_ui_radio.c')
-rw-r--r--src/lib/elementary/efl_ui_radio.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/src/lib/elementary/efl_ui_radio.c b/src/lib/elementary/efl_ui_radio.c
index 009ca71..565a80e 100644
--- a/src/lib/elementary/efl_ui_radio.c
+++ b/src/lib/elementary/efl_ui_radio.c
@@ -88,7 +88,7 @@ _state_set(Evas_Object *obj, Eina_Bool state, Eina_Bool activate)
88 { 88 {
89 if (sd->state) 89 if (sd->state)
90 { 90 {
91 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_CHECKED, EINA_TRUE); 91 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_TYPE_CHECKED, EINA_TRUE);
92 } 92 }
93 } 93 }
94 } 94 }
@@ -147,13 +147,13 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
147 return EINA_TRUE; 147 return EINA_TRUE;
148} 148}
149 149
150EOLIAN static Efl_Ui_Theme_Apply_Result 150EOLIAN static Eina_Error
151_efl_ui_radio_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Radio_Data *sd) 151_efl_ui_radio_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Radio_Data *sd)
152{ 152{
153 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); 153 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
154 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 154 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
155 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_CLASS)); 155 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_CLASS));
156 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 156 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
157 157
158 if (elm_widget_is_legacy(obj)) 158 if (elm_widget_is_legacy(obj))
159 { 159 {
@@ -359,7 +359,7 @@ _efl_ui_radio_efl_access_object_state_set_get(const Eo *obj, Efl_Ui_Radio_Data *
359 359
360 ret = efl_access_object_state_set_get(efl_super(obj, EFL_UI_RADIO_CLASS)); 360 ret = efl_access_object_state_set_get(efl_super(obj, EFL_UI_RADIO_CLASS));
361 if (obj == elm_radio_selected_object_get(obj)) 361 if (obj == elm_radio_selected_object_get(obj))
362 STATE_TYPE_SET(ret, EFL_ACCESS_STATE_CHECKED); 362 STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_CHECKED);
363 363
364 return ret; 364 return ret;
365} 365}
@@ -373,8 +373,9 @@ ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
373 ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX) 373 ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX)
374 374
375#include "efl_ui_radio.eo.c" 375#include "efl_ui_radio.eo.c"
376#include "efl_ui_radio_eo.legacy.c"
376 377
377#include "efl_ui_radio_legacy.eo.h" 378#include "efl_ui_radio_legacy_eo.h"
378#include "efl_ui_radio_legacy_part.eo.h" 379#include "efl_ui_radio_legacy_part.eo.h"
379 380
380#define MY_CLASS_NAME_LEGACY "elm_radio" 381#define MY_CLASS_NAME_LEGACY "elm_radio"
@@ -414,12 +415,12 @@ _icon_signal_emit(Evas_Object *obj)
414 elm_layout_sizing_eval(obj); 415 elm_layout_sizing_eval(obj);
415} 416}
416 417
417EOLIAN static Efl_Ui_Theme_Apply_Result 418EOLIAN static Eina_Error
418_efl_ui_radio_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED) 419_efl_ui_radio_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED)
419{ 420{
420 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 421 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
421 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_RADIO_LEGACY_CLASS)); 422 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_RADIO_LEGACY_CLASS));
422 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 423 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
423 424
424 /* FIXME: replicated from elm_layout just because radio's icon 425 /* FIXME: replicated from elm_layout just because radio's icon
425 * spot is elm.swallow.content, not elm.swallow.icon. Fix that 426 * spot is elm.swallow.content, not elm.swallow.icon. Fix that
@@ -494,4 +495,4 @@ elm_radio_value_get(const Evas_Object *obj)
494 return efl_ui_nstate_value_get(obj); 495 return efl_ui_nstate_value_get(obj);
495} 496}
496 497
497#include "efl_ui_radio_legacy.eo.c" 498#include "efl_ui_radio_legacy_eo.c"