Eo: move Focus Direction to elm_general.eot

4 files changed, 29 insertions, 30 deletions

diff --git a/src/lib/elm_focus.h b/src/lib/elm_focus.h
index 46883a715..158a43799 100644
--- a/src/lib/elm_focus.h
+++ b/src/lib/elm_focus.h
@@ -34,23 +34,6 @@
  */
 
 /**
- * Focus directions.
- *
- * @ingroup Focus
- */
-typedef enum
-{
-   ELM_FOCUS_PREVIOUS, /**< previous direction */
-   ELM_FOCUS_NEXT,     /**< next direction */
-   ELM_FOCUS_UP,       /**< up direction */
-   ELM_FOCUS_DOWN,     /**< down direction */
-   ELM_FOCUS_RIGHT,    /**< right direction */
-   ELM_FOCUS_LEFT,      /**< left direction */
-   ELM_FOCUS_MOUSE,      /**< direction is from mouse */
-   ELM_FOCUS_REVERT      /**< direction is from focus revert */
-} Elm_Focus_Direction;
-
-/**
  * Focus region show mode.
  *
  * @ingroup Focus
diff --git a/src/lib/elm_general.eot b/src/lib/elm_general.eot
index 3118f589d..57c81ae0d 100644
--- a/src/lib/elm_general.eot
+++ b/src/lib/elm_general.eot
@@ -107,3 +107,17 @@ enum Elm.Wrap.Type
    last
 }
 
+enum Elm.Focus_Direction
+{
+   [[ Focus directions. ]]
+   legacy: elm_focus;
+   previous, [[ previous direction ]]
+   next,     [[ next direction ]]
+   up,       [[ up direction ]]
+   down,     [[ down direction ]]
+   right,    [[ right direction ]]
+   left,     [[ left direction ]]
+   mouse,    [[ direction is from mouse ]]
+   revert    [[ direction is from focus revert ]]
+}
+
diff --git a/src/lib/elm_widget.eo b/src/lib/elm_widget.eo
index 94633e107..44968e5be 100644
--- a/src/lib/elm_widget.eo
+++ b/src/lib/elm_widget.eo
@@ -1,3 +1,5 @@
+import elm_general;
+
 abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Interface_Atspi_Component)
 {
    eo_prefix: elm_obj_widget;
@@ -367,7 +369,7 @@ abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Inte
       @property focus_origin {
          get {
             [[Get the origination of the focus. Arrow key, tab key, mouse or deletion of an object.]]
-            return: Elm_Focus_Direction;
+            return: Elm.Focus_Direction;
          }
       }
       @property parent2 {
@@ -411,7 +413,7 @@ abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Inte
            @since 1.8]]
          params {
             @in next: Evas.Object * @nullable; [[Focus next object]]
-            @in dir: Elm_Focus_Direction; [[Focus direction]]
+            @in dir: Elm.Focus_Direction; [[Focus direction]]
          }
       }
       focus_next_object_get @const {
@@ -420,7 +422,7 @@ abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Inte
            @since 1.8]]
          return: Evas.Object *; [[Focus next object]]
          params {
-            @in dir: Elm_Focus_Direction; [[Focus direction]]
+            @in dir: Elm.Focus_Direction; [[Focus direction]]
          }
       }
       focus_next_item_set {
@@ -429,7 +431,7 @@ abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Inte
            @since 1.16]]
          params {
             @in next_item: Elm_Object_Item * @nullable; [[Focus next object item]]
-            @in dir: Elm_Focus_Direction; [[Focus direction]]
+            @in dir: Elm.Focus_Direction; [[Focus direction]]
          }
       }
       focus_next_item_get @const {
@@ -438,7 +440,7 @@ abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Inte
            @since 1.16]]
          return: Elm_Object_Item *; [[Focus next object item]]
          params {
-            @in dir: Elm_Focus_Direction; [[Focus direction]]
+            @in dir: Elm.Focus_Direction; [[Focus direction]]
          }
       }
       focus_tree_unfocusable_handle {
@@ -538,7 +540,7 @@ abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Inte
       }
       focus_cycle {
          params {
-            @in dir: Elm_Focus_Direction;
+            @in dir: Elm.Focus_Direction;
          }
       }
       focus_direction {
@@ -624,7 +626,7 @@ abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Inte
       focus_next_get @const {
          return: bool;
          params {
-            @in dir: Elm_Focus_Direction;
+            @in dir: Elm.Focus_Direction;
             @out next: Evas.Object *;
             @out next_item: Elm_Object_Item *;
          }
@@ -663,7 +665,7 @@ abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Inte
       focus_next {
          [['Virtual' function handling passing focus to sub-objects.]]
          params {
-            @in dir: Elm_Focus_Direction;
+            @in dir: Elm.Focus_Direction;
             @out next: Evas.Object *;
             @out next_item: Elm_Object_Item *;
          }
@@ -674,7 +676,7 @@ abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Inte
          params {
             @in items: const(list<Eo.Base*>)*;
             @in list_data_get: list_data_get_func_type;
-            @in dir: Elm_Focus_Direction;
+            @in dir: Elm.Focus_Direction;
             @out next: Evas.Object *;
             @out next_item: Elm_Object_Item *;
          }
diff --git a/src/lib/elm_widget_item.eo b/src/lib/elm_widget_item.eo
index d4fd187d9..1f61b9640 100644
--- a/src/lib/elm_widget_item.eo
+++ b/src/lib/elm_widget_item.eo
@@ -494,7 +494,7 @@ class Elm.Widget_Item(Eo.Base, Elm_Interface_Atspi_Accessible,
 
                   @since 1.16]]
                 params {
-                     dir: Elm_Focus_Direction; [[Focus direction]]
+                     dir: Elm.Focus_Direction; [[Focus direction]]
                 }
                 return: Evas.Object *; [[Focus next object]]
            }
@@ -504,7 +504,7 @@ class Elm.Widget_Item(Eo.Base, Elm_Interface_Atspi_Accessible,
                   @since 1.16]]
                 params {
                      next: Evas.Object * @nullable; [[Focus next object]]
-                     dir: Elm_Focus_Direction; [[Focus direction]]
+                     dir: Elm.Focus_Direction; [[Focus direction]]
                 }
            }
            focus_next_item_get @const {
@@ -512,7 +512,7 @@ class Elm.Widget_Item(Eo.Base, Elm_Interface_Atspi_Accessible,
 
                   @since 1.16]]
                 params {
-                     dir: Elm_Focus_Direction; [[Focus direction]]
+                     dir: Elm.Focus_Direction; [[Focus direction]]
                 }
                 return: Elm_Object_Item *; [[Focus next object item]]
            }
@@ -522,7 +522,7 @@ class Elm.Widget_Item(Eo.Base, Elm_Interface_Atspi_Accessible,
                   @since 1.16]]
                 params {
                      next_item: Elm_Object_Item * @nullable; [[Focus next object item]]
-                     dir: Elm_Focus_Direction; [[Focus direction]]
+                     dir: Elm.Focus_Direction; [[Focus direction]]
                 }
            }
       }