focus: Add elm_focus_item.h to make header include order correctly.

This fixes the cpp example compile error which was triggered by the commit 431492e.

Change-Id: I092088e59eea802370f4b2088b55ddaf903043c1
origin: upstream

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 25813984246e0f8455cbfa33365bfe5abe164ea3..7a1b98ab80bdf207e9963be4d3eeeb9d9fc30c28 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -220,6 +220,7 @@ elm_flipselector_common.h \
 elm_flipselector_eo.h \
 elm_flipselector_legacy.h \
 elm_focus.h \
+elm_focus_item.h \
 elm_font.h \
 elm_frame.h \
 elm_frame_eo.h \

diff --git a/src/lib/elm_focus.h b/src/lib/elm_focus.h
index 799774750c404af5dff66872dfccbdbaf977028e..a4a5fc315c9434dcb734dabceaa568207ed674df 100644 (file)
--- a/src/lib/elm_focus.h
+++ b/src/lib/elm_focus.h
@@ -38,7 +38,7 @@
  *
  * @ingroup Focus
  */
-typedef enum _Elm_Focus_Direction
+typedef enum
 {
    ELM_FOCUS_PREVIOUS, /**< previous direction */
    ELM_FOCUS_NEXT,     /**< next direction */
@@ -248,47 +248,6 @@ EAPI Evas_Object *        elm_object_focus_next_object_get(const Evas_Object *ob
  */
 EAPI void                 elm_object_focus_next_object_set(Evas_Object *obj, Evas_Object *next, Elm_Focus_Direction dir);
 
-/**
- * Get next object item which was set with specific focus direction.
- *
- * Get next object item which was set by elm_object_focus_next_item_set
- * with specific focus direction.
- *
- * @param obj The Elementary object
- * @param dir Focus direction
- * @return Focus next object item or @c NULL, if there is no focus next
- * object item.
- *
- * @see elm_object_focus_next_item_set(), elm_object_focus_next()
- *
- * @since 1.16
- *
- * @ingroup Focus
- */
-EAPI Elm_Object_Item *    elm_object_focus_next_item_get(const Evas_Object *obj, Elm_Focus_Direction dir);
-
-/**
- * Set next object item with specific focus direction.
- *
- * When focus next object item is set with specific focus direction,
- * this object item will be the first candidate when finding
- * next focusable object or item.
- * If the focus next object item is set, it is preference to focus next object.
- * Focus next object item can be registered with six directions that are
- * previous, next, up, down, right, and left.
- *
- * @param obj The Elementary object
- * @param next_item Focus next object item
- * @param dir Focus direction
- *
- * @see elm_object_focus_next_item_get(), elm_object_focus_next()
- *
- * @since 1.16
- *
- * @ingroup Focus
- */
-EAPI void                 elm_object_focus_next_item_set(Evas_Object *obj, Elm_Object_Item *next_item, Elm_Focus_Direction dir);
-
 /**
  * Get focused object in object tree.
  *
@@ -371,25 +330,6 @@ EAPI Eina_Bool    elm_object_focus_highlight_style_set(Evas_Object *obj, const c
  */
 EAPI const char  *elm_object_focus_highlight_style_get(const Evas_Object *obj);
 
-/**
- * Get the focused object item
- *
- * This returns the focused object item.
- *
- * @param obj The container object
- * @return The focused item, or @c NULL if none
- *
- * The focused item can be unfocused with function
- * elm_object_item_focus_set().
- *
- * see @elm_object_item_focus_set()
- * see @elm_object_item_focus_get()
- *
- * @ingroup Focus
- * @since 1.10
- */
-EAPI Elm_Object_Item             *elm_object_focused_item_get(const Evas_Object *obj);
-
 /**
  * Set the focus movement policy to a given Elementary object.
  *

diff --git a/src/lib/elm_focus_item.h b/src/lib/elm_focus_item.h
new file mode 100644 (file)
index 0000000..b8ef680
--- /dev/null
+++ b/src/lib/elm_focus_item.h
@@ -0,0 +1,61 @@
+/**
+ * Get the focused object item
+ *
+ * This returns the focused object item.
+ *
+ * @param obj The container object
+ * @return The focused item, or @c NULL if none
+ *
+ * The focused item can be unfocused with function
+ * elm_object_item_focus_set().
+ *
+ * see @elm_object_item_focus_set()
+ * see @elm_object_item_focus_get()
+ *
+ * @ingroup Focus
+ * @since 1.10
+ */
+EAPI Elm_Object_Item             *elm_object_focused_item_get(const Evas_Object *obj);
+
+/**
+ * Get next object item which was set with specific focus direction.
+ *
+ * Get next object item which was set by elm_object_focus_next_item_set
+ * with specific focus direction.
+ *
+ * @param obj The Elementary object
+ * @param dir Focus direction
+ * @return Focus next object item or @c NULL, if there is no focus next
+ * object item.
+ *
+ * @see elm_object_focus_next_item_set(), elm_object_focus_next()
+ *
+ * @since 1.16
+ *
+ * @ingroup Focus
+ */
+EAPI Elm_Object_Item *    elm_object_focus_next_item_get(const Evas_Object *obj, Elm_Focus_Direction dir);
+
+/**
+ * Set next object item with specific focus direction.
+ *
+ * When focus next object item is set with specific focus direction,
+ * this object item will be the first candidate when finding
+ * next focusable object or item.
+ * If the focus next object item is set, it is preference to focus next object.
+ * Focus next object item can be registered with six directions that are
+ * previous, next, up, down, right, and left.
+ *
+ * @param obj The Elementary object
+ * @param next_item Focus next object item
+ * @param dir Focus direction
+ *
+ * @see elm_object_focus_next_item_get(), elm_object_focus_next()
+ *
+ * @since 1.16
+ *
+ * @ingroup Focus
+ */
+EAPI void                 elm_object_focus_next_item_set(Evas_Object *obj, Elm_Object_Item *next_item, Elm_Focus_Direction dir);
+
+

diff --git a/src/lib/elm_object_item.h b/src/lib/elm_object_item.h
index db788f67c9ab3e3b4428b0717adae944b76b72cb..db198622293f7c884866b0bffc68c26faa1589f8 100644 (file)
--- a/src/lib/elm_object_item.h
+++ b/src/lib/elm_object_item.h
@@ -5,8 +5,6 @@
  */
 typedef Eo Elm_Object_Item;
 
-typedef enum _Elm_Focus_Direction Elm_Focus_Direction;
-
 /**
  * @typedef Elm_Object_Item_Signal_Cb
  *