Fix conflicts: Map, Hover, Hoversel, Menu, Web
[framework/uifw/elementary.git] / src / lib / elm_menu.c
index 06606ab..e46d65c 100644 (file)
@@ -1,25 +1,18 @@
 #include <Elementary.h>
 #include "elm_priv.h"
 
-/**
- * @defgroup Menu Menu
- *
- * A menu is a list of items displayed above the window. Each item can
- * have a sub-menu. The menu object can be used to display a menu on right
- * click, in a toolbar, anywhere.
- *
- */
-
 typedef struct _Widget_Data Widget_Data;
+typedef struct _Elm_Menu_Item Elm_Menu_Item;
 
 struct _Elm_Menu_Item
 {
-   Elm_Widget_Item base;
+   ELM_WIDGET_ITEM;
    Elm_Menu_Item *parent;
-   Evas_Object *icon;
+   Evas_Object *content;
    const char *icon_str;
    const char *label;
    Evas_Smart_Cb func;
+   unsigned int idx;
 
    struct {
       Evas_Object *hv, *bx, *location;
@@ -28,7 +21,8 @@ struct _Elm_Menu_Item
    } submenu;
 
    Eina_Bool separator : 1;
-   Eina_Bool disabled : 1;
+   Eina_Bool selected : 1;
+   Eina_Bool object_item : 1;
 };
 
 struct _Widget_Data
@@ -41,6 +35,7 @@ struct _Widget_Data
 static const char *widtype = NULL;
 static void _del_hook(Evas_Object *obj);
 static void _theme_hook(Evas_Object *obj);
+static void _item_disable_hook(Elm_Object_Item *it);
 static void _sizing_eval(Evas_Object *obj);
 static void _submenu_sizing_eval(Elm_Menu_Item *parent);
 static void _item_sizing_eval(Elm_Menu_Item *item);
