summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-04-02 13:57:58 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-04-02 13:59:01 +0100
commit96f1e297092157377618850765bdb3f71f396410 (patch)
treee0a04727e57081666c7231e5c24cdeefa2e01734
parent413c987837f0fc8d5a348631cf3b05b7e4dab7dd (diff)
elm naviframe - remove duplicated func prototype in headers
one hade EAPI, one did not and there were 2 anyway, so remove one and ensure the other has EAPI and the same docs. this should fix T7776
Diffstat (limited to '')
-rw-r--r--src/lib/elementary/elc_naviframe_common.h30
-rw-r--r--src/lib/elementary/elm_naviframe_eo.legacy.h30
2 files changed, 29 insertions, 31 deletions
diff --git a/src/lib/elementary/elc_naviframe_common.h b/src/lib/elementary/elc_naviframe_common.h
index 525f995c8c..453587e048 100644
--- a/src/lib/elementary/elc_naviframe_common.h
+++ b/src/lib/elementary/elc_naviframe_common.h
@@ -23,7 +23,35 @@ EAPI Evas_Object *elm_naviframe_add(Evas_Object *parent);
23 23
24EAPI void elm_naviframe_item_title_enabled_set(Elm_Object_Item *it, Eina_Bool enabled, Eina_Bool transition); 24EAPI void elm_naviframe_item_title_enabled_set(Elm_Object_Item *it, Eina_Bool enabled, Eina_Bool transition);
25 25
26Elm_Object_Item *elm_naviframe_item_push(Evas_Object *obj, const char *title_label, Evas_Object *prev_btn, Evas_Object *next_btn, Evas_Object *content, const char *item_style); 26/**
27 * @brief Push a new item to the top of the naviframe stack (and show it).
28 *
29 * The item pushed becomes one page of the naviframe, this item will be deleted
30 * when it is popped.
31 *
32 * When push transition animation is in progress, pop operation is blocked
33 * until push is complete.
34 *
35 * The following styles are available for this item: "default"
36 *
37 * @param[in] obj The object.
38 * @param[in] title_label The label in the title area. The name of the title
39 * label part is "elm.text.title"
40 * @param[in] prev_btn The button to go to the previous item. If it is NULL,
41 * then naviframe will create a back button automatically. The name of the
42 * prev_btn part is "elm.swallow.prev_btn"
43 * @param[in] next_btn The button to go to the next item. Or It could be just
44 * an extra function button. The name of the next_btn part is
45 * "elm.swallow.next_btn"
46 * @param[in] content The main content object. The name of content part is
47 * "elm.swallow.content"
48 * @param[in] item_style The current item style name. @c NULL would be default.
49 *
50 * @return The created item or @c NULL upon failure.
51 *
52 * @ingroup Elm_Naviframe_Group
53 */
54EAPI Elm_Object_Item *elm_naviframe_item_push(Evas_Object *obj, const char *title_label, Evas_Object *prev_btn, Evas_Object *next_btn, Evas_Object *content, const char *item_style);
27 55
28/** 56/**
29 * @brief Simple version of item_push. 57 * @brief Simple version of item_push.
diff --git a/src/lib/elementary/elm_naviframe_eo.legacy.h b/src/lib/elementary/elm_naviframe_eo.legacy.h
index 155e7513fd..995cbb1582 100644
--- a/src/lib/elementary/elm_naviframe_eo.legacy.h
+++ b/src/lib/elementary/elm_naviframe_eo.legacy.h
@@ -176,36 +176,6 @@ EAPI Efl_Canvas_Object *elm_naviframe_item_pop(Elm_Naviframe *obj);
176EAPI Elm_Widget_Item *elm_naviframe_item_insert_before(Elm_Naviframe *obj, Elm_Widget_Item *before, const char *title_label, Efl_Canvas_Object *prev_btn, Efl_Canvas_Object *next_btn, Efl_Canvas_Object *content, const char *item_style); 176EAPI Elm_Widget_Item *elm_naviframe_item_insert_before(Elm_Naviframe *obj, Elm_Widget_Item *before, const char *title_label, Efl_Canvas_Object *prev_btn, Efl_Canvas_Object *next_btn, Efl_Canvas_Object *content, const char *item_style);
177 177
178/** 178/**
179 * @brief Push a new item to the top of the naviframe stack (and show it).
180 *
181 * The item pushed becomes one page of the naviframe, this item will be deleted
182 * when it is popped.
183 *
184 * When push transition animation is in progress, pop operation is blocked
185 * until push is complete.
186 *
187 * The following styles are available for this item: "default"
188 *
189 * @param[in] obj The object.
190 * @param[in] title_label The label in the title area. The name of the title
191 * label part is "elm.text.title"
192 * @param[in] prev_btn The button to go to the previous item. If it is NULL,
193 * then naviframe will create a back button automatically. The name of the
194 * prev_btn part is "elm.swallow.prev_btn"
195 * @param[in] next_btn The button to go to the next item. Or It could be just
196 * an extra function button. The name of the next_btn part is
197 * "elm.swallow.next_btn"
198 * @param[in] content The main content object. The name of content part is
199 * "elm.swallow.content"
200 * @param[in] item_style The current item style name. @c NULL would be default.
201 *
202 * @return The created item or @c NULL upon failure.
203 *
204 * @ingroup Elm_Naviframe_Group
205 */
206EAPI Elm_Widget_Item *elm_naviframe_item_push(Elm_Naviframe *obj, const char *title_label, Efl_Canvas_Object *prev_btn, Efl_Canvas_Object *next_btn, Efl_Canvas_Object *content, const char *item_style);
207
208/**
209 * @brief Simple version of item_promote. 179 * @brief Simple version of item_promote.
210 * 180 *
211 * @param[in] obj The object. 181 * @param[in] obj The object.