summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Levin <avi.levin@samsung.com>2015-05-14 14:16:53 +0300
committerAvi Levin <avi.levin@samsung.com>2015-06-29 17:03:33 +0300
commitba5b14ac3c90221adc0e8519450f763bf3c0fccb (patch)
tree7f50ddc6c793ee9cf25cc460ba854a4618ff8d98
parente1905ec204e8b3726fe085925a05424a04ab2a3c (diff)
elm_calendar, elm_widget: porting evas smart callbacks to eo
-rw-r--r--src/lib/elm_calendar.c6
-rw-r--r--src/lib/elm_widget.c12
-rw-r--r--src/lib/elm_widget.eo4
3 files changed, 14 insertions, 8 deletions
diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c
index 18574a1b3..7fd24917a 100644
--- a/src/lib/elm_calendar.c
+++ b/src/lib/elm_calendar.c
@@ -681,9 +681,9 @@ _update_data(Evas_Object *obj, Eina_Bool month,
681 sd->selected_time.tm_mday = maxdays; 681 sd->selected_time.tm_mday = maxdays;
682 682
683 _fix_selected_time(sd); 683 _fix_selected_time(sd);
684 evas_object_smart_callback_call(obj, SIG_CHANGED, NULL); 684 eo_do(obj, eo_event_callback_call(ELM_CALENDAR_EVENT_CHANGED, NULL));
685 } 685 }
686 evas_object_smart_callback_call(obj, SIG_DISPLAY_CHANGED, NULL); 686 eo_do(obj, eo_event_callback_call(ELM_CALENDAR_EVENT_DISPLAY_CHANGED, NULL));
687 687
688 return EINA_TRUE; 688 return EINA_TRUE;
689} 689}
@@ -841,7 +841,7 @@ _update_sel_it(Evas_Object *obj,
841 sd->selected_time.tm_mday = day; 841 sd->selected_time.tm_mday = day;
842 _fix_selected_time(sd); 842 _fix_selected_time(sd);
843 _select(obj, sel_it); 843 _select(obj, sel_it);
844 evas_object_smart_callback_call(obj, SIG_CHANGED, NULL); 844 eo_do(obj, eo_event_callback_call(ELM_CALENDAR_EVENT_CHANGED, NULL));
845} 845}
846 846
847static void 847static void
diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index e105da434..f8da6fa7d 100644
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -875,7 +875,7 @@ elm_widget_access(Evas_Object *obj,
875 } 875 }
876 876
877 eo_do(obj, elm_obj_widget_access(is_access)); 877 eo_do(obj, elm_obj_widget_access(is_access));
878 evas_object_smart_callback_call(obj, SIG_WIDGET_ACCESS_CHANGED, NULL); 878 eo_do(obj, eo_event_callback_call(ELM_WIDGET_EVENT_ACCESS_CHANGED, NULL));
879 879
880 return ret; 880 return ret;
881} 881}
@@ -3462,7 +3462,7 @@ _elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSE
3462 sd->on_translate = EINA_FALSE; 3462 sd->on_translate = EINA_FALSE;
3463 } 3463 }
3464#endif 3464#endif
3465 evas_object_smart_callback_call(obj, SIG_WIDGET_LANG_CHANGED, NULL); 3465 eo_do(obj, eo_event_callback_call(ELM_WIDGET_EVENT_LANGUAGE_CHANGED, NULL));
3466 return EINA_TRUE; 3466 return EINA_TRUE;
3467} 3467}
3468 3468
@@ -5547,7 +5547,8 @@ _elm_widget_on_focus(Eo *obj, Elm_Widget_Smart_Data *sd)
5547 { 5547 {
5548 if (!sd->resize_obj) 5548 if (!sd->resize_obj)
5549 evas_object_focus_set(obj, EINA_TRUE); 5549 evas_object_focus_set(obj, EINA_TRUE);
5550 evas_object_smart_callback_call(obj, SIG_WIDGET_FOCUSED, NULL); 5550 eo_do(obj, eo_event_callback_call
5551 (ELM_WIDGET_EVENT_FOCUSED, NULL));
5551 if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj)) 5552 if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj))
5552 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE); 5553 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
5553 } 5554 }
@@ -5555,10 +5556,11 @@ _elm_widget_on_focus(Eo *obj, Elm_Widget_Smart_Data *sd)
5555 { 5556 {
5556 if (!sd->resize_obj) 5557 if (!sd->resize_obj)
5557 evas_object_focus_set(obj, EINA_FALSE); 5558 evas_object_focus_set(obj, EINA_FALSE);
5558 evas_object_smart_callback_call(obj, SIG_WIDGET_UNFOCUSED, NULL); 5559 eo_do(obj, eo_event_callback_call
5560 (ELM_WIDGET_EVENT_UNFOCUSED, NULL));
5559 if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj)) 5561 if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj))
5560 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE); 5562 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
5561 } 5563 }
5562 } 5564 }
5563 else 5565 else
5564 return EINA_FALSE; 5566 return EINA_FALSE;
diff --git a/src/lib/elm_widget.eo b/src/lib/elm_widget.eo
index e45bd5f49..090cc790c 100644
--- a/src/lib/elm_widget.eo
+++ b/src/lib/elm_widget.eo
@@ -840,5 +840,9 @@ abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Inte
840 } 840 }
841 events { 841 events {
842 moved; 842 moved;
843 focused;
844 unfocused;
845 language,changed;
846 access,changed;
843 } 847 }
844} 848}