@@ -50,13 +45,19 @@ static void _parent_resize(void *data, Evas *e, Evas_Object *obj, void *event_in
 static void _parent_del(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _menu_hide(void *data, Evas_Object *obj, void *event_info);
 
+static const char SIG_CLICKED[] = "clicked";
+
+static const Evas_Smart_Cb_Description _signals[] = {
+   {SIG_CLICKED, ""},
+   {NULL, NULL}
+};
+
+
 static void
 _del_item(Elm_Menu_Item *item)
 {
    Elm_Menu_Item *child;
 
-   elm_widget_item_pre_notify_del(item);
-
    EINA_LIST_FREE(item->submenu.items, child)
      _del_item(child);
 
@@ -64,7 +65,7 @@ _del_item(Elm_Menu_Item *item)
    if (item->submenu.hv) evas_object_del(item->submenu.hv);
    if (item->submenu.location) evas_object_del(item->submenu.location);
    if (item->icon_str) eina_stringshare_del(item->icon_str);
-   elm_widget_item_del(item);
+   elm_widget_item_free(item);
 }
 
 static void
@@ -98,45 +99,122 @@ _theme_hook(Evas_Object *obj)
    Elm_Menu_Item *item;
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
+   _elm_widget_mirrored_reload(obj);
    ll = eina_list_append(ll, wd->items);
    EINA_LIST_FOREACH(ll, _ll, l)
      {
-       EINA_LIST_FOREACH(l, _l, item)
-         {
-            ll = eina_list_append(ll, item->submenu.items);
-            if (item->separator)
-              _elm_theme_object_set(obj, item->base.view, "menu", "separator",
+        EINA_LIST_FOREACH(l, _l, item)
+          {
+             edje_object_mirrored_set(VIEW(item), elm_widget_mirrored_get(obj));
+             ll = eina_list_append(ll, item->submenu.items);
+             if (item->separator)
+               _elm_theme_object_set(obj, VIEW(item), "menu", "separator",
                                      elm_widget_style_get(obj));
-            else if (item->submenu.bx)
-              {
-                 _elm_theme_object_set
-                    (obj, item->base.view, "menu", "item_with_submenu",
-                     elm_widget_style_get(obj));
-                 elm_menu_item_label_set(item, item->label);
-                 elm_menu_item_icon_set(item, item->icon_str);
-              }
-            else
-              {
-                 _elm_theme_object_set(obj, item->base.view, "menu", "item",
+             else if (item->submenu.bx)
+               {
+                  _elm_theme_object_set
+                     (obj, VIEW(item), "menu", "item_with_submenu",
+                      elm_widget_style_get(obj));
+                  elm_object_item_text_set((Elm_Object_Item *)item,
+                                           item->label);
+                  elm_menu_item_icon_name_set((Elm_Object_Item *)item,
+                                                     item->icon_str);
+               }
+             else
+               {
+                  _elm_theme_object_set(obj, VIEW(item), "menu", "item",
                                         elm_widget_style_get(obj));
-                 elm_menu_item_label_set(item, item->label);
-                 elm_menu_item_icon_set(item, item->icon_str);
-              }
-            if (item->disabled)
-              edje_object_signal_emit
-                 (item->base.view, "elm,state,disabled", "elm");
-            else
-              edje_object_signal_emit
-                 (item->base.view, "elm,state,enabled", "elm");
-            edje_object_message_signal_process(item->base.view);
-            edje_object_scale_set(item->base.view, elm_widget_scale_get(obj) *
+                  elm_object_item_text_set((Elm_Object_Item *)item,
+                                           item->label);
+                  elm_menu_item_icon_name_set((Elm_Object_Item *)item,
+                                                     item->icon_str);
+               }
+             _item_disable_hook((Elm_Object_Item *)item);
+             edje_object_scale_set(VIEW(item), elm_widget_scale_get(obj) *
                                    _elm_config->scale);
-         }
+          }
      }
    _sizing_eval(obj);
 }
 
 static void
+_item_text_set_hook(Elm_Object_Item *it,
+                    const char *part,
+                    const char *label)
+{
+   Elm_Menu_Item *item;
+
+   if (part && strcmp(part, "default")) return;
+
+   item = (Elm_Menu_Item *)it;
+
+   eina_stringshare_replace(&item->label, label);
+
+   if (label)
+     edje_object_signal_emit(VIEW(item), "elm,state,text,visible", "elm");
+   else
+     edje_object_signal_emit(VIEW(item), "elm,state,text,hidden", "elm");
+
+   edje_object_message_signal_process(VIEW(item));
+   edje_object_part_text_set(VIEW(item), "elm.text", label);
+   _sizing_eval(WIDGET(item));
+}
+
+static const char *
+_item_text_get_hook(const Elm_Object_Item *it, const char *part)
+{
+   if (part && strcmp(part, "default")) return NULL;
+   return ((Elm_Menu_Item *)it)->label;
+}
+
+static void
+_item_content_set_hook(Elm_Object_Item *it,
+                       const char *part,
+                       Evas_Object *content)
+{
+   Elm_Menu_Item *item;
+
+   if (part && strcmp(part, "default")) return;
+
+   item = (Elm_Menu_Item *)it;
+
+   if (item->content)
+     {
+        elm_widget_sub_object_del(WIDGET(item), item->content);
+        evas_object_del(item->content);
+     }
+
+   item->content = content;
+
+   elm_widget_sub_object_add(WIDGET(item), item->content);
+   edje_object_part_swallow(VIEW(item), "elm.swallow.content", item->content);
+   _sizing_eval(WIDGET(item));
+}
+
+static Evas_Object *
+_item_content_get_hook(const Elm_Object_Item *it, const char *part)
+{
+   if (part && strcmp(part, "default")) return NULL;
+   return ((Elm_Menu_Item *)it)->content;
+}
+
+static void
+_item_disable_hook(Elm_Object_Item *it)
+{
+   Elm_Menu_Item *item = (Elm_Menu_Item *)it;
+
+   if (elm_widget_item_disabled_get(item))
+     {
+        edje_object_signal_emit(VIEW(item), "elm,state,disabled", "elm");
+        if (item->submenu.open) _submenu_hide(item);
+     }
+   else
+     edje_object_signal_emit(VIEW(item), "elm,state,enabled", "elm");
+
+   edje_object_message_signal_process(VIEW(item));
+}
+
+static void
 _sizing_eval(Evas_Object *obj)
 {
    Eina_List *l;
@@ -152,12 +230,16 @@ _sizing_eval(Evas_Object *obj)
    x_p = wd->xloc;
    y_p = wd->yloc;
 
+   if (elm_widget_mirrored_get(obj))
+     x_p -= w_p;
+
    if (x_p+bw > x2+w2) x_p -= x_p+bw - (x2+w2);
    if (x_p < x2) x_p += x2 - x_p;
 
    if (y_p+h_p+bh > y2+h2) y_p -= y_p+h_p+bh - (y2+h2);
    if (y_p < y2) y_p += y2 - y_p;
 
+
    evas_object_move(wd->location, x_p, y_p);
    evas_object_resize(wd->location, bw, h_p);
    evas_object_size_hint_min_set(wd->location, bw, h_p);
@@ -166,7 +248,7 @@ _sizing_eval(Evas_Object *obj)
 
    EINA_LIST_FOREACH(wd->items,l,item)
      {
-       if (item->submenu.open) _submenu_sizing_eval(item);
+        if (item->submenu.open) _submenu_sizing_eval(item);
      }
 }
 
@@ -176,17 +258,27 @@ _submenu_sizing_eval(Elm_Menu_Item *parent)
    Eina_List *l;
    Elm_Menu_Item *item;
    Evas_Coord x_p, y_p, w_p, h_p, x2, y2, w2, h2, bx, by, bw, bh, px, py, pw, ph;
-   Widget_Data *wd = elm_widget_data_get(parent->base.widget);
+   Widget_Data *wd = elm_widget_data_get(WIDGET(parent));
    if (!wd) return;
    EINA_LIST_FOREACH(parent->submenu.items, l, item) _item_sizing_eval(item);
    evas_object_geometry_get(parent->submenu.location, &x_p, &y_p, &w_p, &h_p);
-   evas_object_geometry_get(parent->base.view, &x2, &y2, &w2, &h2);
+   evas_object_geometry_get(VIEW(parent), &x2, &y2, &w2, &h2);
    evas_object_geometry_get(parent->submenu.bx, &bx, &by, &bw, &bh);
    evas_object_geometry_get(wd->parent, &px, &py, &pw, &ph);
 
    x_p = x2+w2;
    y_p = y2;
 
+   /* If it overflows on the right, adjust the x */
+   if ((x_p + bw > px + pw) || elm_widget_mirrored_get(WIDGET(parent)))
+     x_p = x2-bw;
+
+   /* If it overflows on the left, adjust the x - usually only happens
+    * with an RTL interface */
+   if (x_p < px)
+     x_p = x2 + w2;
+
+   /* If after all the adjustments it still overflows, fix it */
    if (x_p + bw > px + pw)
      x_p = x2-bw;
 
@@ -203,8 +295,8 @@ _submenu_sizing_eval(Elm_Menu_Item *parent)
 
    EINA_LIST_FOREACH(parent->submenu.items, l, item)
      {
-       if (item->submenu.open)
-         _submenu_sizing_eval(item);
+        if (item->submenu.open)
+          _submenu_sizing_eval(item);
      }
 }
 
@@ -214,11 +306,11 @@ _item_sizing_eval(Elm_Menu_Item *item)
    Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1;
    if (!item->separator)
      elm_coords_finger_size_adjust(1, &minw, 1, &minh);
-   edje_object_size_min_restricted_calc(item->base.view, &minw, &minh, minw, minh);
+   edje_object_size_min_restricted_calc(VIEW(item), &minw, &minh, minw, minh);
    if (!item->separator)
      elm_coords_finger_size_adjust(1, &minw, 1, &minh);
-   evas_object_size_hint_min_set(item->base.view, minw, minh);
-   evas_object_size_hint_max_set(item->base.view, maxw, maxh);
+   evas_object_size_hint_min_set(VIEW(item), minw, minh);
+   evas_object_size_hint_max_set(VIEW(item), maxw, maxh);
 }
 
 static void
@@ -252,7 +344,7 @@ static void
 _hover_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
    _menu_hide(data, obj, event_info);
-   evas_object_smart_callback_call(data, "clicked", NULL);
+   evas_object_smart_callback_call(data, SIG_CLICKED, NULL);
 }
 
 static void
@@ -267,7 +359,7 @@ _menu_hide(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 
    EINA_LIST_FOREACH(wd->items, l, item2)
      {
-       if (item2->submenu.open) _submenu_hide(item2);
+        if (item2->submenu.open) _submenu_hide(item2);
      }
 }
 
@@ -280,7 +372,7 @@ _submenu_hide(Elm_Menu_Item *item)
    item->submenu.open = EINA_FALSE;
    EINA_LIST_FOREACH(item->submenu.items, l, item2)
      {
-       if (item2->submenu.open) _submenu_hide(item2);
+        if (item2->submenu.open) _submenu_hide(item2);
      }
 }
 
