reverted naviframe macro. it should not be removed this time.

Change-Id: Ic3fab3384548dcfaa6870e7f2ce9a6c0a73acc39

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index 2913dc6..fcf6b40 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -28507,6 +28507,28 @@ extern "C" {
     * @ref tutorial_naviframe gives a good overview of the usage of the API.
     */
 
+  //Available commonly
+  #define ELM_NAVIFRAME_ITEM_CONTENT "elm.swallow.content"
+  #define ELM_NAVIFRAME_ITEM_ICON "elm.swallow.icon"
+  #define ELM_NAVIFRAME_ITEM_OPTIONHEADER "elm.swallow.optionheader"
+  #define ELM_NAVIFRAME_ITEM_TITLE_LABEL "elm.text.title"
+  #define ELM_NAVIFRAME_ITEM_PREV_BTN "elm.swallow.prev_btn"
+  #define ELM_NAVIFRAME_ITEM_TITLE_LEFT_BTN "elm.swallow.left_btn"
+  #define ELM_NAVIFRAME_ITEM_TITLE_RIGHT_BTN "elm.swallow.right_btn"
+  #define ELM_NAVIFRAME_ITEM_TITLE_MORE_BTN "elm.swallow.more_btn"
+  #define ELM_NAVIFRAME_ITEM_CONTROLBAR "elm.swallow.controlbar"
+  #define ELM_NAVIFRAME_ITEM_SIGNAL_OPTIONHEADER_CLOSE "elm,state,optionheader,close", ""
+  #define ELM_NAVIFRAME_ITEM_SIGNAL_OPTIONHEADER_OPEN "elm,state,optionheader,open", ""
+  #define ELM_NAVIFRAME_ITEM_SIGNAL_OPTIONHEADER_INSTANT_CLOSE "elm,state,optionheader,instant_close", ""
+  #define ELM_NAVIFRAME_ITEM_SIGNAL_OPTIONHEADER_INSTANT_OPEN "elm,state,optionheader,instant_open", ""
+
+   //Available only in a style - "2line"
+  #define ELM_NAVIFRAME_ITEM_OPTIONHEADER2 "elm.swallow.optionheader2"
+
+  //Available only in a style - "segment"
+  #define ELM_NAVIFRAME_ITEM_SEGMENT2 "elm.swallow.segment2"
+  #define ELM_NAVIFRAME_ITEM_SEGMENT3 "elm.swallow.segment3"
+
    /**
     * @addtogroup Naviframe
     * @{

diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 94ebdd8..0b739c5 100644 (file)
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -10,7 +10,7 @@ struct _Widget_Data
 {
    Eina_Inlist  *stack;
    Evas_Object  *base;
-   Evas_Object     *rect;
+   Evas_Object  *rect;
    Eina_Bool     preserve: 1;
    Eina_Bool     auto_pushed: 1;
    Eina_Bool     freeze_events: 1;
@@ -318,17 +318,17 @@ _item_content_set_hook(Elm_Object_Item *it,
    Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
 
    //specified parts
-   if (!part || !strcmp("default", part))
+   if ((!part) || (!strcmp(part, "elm.swallow.content")))
      {
         _item_content_set(navi_it, content);
         return;
      }
-   else if (!strcmp(part, "prev_btn"))
+   else if (!strcmp(part, "elm.swallow.prev_btn"))
      {
         _title_prev_btn_set(navi_it, content, EINA_FALSE);
         return;
      }
-   else if (!strcmp(part, "next_btn"))
+   else if (!strcmp(part, "elm.swallow.next_btn"))
      {
         _title_next_btn_set(navi_it, content);
         return;
@@ -351,11 +351,11 @@ _item_content_get_hook(const Elm_Object_Item *it, const char *part)
    Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
 
    //specified parts
-   if (!part || !strcmp("default", part))
+   if ((!part) || (!strcmp(part, "elm.swallow.content")))
      return navi_it->content;
-   else if (!strcmp(part, "prev_btn"))
+   else if (!strcmp(part, "elm.swallow.prev_btn"))
      return navi_it->title_prev_btn;
-   else if (!strcmp(part, "next_btn"))
+   else if (!strcmp(part, "elm.swallow.next_btn"))
      return navi_it->title_next_btn;
    else if (!strcmp(part, "icon"))
      return navi_it->icon;
@@ -381,9 +381,9 @@ _item_content_unset_hook(Elm_Object_Item *it, const char *part)
    //specified parts
    //FIXME: could be unset the below specified contents also.
    if (!part ||
-       !strcmp(part, "default") ||
-       !strcmp(part, "prev_btn") ||
-       !strcmp(part, "next_btn") ||
+       !strcmp(part, "elm.swallow.content") ||
+       !strcmp(part, "elm.swallow.prev_btn") ||
+       !strcmp(part, "elm.swallow.next_btn") ||
        !strcmp(part, "icon"))
      {
         WRN("You can not unset the content! : naviframe=%p",