elm_toolbar define elm_toolbar_item_state in elm toolbar eolian files

4 files changed, 19 insertions, 15 deletions

diff --git a/src/lib/elm_toolbar.eo b/src/lib/elm_toolbar.eo
index 1af9546b9..66f92f37a 100644
--- a/src/lib/elm_toolbar.eo
+++ b/src/lib/elm_toolbar.eo
@@ -111,7 +111,7 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable,
          get {
          }
          values {
-            order: Elm_Icon_Lookup_Order(1); [[The icon lookup order. (If getting the icon order loopup fails, it returns #ELM_ICON_LOOKUP_THEME_FDO)]]
+            order: Elm.Icon.Lookup_Order(1); [[The icon lookup order. (If getting the icon order loopup fails, it returns #ELM_ICON_LOOKUP_THEME_FDO)]]
          }
       }
       @property shrink_mode {
diff --git a/src/lib/elm_toolbar_common.h b/src/lib/elm_toolbar_common.h
index cea449be9..4e1c37b0e 100644
--- a/src/lib/elm_toolbar_common.h
+++ b/src/lib/elm_toolbar_common.h
@@ -4,7 +4,6 @@
  * @{
  */
 
-typedef struct _Elm_Toolbar_Item_State Elm_Toolbar_Item_State;    /**< State of a Elm_Toolbar_Item. Can be created with elm_toolbar_item_state_add() and removed with elm_toolbar_item_state_del(). */
 
 /**
  * Unset the state of @p it.
diff --git a/src/lib/elm_toolbar_item.eo b/src/lib/elm_toolbar_item.eo
index 23c752a19..6a1c31515 100644
--- a/src/lib/elm_toolbar_item.eo
+++ b/src/lib/elm_toolbar_item.eo
@@ -10,6 +10,19 @@ enum Elm.Toolbar_Item.Scrollto_Type
    last = (1 << 3) [[to the last of viewport]]
 }
 
+struct Elm.Toolbar_Item.State
+{
+   [[
+     State of a Elm_Toolbar_Item.
+     Can be created with elm_toolbar_item_state_add() and removed with elm_toolbar_item_state_del().
+   ]]
+   label: const(char)*;
+   icon_str: const(char)*;
+   icon: Evas.Object *;
+   func: Evas_Smart_Cb ;
+   data: const(void)*;
+}
+
 class Elm.Toolbar_Item(Elm.Widget_Item)
 {
       eo_prefix: elm_obj_toolbar_item;
@@ -165,7 +178,7 @@ class Elm.Toolbar_Item(Elm.Widget_Item)
                      return: bool;
                 }
                 values {
-                     state: Elm_Toolbar_Item_State * @nullable;
+                     state: Elm.Toolbar_Item.State * @nullable;
                 }
            }
            /*      init { FIXME
@@ -217,12 +230,12 @@ class Elm.Toolbar_Item(Elm.Widget_Item)
                      @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked when this state is selected.]]
                      @in data: const (void) * @optional; [[The data to associate with the state.]]
                 }
-                return: Elm_Toolbar_Item_State *; [[The toolbar item state, or $null upon failure.]]
+                return: Elm.Toolbar_Item.State *; [[The toolbar item state, or $null upon failure.]]
            }
            state_del {
                 [[Delete a previously added state to $item.]]
                 params {
-                     @in state: Elm_Toolbar_Item_State *; [[The state to be deleted.]]
+                     @in state: Elm.Toolbar_Item.State *; [[The state to be deleted.]]
                 }
                 return: bool; [[$true on success or $false on failure.]]
            }
@@ -232,7 +245,7 @@ class Elm.Toolbar_Item(Elm.Widget_Item)
                   If last state is selected, this function will return first
                   state.
                 ]]
-                return: Elm_Toolbar_Item_State *; [[The state after current state, or $null on failure.]]
+                return: Elm.Toolbar_Item.State *; [[The state after current state, or $null on failure.]]
            }
            state_prev {
                 [[Get the state before selected state in toolbar's $item.
@@ -240,7 +253,7 @@ class Elm.Toolbar_Item(Elm.Widget_Item)
                   If first state is selected, this function will return last
                   state.
                 ]]
-                return: Elm_Toolbar_Item_State *; [[The state before current state, or $null on failure.]]
+                return: Elm.Toolbar_Item.State *; [[The state before current state, or $null on failure.]]
            }
            show {
                 [[Show a specific item, when the toolbar can be scrolled.
diff --git a/src/lib/elm_widget_toolbar.h b/src/lib/elm_widget_toolbar.h
index e9438fb61..51be6168a 100644
--- a/src/lib/elm_widget_toolbar.h
+++ b/src/lib/elm_widget_toolbar.h
@@ -89,14 +89,6 @@ struct _Elm_Toolbar_Item_Data
    Eina_Bool     on_move : 1;
 };
 
-struct _Elm_Toolbar_Item_State
-{
-   const char   *label;
-   const char   *icon_str;
-   Evas_Object  *icon;
-   Evas_Smart_Cb func;
-   const void   *data;
-};
 
 /**
  * @}