@@ -290,13 +382,13 @@ _menu_item_select(void *data, Evas_Object *obj __UNUSED__, const char *emission
    Elm_Menu_Item *item = data;
    if (item->submenu.items)
      {
-       if (!item->submenu.open) _submenu_open(item, NULL, NULL, NULL);
-       else _submenu_hide(item);
+        if (!item->submenu.open) _submenu_open(item, NULL, NULL, NULL);
+        else _submenu_hide(item);
      }
    else
-     _menu_hide(item->base.widget, NULL, NULL);
+     _menu_hide(WIDGET(item), NULL, NULL);
 
-   if (item->func) item->func((void *)(item->base.data), item->base.widget, item);
+   if (item->func) item->func((void *)(item->base.data), WIDGET(item), item);
 }
 
 static void
@@ -305,30 +397,41 @@ _menu_item_activate(void *data, Evas_Object *obj __UNUSED__, const char *emissio
    Eina_List *l;
    Elm_Menu_Item *item2;
    Elm_Menu_Item *item = data;
+   item->selected = 1;
    if (item->parent)
      {
-       EINA_LIST_FOREACH(item->parent->submenu.items, l, item2)
-         {
-            if ((item2->submenu.open) && (item2 != item)) _submenu_hide(item2);
-         }
+        EINA_LIST_FOREACH(item->parent->submenu.items, l, item2)
+          {
+             if (item2 != item)
+               elm_menu_item_selected_set((Elm_Object_Item *)item2, 0);
+          }
      }
    else
      {
-       Widget_Data *wd = elm_widget_data_get(item->base.widget);
-       EINA_LIST_FOREACH(wd->items, l, item2)
-         {
-            if ((item2->submenu.open) && (item2 != item)) _submenu_hide(item2);
-         }
+        Widget_Data *wd = elm_widget_data_get(WIDGET(item));
+        EINA_LIST_FOREACH(wd->items, l, item2)
+          {
+             if (item2 != item)
+               elm_menu_item_selected_set((Elm_Object_Item *)item2, 0);
+          }
      }
 }
 
 static void
