kill off some unused variables, return values on some widtype check fails

SVN revision: 49222
This commit is contained in:
Mike Blumenkrantz 2010-05-27 09:01:41 +00:00
parent 46762b882e
commit 2c44eda4e0
4 changed files with 24 additions and 12 deletions

View File

@ -364,7 +364,7 @@ _config_load(void)
static void static void
_env_get(void) _env_get(void)
{ {
char buf[PATH_MAX], *p, *s; char *s;
s = getenv("ELM_ENGINE"); s = getenv("ELM_ENGINE");
if (s) if (s)

View File

@ -399,7 +399,7 @@ elm_hover_target_get(Evas_Object *obj)
{ {
ELM_CHECK_WIDTYPE(obj, widtype) NULL; ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return; if (!wd) return NULL;
return wd->target; return wd->target;
} }
@ -417,7 +417,7 @@ elm_hover_parent_get(Evas_Object *obj)
{ {
ELM_CHECK_WIDTYPE(obj, widtype) NULL; ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return; if (!wd) return NULL;
return wd->parent; return wd->parent;
} }

View File

@ -825,7 +825,7 @@ elm_index_item_del(Evas_Object *obj, const void *item)
EAPI Elm_Index_Item * EAPI Elm_Index_Item *
elm_index_item_find(Evas_Object *obj, const void *item) elm_index_item_find(Evas_Object *obj, const void *item)
{ {
ELM_CHECK_WIDTYPE(obj, widtype); ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return NULL; if (!wd) return NULL;
return _item_find(obj, item); return _item_find(obj, item);

View File

@ -659,10 +659,10 @@ elm_toolbar_scrollable_set(Evas_Object *obj, Eina_Bool scrollable)
EAPI Eina_Bool EAPI Eina_Bool
elm_toolbar_scrollable_get(Evas_Object *obj) elm_toolbar_scrollable_get(Evas_Object *obj)
{ {
ELM_CHECK_WIDTYPE(obj, widtype); ELM_CHECK_WIDTYPE(obj, widtype) 0;
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return; if (!wd) return 0;
return wd->scrollable; return wd->scrollable;
} }
@ -696,10 +696,10 @@ elm_toolbar_homogenous_set(Evas_Object *obj, Eina_Bool homogenous)
EAPI Eina_Bool EAPI Eina_Bool
elm_toolbar_homogenous_get(Evas_Object *obj) elm_toolbar_homogenous_get(Evas_Object *obj)
{ {
ELM_CHECK_WIDTYPE(obj, widtype); ELM_CHECK_WIDTYPE(obj, widtype) 0;
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return; if (!wd) return 0;
return wd->homogeneous; return wd->homogeneous;
} }
@ -773,6 +773,21 @@ elm_toolbar_item_unselect_all(Evas_Object *obj)
} }
} }
/**
* Unselect the specified toolbar item.
*
* @param item The toolbar item
*
* @ingroup Toolbar
*/
EAPI void
elm_toolbar_item_unselect(Elm_Toolbar_Item *item)
{
if ((!item) || (!item->selected)) return;
item->selected = EINA_FALSE;
edje_object_signal_emit(item->base, "elm,state,unselected", "elm");
}
/** /**
* Set the alignment of the items. * Set the alignment of the items.
* *
@ -874,8 +889,6 @@ elm_toolbar_item_menu_get(Elm_Toolbar_Item *item)
EAPI Eina_List * EAPI Eina_List *
elm_toolbar_item_get_all(Evas_Object *obj) elm_toolbar_item_get_all(Evas_Object *obj)
{ {
Eina_List *l;
Elm_Toolbar_Item *it;
ELM_CHECK_WIDTYPE(obj, widtype) NULL; ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return NULL; if (!wd) return NULL;
@ -895,7 +908,6 @@ elm_toolbar_item_get_all(Evas_Object *obj)
EAPI Elm_Toolbar_Item * EAPI Elm_Toolbar_Item *
elm_toolbar_item_get_first(Evas_Object *obj) elm_toolbar_item_get_first(Evas_Object *obj)
{ {
Eina_List *l;
Elm_Toolbar_Item *it; Elm_Toolbar_Item *it;
ELM_CHECK_WIDTYPE(obj, widtype) NULL; ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
@ -917,7 +929,7 @@ elm_toolbar_item_get_first(Evas_Object *obj)
EAPI Elm_Toolbar_Item * EAPI Elm_Toolbar_Item *
elm_toolbar_item_get_last(Evas_Object *obj) elm_toolbar_item_get_last(Evas_Object *obj)
{ {
Eina_List *l, *last; Eina_List *last;
Elm_Toolbar_Item *it; Elm_Toolbar_Item *it;
ELM_CHECK_WIDTYPE(obj, widtype) NULL; ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);