[src/lib/elm_button.c, src/lib/elm_icon.c] Code cleanup for elm_button and modificati...

diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index 4573a6c..ca86492 100644 (file)
--- a/src/lib/elm_button.c
+++ b/src/lib/elm_button.c
@@ -81,7 +81,7 @@ _on_focus_hook(void *data __UNUSED__, Evas_Object *obj)
             _set_label(obj, wd->statelabel[FOCUSED]);
          }
        edje_object_signal_emit(wd->btn, "elm,action,focus", "elm");
-       evas_object_focus_set(wd->btn, 1);
+       evas_object_focus_set(wd->btn, EINA_TRUE);
      }
    else
      {
@@ -92,7 +92,7 @@ _on_focus_hook(void *data __UNUSED__, Evas_Object *obj)
          _set_label(obj, wd->label);
 #endif
        edje_object_signal_emit(wd->btn, "elm,action,unfocus", "elm");
-       evas_object_focus_set(wd->btn, 0);
+       evas_object_focus_set(wd->btn, EINA_FALSE);
      }
 }
 
@@ -321,7 +321,7 @@ elm_button_add(Evas_Object *parent)
    elm_widget_del_hook_set(obj, _del_hook);
    elm_widget_theme_hook_set(obj, _theme_hook);
    elm_widget_disable_hook_set(obj, _disable_hook);
-   elm_widget_can_focus_set(obj, 1 );
+   elm_widget_can_focus_set(obj, EINA_TRUE);
 
    wd->btn = edje_object_add(e);
    _elm_theme_object_set(obj, wd->btn, "button", "base", "default");

diff --git a/src/lib/elm_icon.c b/src/lib/elm_icon.c
index 5dc0d18..d88b30a 100644 (file)
--- a/src/lib/elm_icon.c
+++ b/src/lib/elm_icon.c
@@ -116,11 +116,11 @@ elm_icon_add(Evas_Object *parent)
    obj = elm_widget_add(e);
    ELM_SET_WIDTYPE(widtype, "icon");
    elm_widget_type_set(obj, "icon");
+   elm_widget_can_focus_set(obj, EINA_FALSE);
    elm_widget_sub_object_add(parent, obj);
    elm_widget_data_set(obj, wd);
    elm_widget_del_hook_set(obj, _del_hook);
    elm_widget_theme_hook_set(obj, _theme_hook);
-   elm_widget_can_focus_set(obj, 0);
 
    wd->img = _els_smart_icon_add(e);
    evas_object_event_callback_add(wd->img, EVAS_CALLBACK_MOUSE_UP,