+_menu_item_inactivate(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+{
+   Elm_Menu_Item *item = data;
+   item->selected = 0;
+   if (item->submenu.open) _submenu_hide(item);
+}
+
+static void
 _submenu_open(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
 {
    Elm_Menu_Item *item = data;
    item->submenu.open = EINA_TRUE;
    evas_object_show(item->submenu.hv);
-   _sizing_eval(item->base.widget);
+   _submenu_sizing_eval(item);
 }
 
 static void
@@ -342,69 +445,69 @@ _show(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
 static void
 _item_obj_create(Elm_Menu_Item *item)
 {
-   Widget_Data *wd = elm_widget_data_get(item->base.widget);
+   Widget_Data *wd = elm_widget_data_get(WIDGET(item));
    if (!wd) return;
-   item->base.view = edje_object_add(evas_object_evas_get(wd->bx));
-   evas_object_size_hint_weight_set(item->base.view, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   evas_object_size_hint_fill_set(item->base.view, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   _elm_theme_object_set(item->base.widget, item->base.view, "menu", "item",  elm_widget_style_get(item->base.widget));
-   edje_object_signal_callback_add(item->base.view, "elm,action,click", "",
+   VIEW(item) = edje_object_add(evas_object_evas_get(wd->bx));
+   edje_object_mirrored_set(VIEW(item), elm_widget_mirrored_get(WIDGET(item)));
+   evas_object_size_hint_weight_set(VIEW(item), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_fill_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL);
+   _elm_theme_object_set(WIDGET(item), VIEW(item), "menu", "item",  elm_widget_style_get(WIDGET(item)));
+   edje_object_signal_callback_add(VIEW(item), "elm,action,click", "",
                                    _menu_item_select, item);
-   edje_object_signal_callback_add(item->base.view, "elm,action,activate", "",
+   edje_object_signal_callback_add(VIEW(item), "elm,action,activate", "",
                                    _menu_item_activate, item);
-   evas_object_show(item->base.view);
+   edje_object_signal_callback_add(VIEW(item), "elm,action,inactivate", "",
+                                   _menu_item_inactivate, item);
+   evas_object_show(VIEW(item));
 }
 
 static void
 _item_separator_obj_create(Elm_Menu_Item *item)
 {
-   Widget_Data *wd = elm_widget_data_get(item->base.widget);
+   Widget_Data *wd = elm_widget_data_get(WIDGET(item));
    if (!wd) return;
-   item->base.view = edje_object_add(evas_object_evas_get(wd->bx));
-   evas_object_size_hint_weight_set(item->base.view, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   evas_object_size_hint_fill_set(item->base.view, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   _elm_theme_object_set(item->base.widget, item->base.view, "menu", "separator",  elm_widget_style_get(item->base.widget));
-   edje_object_signal_callback_add(item->base.view, "elm,action,activate", "",
+   VIEW(item) = edje_object_add(evas_object_evas_get(wd->bx));
+   evas_object_size_hint_weight_set(VIEW(item), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_fill_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL);
+   _elm_theme_object_set(WIDGET(item), VIEW(item), "menu", "separator",  elm_widget_style_get(WIDGET(item)));
+   edje_object_signal_callback_add(VIEW(item), "elm,action,activate", "",
                                    _menu_item_activate, item);
-   evas_object_show(item->base.view);
+   evas_object_show(VIEW(item));
 }
 
 static void
 _item_submenu_obj_create(Elm_Menu_Item *item)
 {
-   Widget_Data *wd = elm_widget_data_get(item->base.widget);
+   Widget_Data *wd = elm_widget_data_get(WIDGET(item));
    if (!wd) return;
    item->submenu.location = elm_icon_add(wd->bx);
    item->submenu.hv = elm_hover_add(wd->bx);
+   elm_widget_mirrored_set(item->submenu.hv, EINA_FALSE);
    elm_hover_target_set(item->submenu.hv, item->submenu.location);
    elm_hover_parent_set(item->submenu.hv, wd->parent);
    elm_object_style_set(item->submenu.hv, "submenu");
 
    item->submenu.bx = elm_box_add(wd->bx);
+   elm_widget_mirrored_set(item->submenu.bx, EINA_FALSE);
    evas_object_size_hint_weight_set(item->submenu.bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_show(item->submenu.bx);
-   elm_hover_content_set(item->submenu.hv, elm_hover_best_content_location_get(item->submenu.hv, ELM_HOVER_AXIS_VERTICAL), item->submenu.bx);
-
-   _elm_theme_object_set(item->base.widget, item->base.view, "menu", "item_with_submenu",  elm_widget_style_get(item->base.widget));
-   elm_menu_item_label_set(item, item->label);
-   elm_menu_item_icon_set(item, item->icon_str);
-
-   edje_object_signal_callback_add(item->base.view, "elm,action,open", "",
+   elm_object_part_content_set(item->submenu.hv, elm_hover_best_content_location_get(item->submenu.hv, ELM_HOVER_AXIS_VERTICAL), item->submenu.bx);
+
+   edje_object_mirrored_set(VIEW(item), elm_widget_mirrored_get(WIDGET(item)));
+   _elm_theme_object_set(WIDGET(item), VIEW(item), "menu", "item_with_submenu",  elm_widget_style_get(WIDGET(item)));
+   elm_object_item_text_set((Elm_Object_Item *)item,
+                            item->label);
+   if (item->icon_str)
+     elm_menu_item_icon_name_set((Elm_Object_Item *)item,
+                                        item->icon_str);
+   edje_object_signal_callback_add(VIEW(item), "elm,action,open", "",
                                    _submenu_open, item);
-   evas_object_event_callback_add(item->base.view, EVAS_CALLBACK_MOVE, _item_move_resize, item);
-   evas_object_event_callback_add(item->base.view, EVAS_CALLBACK_RESIZE, _item_move_resize, item);
+   evas_object_event_callback_add(VIEW(item), EVAS_CALLBACK_MOVE, _item_move_resize, item);
+   evas_object_event_callback_add(VIEW(item), EVAS_CALLBACK_RESIZE, _item_move_resize, item);
 
-   evas_object_event_callback_add(item->submenu.bx, EVAS_CALLBACK_RESIZE, _menu_resize, item->base.widget);
+   evas_object_event_callback_add(item->submenu.bx, EVAS_CALLBACK_RESIZE, _menu_resize, WIDGET(item));
 }
 
-/**
- * Add a new menu to the parent
- *
- * @param parent The parent object.
- * @return The new object or NULL if it cannot be created.
- *
- * @ingroup Menu
- */
 EAPI Evas_Object *
 elm_menu_add(Evas_Object *parent)
 {
@@ -412,12 +515,8 @@ elm_menu_add(Evas_Object *parent)
    Evas *e;
    Widget_Data *wd;
 
-   EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
+   ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL);
 
-   wd = ELM_NEW(Widget_Data);
-   e = evas_object_evas_get(parent);
-   if (!e) return NULL;
-   obj = elm_widget_add(e);
    ELM_SET_WIDTYPE(widtype, "menu");
    elm_widget_type_set(obj, "menu");
    elm_widget_sub_object_add(parent, obj);
@@ -432,15 +531,17 @@ elm_menu_add(Evas_Object *parent)
    wd->obj = obj;
 
    wd->hv = elm_hover_add(obj);
+   elm_widget_mirrored_set(wd->hv, EINA_FALSE);
    elm_hover_parent_set(wd->hv, parent);
    elm_hover_target_set(wd->hv, wd->location);
    elm_object_style_set(wd->hv, "menu");
    evas_object_smart_callback_add(wd->hv, "clicked", _hover_clicked_cb, obj);
 
    wd->bx = elm_box_add(obj);
+   elm_widget_mirrored_set(wd->bx, EINA_FALSE);
    evas_object_size_hint_weight_set(wd->bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_show(wd->bx);
-   elm_hover_content_set(wd->hv, elm_hover_best_content_location_get(wd->hv, ELM_HOVER_AXIS_VERTICAL), wd->bx);
+   elm_object_part_content_set(wd->hv, elm_hover_best_content_location_get(wd->hv, ELM_HOVER_AXIS_VERTICAL), wd->bx);
 
    evas_object_event_callback_add(wd->parent, EVAS_CALLBACK_RESIZE, _parent_resize, wd->obj);
    evas_object_event_callback_add(wd->parent, EVAS_CALLBACK_DEL, _parent_del, wd);
@@ -449,18 +550,12 @@ elm_menu_add(Evas_Object *parent)
 
    evas_object_event_callback_add(wd->bx, EVAS_CALLBACK_RESIZE, _menu_resize, obj);
 
+   evas_object_smart_callbacks_descriptions_set(obj, _signals);
+
    _sizing_eval(obj);
    return obj;
 }
 
-/**
- * Set the parent
- *
- * @param obj The menu object.
- * @param parent The new parent.
- *
- * @ingroup Menu
- */
 EAPI void
 elm_menu_parent_set(Evas_Object *obj, Evas_Object *parent)
 {
@@ -473,40 +568,32 @@ elm_menu_parent_set(Evas_Object *obj, Evas_Object *parent)
    if (wd->parent == parent) return;
    if (wd->parent)
      {
-       evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_RESIZE, _parent_resize, wd->obj);
-       evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_DEL, _parent_del, wd);
+        evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_RESIZE, _parent_resize, wd->obj);
+        evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_DEL, _parent_del, wd);
      }
    wd->parent = parent;
    if (wd->parent)
      {
-       evas_object_event_callback_add(wd->parent, EVAS_CALLBACK_RESIZE, _parent_resize, wd->obj);
-       evas_object_event_callback_add(wd->parent, EVAS_CALLBACK_DEL, _parent_del, wd);
+        evas_object_event_callback_add(wd->parent, EVAS_CALLBACK_RESIZE, _parent_resize, wd->obj);
+        evas_object_event_callback_add(wd->parent, EVAS_CALLBACK_DEL, _parent_del, wd);
      }
    elm_hover_parent_set(wd->hv, parent);
 
    ll = eina_list_append(ll, wd->items);
    EINA_LIST_FOREACH(ll, _ll, l)
      {
-       EINA_LIST_FOREACH(l, _l, item)
-         {
-            if (item->submenu.hv)
-              {
-                 elm_hover_parent_set(item->submenu.hv, parent);
-                 ll = eina_list_append(ll, item->submenu.items);
-              }
-         }
+        EINA_LIST_FOREACH(l, _l, item)
+          {
+             if (item->submenu.hv)
+               {
+                  elm_hover_parent_set(item->submenu.hv, parent);
+                  ll = eina_list_append(ll, item->submenu.items);
+               }
+          }
      }
    _sizing_eval(obj);
 }
 
-/**
- * Get the parent
- *
- * @param obj The menu object.
- * @return The parent.
- *
- * @ingroup Menu
- */
 EAPI Evas_Object *
 elm_menu_parent_get(const Evas_Object *obj)
 {
@@ -516,15 +603,6 @@ elm_menu_parent_get(const Evas_Object *obj)
    return wd->parent;
 }
 
-/**
- * Move the menu to a new position
- *
- * @param obj The menu object.
- * @param x The new position.
- * @param y The new position.
- *
- * @ingroup Menu
- */
 EAPI void
 elm_menu_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
 {
@@ -536,38 +614,45 @@ elm_menu_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
    _sizing_eval(obj);
 }
 
-/**
- * Get the Evas_Object of an Elm_Menu_Item
- *
- * @param item The menu item object.
- *
- * @ingroup Menu
- */
+EAPI void
+elm_menu_close(Evas_Object *obj)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   _menu_hide(obj, wd->hv, NULL);
+}
+
 EAPI Evas_Object *
-elm_menu_object_get(const Elm_Menu_Item *item)
+elm_menu_item_object_get(const Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
-   return item->base.view;
+   return VIEW(((Elm_Menu_Item *)it));
 }
 
 static void
 _item_clone(Evas_Object *obj, Elm_Menu_Item *parent, Elm_Menu_Item *item)
 {
-   Elm_Menu_Item *new_item, *subitem;
+   Elm_Object_Item *new_item;
+   Elm_Menu_Item *subitem;
    Eina_List *iter;
 
    if (item->separator)
-      new_item = elm_menu_item_separator_add(obj, parent);
+     new_item = elm_menu_item_separator_add(obj, (Elm_Object_Item *) parent);
    else
-      new_item = elm_menu_item_add(obj, parent, item->icon_str, item->label, item->func, item->base.data);
-   elm_menu_item_disabled_set(new_item, item->disabled);
+     new_item = elm_menu_item_add(obj,
+                                  (Elm_Object_Item *) parent,
+                                  item->icon_str,
+                                  item->label,
+                                  item->func,
+                                  item->base.data);
+   elm_object_item_disabled_set(new_item,
+                                elm_widget_item_disabled_get(item));
 
    EINA_LIST_FOREACH(item->submenu.items, iter, subitem)
-      _item_clone(obj, new_item, subitem);
+     _item_clone(obj, (Elm_Menu_Item *) new_item, subitem);
 }
 
 void
-elm_menu_clone(Evas_Object *from_menu, Evas_Object *to_menu, Elm_Menu_Item *parent)
+elm_menu_clone(Evas_Object *from_menu, Evas_Object *to_menu, Elm_Object_Item *parent)
 {
    ELM_CHECK_WIDTYPE(from_menu, widtype);
    ELM_CHECK_WIDTYPE(to_menu, widtype);
@@ -577,23 +662,54 @@ elm_menu_clone(Evas_Object *from_menu, Evas_Object *to_menu, Elm_Menu_Item *pare
 
    if (!from_wd) return;
    EINA_LIST_FOREACH(from_wd->items, iter, item)
-      _item_clone(to_menu, parent, item);
-}
-
-/**
- * Add an item at the end
- *
- * @param obj The menu object.
- * @param icon A icon display on the item. The icon will be destryed by the menu.
- * @param label The label of the item.
- * @param func Function called when the user select the item.
- * @param data Data sent by the callback.
- * @return Returns the new item.
- *
- * @ingroup Menu
- */
-EAPI Elm_Menu_Item *
-elm_menu_item_add(Evas_Object *obj, Elm_Menu_Item *parent, const char *icon, const char *label, Evas_Smart_Cb func, const void *data)
+     _item_clone(to_menu, (Elm_Menu_Item *) parent, item);
+}
+
+static void
+_elm_menu_item_add_helper(Evas_Object *obj, Elm_Menu_Item *parent, Elm_Menu_Item *subitem, Widget_Data *wd)
+{
+   if (parent)
+     {
+        if (!parent->submenu.bx) _item_submenu_obj_create(parent);
+        elm_box_pack_end(parent->submenu.bx, VIEW(subitem));
+        parent->submenu.items = eina_list_append(parent->submenu.items, subitem);
+        subitem->idx = eina_list_count(parent->submenu.items) - 1;
+     }
+   else
+     {
+        elm_box_pack_end(wd->bx, VIEW(subitem));
+        wd->items = eina_list_append(wd->items, subitem);
+        subitem->idx = eina_list_count(wd->items) - 1;
+     }
+
+   _sizing_eval(obj);
+}
+
+static Eina_Bool
+_item_del_pre_hook(Elm_Object_Item *it)
+{
+   Elm_Menu_Item *item = (Elm_Menu_Item *)it;
+   Elm_Object_Item *_item;
+
+   EINA_LIST_FREE(item->submenu.items, _item) elm_object_item_del(_item);
+   if (item->label) eina_stringshare_del(item->label);
+   if (item->content) evas_object_del(item->content);
+   if (item->submenu.hv) evas_object_del(item->submenu.hv);
+   if (item->submenu.location) evas_object_del(item->submenu.location);
+
+   if (item->parent)
+     item->parent->submenu.items = eina_list_remove(item->parent->submenu.items, item);
+   else
+     {
+        Widget_Data *wd = elm_widget_data_get(WIDGET(item));
+        wd->items = eina_list_remove(wd->items, item);
+     }
+
+   return EINA_TRUE;
+}
+
+EAPI Elm_Object_Item *
+elm_menu_item_add(Evas_Object *obj, Elm_Object_Item *parent, const char *icon, const char *label, Evas_Smart_Cb func, const void *data)
 {
    Elm_Menu_Item *subitem;
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
@@ -609,320 +725,361 @@ elm_menu_item_add(Evas_Object *obj, Elm_Menu_Item *parent, const char *icon, con
         evas_object_del(icon_obj);
         return NULL;
      }
+
+   elm_widget_item_del_pre_hook_set(subitem, _item_del_pre_hook);
+   elm_widget_item_disable_hook_set(subitem, _item_disable_hook);
+   elm_widget_item_text_set_hook_set(subitem, _item_text_set_hook);
+   elm_widget_item_text_get_hook_set(subitem, _item_text_get_hook);
+   elm_widget_item_content_set_hook_set(subitem, _item_content_set_hook);
+   elm_widget_item_content_get_hook_set(subitem, _item_content_get_hook);
+
    subitem->base.data = data;
    subitem->func = func;
-   subitem->parent = parent;
-   subitem->icon = icon_obj;
+   subitem->parent = (Elm_Menu_Item *) parent;
+   subitem->content = icon_obj;
 
    _item_obj_create(subitem);
-   elm_menu_item_label_set(subitem, label);
+   elm_object_item_text_set((Elm_Object_Item *) subitem, label);
 
-   elm_widget_sub_object_add(subitem->base.widget, subitem->icon);
-   edje_object_part_swallow(subitem->base.view, "elm.swallow.content", subitem->icon);
-   if (icon) elm_menu_item_icon_set(subitem, icon);
+   elm_widget_sub_object_add(WIDGET(subitem), subitem->content);
+   edje_object_part_swallow(VIEW(subitem), "elm.swallow.content", subitem->content);
+   if (icon)
+     elm_menu_item_icon_name_set((Elm_Object_Item *) subitem, icon);
 
-   if (parent)
-     {
-       if (!parent->submenu.bx) _item_submenu_obj_create(parent);
-       elm_box_pack_end(parent->submenu.bx, subitem->base.view);
-       parent->submenu.items = eina_list_append(parent->submenu.items, subitem);
-     }
-   else
-     {
-       elm_box_pack_end(wd->bx, subitem->base.view);
-       wd->items = eina_list_append(wd->items, subitem);
-     }
+   _elm_menu_item_add_helper(obj, (Elm_Menu_Item *) parent, subitem, wd);
 
-   _sizing_eval(obj);
-   return subitem;
+   return (Elm_Object_Item *) subitem;
 }
 
-/**
- * Set the label of a menu item
- *
- * @param item The menu item object.
- * @param label The label to set for @p item
- *
- * @ingroup Menu
- */
-EAPI void
-elm_menu_item_label_set(Elm_Menu_Item *item, const char *label)
+EINA_DEPRECATED EAPI Elm_Object_Item *
+elm_menu_item_add_object(Evas_Object *obj, Elm_Object_Item *parent, Evas_Object *subobj, Evas_Smart_Cb func, const void *data)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
-   eina_stringshare_replace(&item->label, label);
+   Elm_Menu_Item *subitem;
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
 
-   if (label)
-     edje_object_signal_emit(item->base.view, "elm,state,text,visible", "elm");
-   else
-     edje_object_signal_emit(item->base.view, "elm,state,text,hidden", "elm");
+   if (!wd) return NULL;
+   subitem = elm_widget_item_new(obj, Elm_Menu_Item);
+   if (!subitem) return NULL;
+
+   elm_widget_item_del_pre_hook_set(subitem, _item_del_pre_hook);
+   elm_widget_item_disable_hook_set(subitem, _item_disable_hook);
+   elm_widget_item_text_set_hook_set(subitem, _item_text_set_hook);
+   elm_widget_item_text_get_hook_set(subitem, _item_text_get_hook);
+   elm_widget_item_content_set_hook_set(subitem, _item_content_set_hook);
+   elm_widget_item_content_get_hook_set(subitem, _item_content_get_hook);
+
+   subitem->base.data = data;
+   subitem->func = func;
+   subitem->parent = (Elm_Menu_Item *) parent;
+   subitem->object_item = EINA_TRUE;
+   subitem->content = subobj;
 
-   edje_object_message_signal_process(item->base.view);
-   edje_object_part_text_set(item->base.view, "elm.text", label);
-   _sizing_eval(item->base.widget);
+   _item_obj_create(subitem);
+
+   elm_widget_sub_object_add(WIDGET(subitem), subitem->content);
+   edje_object_part_swallow(VIEW(subitem), "elm.swallow.content", subobj);
+   _sizing_eval(WIDGET(subitem));
+
+   _elm_menu_item_add_helper(obj, (Elm_Menu_Item *) parent, subitem, wd);
+
+   return (Elm_Object_Item *) subitem;
+}
+
+EAPI unsigned int
+elm_menu_item_index_get(const Elm_Object_Item *it)
+{
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, 0);
+   return ((Elm_Menu_Item *)it)->idx;
+}
+
+EAPI void
+elm_menu_item_label_set(Elm_Object_Item *it, const char *label)
+{
+   _item_text_set_hook(it, NULL, label);
 }
 
-/**
- * Get the label of a menu item
- *
- * @param item The menu item object.
- * @return The label of @p item
- *
- * @ingroup Menu
- */
 EAPI const char *
-elm_menu_item_label_get(const Elm_Menu_Item *item)
-{
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
-   return item->label;
-}
-
-/**
- * Set the icon of a menu item
- *
- * Once the icon object is set, a previously set one will be deleted.
- *
- * @param item The menu item object.
- * @param icon The icon object to set for @p item
- *
- * @ingroup Menu
- */
+elm_menu_item_label_get(const Elm_Object_Item *it)
+{
+   return _item_text_get_hook(it, NULL);
+}
+
+EINA_DEPRECATED EAPI void
+elm_menu_item_object_icon_name_set(Elm_Object_Item *it, const char *icon)
+{
+   elm_menu_item_icon_name_set(it, icon);
+}
+
 EAPI void
-elm_menu_item_icon_set(Elm_Menu_Item *item, const char *icon)
+elm_menu_item_icon_name_set(Elm_Object_Item *it, const char *icon)
 {
-   char icon_tmp[512];
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
    EINA_SAFETY_ON_NULL_RETURN(icon);
+   char icon_tmp[512];
+   Elm_Menu_Item *item = (Elm_Menu_Item *)it;
+
    if (!*icon) return;
    if ((item->icon_str) && (!strcmp(item->icon_str, icon))) return;
    if ((snprintf(icon_tmp, sizeof(icon_tmp), "menu/%s", icon) > 0) &&
-       (elm_icon_standard_set(item->icon, icon_tmp)))
+       (elm_icon_standard_set(item->content, icon_tmp) ||
+        elm_icon_standard_set(item->content, icon)))
      {
         eina_stringshare_replace(&item->icon_str, icon);
-       edje_object_signal_emit(item->base.view, "elm,state,icon,visible", "elm");
+        edje_object_signal_emit(VIEW(item), "elm,state,icon,visible", "elm");
      }
    else
-     edje_object_signal_emit(item->base.view, "elm,state,icon,hidden", "elm");
-   edje_object_message_signal_process(item->base.view);
-   _sizing_eval(item->base.widget);
-}
-
-/**
- * Set the disabled state of @p item.
- *
- * @param item The menu item object.
- * @param disabled The enabled/disabled state of the item
- *
- * @ingroup Menu
- */
+     edje_object_signal_emit(VIEW(item), "elm,state,icon,hidden", "elm");
+   edje_object_message_signal_process(VIEW(item));
+   _sizing_eval(WIDGET(item));
+}
+
 EAPI void
-elm_menu_item_disabled_set(Elm_Menu_Item *item, Eina_Bool disabled)
+elm_menu_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
-   if (disabled == item->disabled) return;
-   item->disabled = disabled;
-   if (disabled)
-     {
-        edje_object_signal_emit(item->base.view, "elm,state,disabled", "elm");
-        if (item->submenu.open) _submenu_hide(item);
-     }
-   else
-     edje_object_signal_emit(item->base.view, "elm,state,enabled", "elm");
-   edje_object_message_signal_process(item->base.view);
-}
-
-/**
- * Get the disabled state of @p item.
- *
- * @param item The menu item object.
- * @return The enabled/disabled state of the item
- *
- * @ingroup Menu
- */
+   elm_object_item_disabled_set(it, disabled);
+}
+
 EAPI Eina_Bool
-elm_menu_item_disabled_get(const Elm_Menu_Item *item)
-{
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, EINA_FALSE);
-   if (!item) return EINA_FALSE;
-   return item->disabled;
-}
-
-/**
- * Add a separator item to menu @p obj under @p parent.
- *
- * @param obj The menu object
- * @param parent The item to add the separator under
- *
- * @return The created item or NULL on failure
- *
- * @ingroup Menu
- */
-EAPI Elm_Menu_Item *
-elm_menu_item_separator_add(Evas_Object *obj, Elm_Menu_Item *parent)
+elm_menu_item_disabled_get(const Elm_Object_Item *it)
+{
+   return elm_object_item_disabled_get(it);
+}
+
+EAPI Elm_Object_Item *
+elm_menu_item_separator_add(Evas_Object *obj, Elm_Object_Item *parent)
 {
-   Elm_Menu_Item *subitem;
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Elm_Menu_Item *subitem;
    Widget_Data *wd = elm_widget_data_get(obj);
+   Elm_Menu_Item *p_item = (Elm_Menu_Item *) parent;
    if (!wd) return NULL;
    /* don't add a separator as the first item */
    if (!wd->items) return NULL;
    /* don't allow adding more than one separator in a row */
-   if (parent) subitem = eina_list_last(parent->submenu.items)->data;
+   if (p_item) subitem = eina_list_last(p_item->submenu.items)->data;
    else subitem = eina_list_last(wd->items)->data;
    if (subitem->separator) return NULL;
 
    subitem = elm_widget_item_new(obj, Elm_Menu_Item);
    if (!subitem) return NULL;
-   subitem->base.widget = obj;
-   subitem->separator = 1;
+
+   elm_widget_item_del_pre_hook_set(subitem, _item_del_pre_hook);
+   elm_widget_item_disable_hook_set(subitem, _item_disable_hook);
+   elm_widget_item_text_set_hook_set(subitem, _item_text_set_hook);
+   elm_widget_item_text_get_hook_set(subitem, _item_text_get_hook);
+   elm_widget_item_content_set_hook_set(subitem, _item_content_set_hook);
+   elm_widget_item_content_get_hook_set(subitem, _item_content_get_hook);
+
+   subitem->separator = EINA_TRUE;
    _item_separator_obj_create(subitem);
-   if (!parent)
+   if (!p_item)
      {
-       elm_box_pack_end(wd->bx, subitem->base.view);
-       wd->items = eina_list_append(wd->items, subitem);
+        elm_box_pack_end(wd->bx, VIEW(subitem));
+        wd->items = eina_list_append(wd->items, subitem);
      }
    else
      {
-       if (!parent->submenu.bx) _item_submenu_obj_create(parent);
-       elm_box_pack_end(parent->submenu.bx, subitem->base.view);
-       parent->submenu.items = eina_list_append(parent->submenu.items, subitem);
+        if (!p_item->submenu.bx) _item_submenu_obj_create(p_item);
+        elm_box_pack_end(p_item->submenu.bx, VIEW(subitem));
+        p_item->submenu.items = eina_list_append(p_item->submenu.items,
+                                                 subitem);
      }
    _sizing_eval(obj);
-   return subitem;
-}
-
-/**
- * Get the icon object from a menu item
- *
- * @param item The menu item object
- * @return The icon object or NULL if there's no icon
- *
- * @ingroup Menu
- */
-EAPI const Evas_Object *
-elm_menu_item_object_icon_get(const Elm_Menu_Item *item)
-{
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
-   return (const Evas_Object *)item->icon;
-}
-
-/**
- * Get the string representation from the icon of a menu item
- *
- * @param item The menu item object.
- * @return The string representation of @p item's icon or NULL
- *
- * @ingroup Menu
- */
+   return (Elm_Object_Item *) subitem;
+}
+
+EAPI Eina_Bool
+elm_menu_item_object_content_set(Elm_Object_Item *it, Evas_Object *obj)
+{
+   _item_content_set_hook(it, NULL, obj);
+   return EINA_TRUE;
+}
+
+EAPI Evas_Object *
+elm_menu_item_object_content_get(const Elm_Object_Item *it)
+{
+   return _item_content_get_hook(it, NULL);
+}
+
+EINA_DEPRECATED EAPI const char *
+elm_menu_item_object_icon_name_get(const Elm_Object_Item *it)
+{
+   return elm_menu_item_icon_name_get(it);
+}
+
 EAPI const char *
