yakov pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=e0a7fcf5543e16824ded3d57207c6b42dc4dd5d2
commit e0a7fcf5543e16824ded3d57207c6b42dc4dd5d2
Author: Yakov Goldberg <yako...@samsung.com>
Date: Wed Jul 8 14:42:17 2015 +0300
elm_general: move definition of enum Elm.Wrap.Type to elm_general.eot
move definition of enum Elm.Wrap.Type from elm_entry.eo to elm_general.eot
And import elm_general.eot into elm_entry.eo, elm_label.eo, elm_popup.eo
---
src/lib/elm_entry.eo | 19 ++-----------------
src/lib/elm_general.eot | 19 +++++++++++++++++++
src/lib/elm_label.eo | 4 +++-
src/lib/elm_popup.eo | 4 +++-
4 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/src/lib/elm_entry.eo b/src/lib/elm_entry.eo
index 49b5c42..45afea3 100644
--- a/src/lib/elm_entry.eo
+++ b/src/lib/elm_entry.eo
@@ -1,3 +1,5 @@
+import elm_general;
+
enum Elm.Text_Format
{
[[Text Format types.
@@ -7,23 +9,6 @@ enum Elm.Text_Format
markup_utf8 [[ Markup UTF8 type ]]
}
-enum Elm.Wrap.Type
-{
- [[
- @addtogroup Entry
- Line wrapping types.
- Type of word or character wrapping to use.
- @see elm_entry_line_wrap_set()
- ]]
-
- legacy: elm_wrap;
- none = 0, [[No wrap - value is zero.]]
- char, [[Char wrap - wrap between characters.]]
- word, [[Word wrap - wrap in allowed wrapping points (as defined in the
unicode standard).]]
- mixed, [[Mixed wrap - Word wrap, and if that fails, char wrap.]]
- last
-}
-
enum Elm.Input.Panel.Layout
{
[[
diff --git a/src/lib/elm_general.eot b/src/lib/elm_general.eot
index 9b7fe19..f946536 100644
--- a/src/lib/elm_general.eot
+++ b/src/lib/elm_general.eot
@@ -88,3 +88,22 @@ enum Elm.Object.Multi_Select_Mode
ELM_OBJECT_MULTI_SELECT_MODE_MAX is forbidden.]]
}
+enum Elm.Wrap.Type
+{
+ [[
+ @addtogroup Entry
+ Line wrapping types.
+ Type of word or character wrapping to use.
+ @see elm_entry_line_wrap_set()
+ @see elm_popup_content_text_wrap_type_set
+ @see elm_label_line_wrap_set()
+ ]]
+
+ legacy: elm_wrap;
+ none = 0, [[No wrap - value is zero.]]
+ char, [[Char wrap - wrap between characters.]]
+ word, [[Word wrap - wrap in allowed wrapping points (as defined in the
unicode standard).]]
+ mixed, [[Mixed wrap - Word wrap, and if that fails, char wrap.]]
+ last
+}
+
diff --git a/src/lib/elm_label.eo b/src/lib/elm_label.eo
index 4ec9d49..27bd910 100644
--- a/src/lib/elm_label.eo
+++ b/src/lib/elm_label.eo
@@ -1,3 +1,5 @@
+import elm_general;
+
enum Elm.Label.Slide_Mode
{
[[
@@ -155,7 +157,7 @@ class Elm.Label (Elm.Layout)
@ingroup Label */
}
values {
- wrap: Elm_Wrap_Type; /*@ To wrap text or not */
+ wrap: Elm.Wrap.Type; /*@ To wrap text or not */
}
}
@property ellipsis {
diff --git a/src/lib/elm_popup.eo b/src/lib/elm_popup.eo
index d3c16b2..68d219d 100644
--- a/src/lib/elm_popup.eo
+++ b/src/lib/elm_popup.eo
@@ -1,3 +1,5 @@
+import elm_general;
+
enum Elm.Popup.Orient
{
[[
@@ -96,7 +98,7 @@ class Elm.Popup (Elm.Layout,
Elm_Interface_Atspi_Widget_Action)
@see elm_popup_content_text_wrap_type_set */
}
values {
- wrap: Elm_Wrap_Type; /*@ wrapping type of type Elm_Wrap_Type */
+ wrap: Elm.Wrap.Type; /*@ wrapping type of type Elm_Wrap_Type */
}
}
@property orient {
--