-elm_menu_item_icon_get(const Elm_Menu_Item *item)
+elm_menu_item_icon_name_get(const Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
-   return item->icon_str;
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+   return ((Elm_Menu_Item *)it)->icon_str;
 }
 
-/**
- * Returns whether @p item is a separator.
- *
- * @param item The item to check
- * @return If true, @p item is a separator
- *
- * @ingroup Menu
- */
 EAPI Eina_Bool
-elm_menu_item_is_separator(Elm_Menu_Item *item)
+elm_menu_item_is_separator(Elm_Object_Item *it)
+{
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
+   return ((Elm_Menu_Item *)it)->separator;
+}
+
+EAPI void
+elm_menu_item_del(Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, EINA_FALSE);
-   return item->separator;
+   elm_object_item_del(it);
 }
 
-/**
- * Deletes an item from the menu.
- *
- * @param item The item to delete.
- *
- * @ingroup Menu
- */
 EAPI void
-elm_menu_item_del(Elm_Menu_Item *item)
+elm_menu_item_del_cb_set(Elm_Object_Item *it, Evas_Smart_Cb func)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
-   Elm_Menu_Item *_item;
+   elm_object_item_del_cb_set(it, func);
+}
 
-   elm_widget_item_pre_notify_del(item);
+EAPI void *
+elm_menu_item_data_get(const Elm_Object_Item *it)
+{
+   return elm_object_item_data_get(it);
+}
 
-   EINA_LIST_FREE(item->submenu.items, _item) elm_menu_item_del(_item);
-   if (item->label) eina_stringshare_del(item->label);
-   if (item->icon) evas_object_del(item->icon);
-   if (item->submenu.hv) evas_object_del(item->submenu.hv);
-   if (item->submenu.location) evas_object_del(item->submenu.location);
+EAPI void
+elm_menu_item_data_set(Elm_Object_Item *it, const void *data)
+{
+   elm_object_item_data_set(it, (void *) data);
+}
+
+EAPI const Eina_List *
+elm_menu_item_subitems_get(const Elm_Object_Item *it)
+{
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+   return ((Elm_Menu_Item *)it)->submenu.items;
+}
+
+EAPI const Eina_List *
+elm_menu_items_get(const Evas_Object * obj)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   return wd->items;
+}
+
+EAPI void
+elm_menu_item_selected_set(Elm_Object_Item *it, Eina_Bool selected)
+{
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+   Elm_Menu_Item *item = (Elm_Menu_Item *)it;
+
+   if (selected == item->selected) return;
+   item->selected = selected;
+   if (selected)
+     {
+        edje_object_signal_emit(VIEW(item), "elm,state,selected", "elm");
+        _menu_item_activate(item, NULL, NULL, NULL);
+     }
+   else
+     {
+        edje_object_signal_emit(VIEW(item), "elm,state,unselected", "elm");
+        _menu_item_inactivate(item, NULL, NULL, NULL);
+     }
+   edje_object_message_signal_process(VIEW(item));
+}
+
+EAPI Eina_Bool
+elm_menu_item_selected_get(const Elm_Object_Item *it)
+{
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
+   return ((Elm_Menu_Item *)it)->selected;
+}
+
+EAPI Elm_Object_Item *
+elm_menu_item_prev_get(const Elm_Object_Item *it)
+{
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+   Elm_Menu_Item *item = (Elm_Menu_Item *)it;
 
    if (item->parent)
-     item->parent->submenu.items = eina_list_remove(item->parent->submenu.items, item);
+     {
+        Eina_List *l = eina_list_data_find_list(item->parent->submenu.items,
+                                                item);
+        l = eina_list_prev(l);
+        if (!l) return NULL;
+        return l->data;
+     }
    else
      {
-       Widget_Data *wd = elm_widget_data_get(item->base.widget);
-       wd->items = eina_list_remove(wd->items, item);
+        Widget_Data *wd = elm_widget_data_get(WIDGET(item));
+        if (!wd || !wd->items) return NULL;
+        Eina_List *l = eina_list_data_find_list(wd->items, item);
+        l = eina_list_prev(l);
+        if (!l) return NULL;
+        return l->data;
      }
+   return NULL;
+}
+
+EAPI Elm_Object_Item *
+elm_menu_item_next_get(const Elm_Object_Item *it)
+{
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+   Elm_Menu_Item *item = (Elm_Menu_Item *)it;
 
-   elm_widget_item_del(item);
+   if (item->parent)
+     {
+        Eina_List *l = eina_list_data_find_list(item->parent->submenu.items,
+                                                item);
+        l = eina_list_next(l);
+        if (!l) return NULL;
+        return l->data;
+     }
+   else
+     {
+        Widget_Data *wd = elm_widget_data_get(WIDGET(item));
+        if (!wd || !wd->items) return NULL;
+        Eina_List *l = eina_list_data_find_list(wd->items, item);
+        l = eina_list_next(l);
+        if (!l) return NULL;
+        return l->data;
+     }
+   return NULL;
 }
 
-/**
- * Set the function called when a menu item is freed.
- *
- * @param item The item to set the callback on
- * @param func The function called
- *
- * @ingroup Menu
- */
-EAPI void
-elm_menu_item_del_cb_set(Elm_Menu_Item *item, Evas_Smart_Cb func)
+EINA_DEPRECATED EAPI Evas_Object *
+elm_menu_item_menu_get(const Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
-   elm_widget_item_del_cb_set(item, func);
+   return elm_object_item_widget_get(it);
 }
 
-/**
- * Returns the data associated with menu item @p item.
- *
- * @param item The item
- * @return The data associated with @p item
- *
- * @ingroup Menu
- */
-EAPI void *
-elm_menu_item_data_get(const Elm_Menu_Item *item)
+EAPI Elm_Object_Item *
+elm_menu_first_item_get(const Evas_Object * obj)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
-   return elm_widget_item_data_get(item);
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return NULL;
+   if (wd->items) return wd->items->data;
+   return NULL;
 }
 
-/**
- * Sets the data to be associated with menu item @p item.
- *
- * @param item The item
- * @param data The data to be associated with @p item
- *
- * @ingroup Menu
- */
-EAPI void
-elm_menu_item_data_set(Elm_Menu_Item *item, const void *data)
+EAPI Elm_Object_Item *
+elm_menu_last_item_get(const Evas_Object * obj)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
-   elm_widget_item_data_set(item, data);
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return NULL;
+   Eina_List *l = eina_list_last(wd->items);
+   if (l) return l->data;
+   return NULL;
 }
 
-/**
- * Returns a list of @p item's subitems.
- *
- * @param item The item
- * @return An Eina_List* of @p item's subitems
- *
- * @ingroup Menu
- */
-EAPI const Eina_List *
-elm_menu_item_subitems_get(const Elm_Menu_Item *item)
+EAPI Elm_Object_Item *
+elm_menu_selected_item_get(const Evas_Object * obj)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
-   return item->submenu.items;
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return NULL;
+   Eina_List *l;
+   Elm_Menu_Item *item;
+   EINA_LIST_FOREACH(wd->items, l, item)
+     {
+        if (item->selected) return ((Elm_Object_Item *)item);
+     }
+   return NULL;
 }
+