summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYakov Goldberg <yakov.g@samsung.com>2015-07-08 12:18:03 +0300
committerYakov Goldberg <yakov.g@samsung.com>2015-07-08 12:36:29 +0300
commitdbf1d9cc06349c4e7c967ee04c8e614dc40d6e68 (patch)
tree9de08a5c083767251684c19e20d9476cbfa8af86
parent4f3c7670fcd73b8eb09f67a17afe5c10ac8a50c6 (diff)
downloadelementary-dbf1d9cc06349c4e7c967ee04c8e614dc40d6e68.tar.gz
elm_label: Move enums to elm_label.eo
Move enums from elm_label_common.h to elm_label.eo in order to make them more accessible for bindings. Delete elm_label_common.h.
-rw-r--r--src/lib/Makefile.am1
-rw-r--r--src/lib/elm_label.eo13
-rw-r--r--src/lib/elm_label.h1
-rw-r--r--src/lib/elm_label_common.h19
4 files changed, 12 insertions, 22 deletions
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index a098a4f02..6fc31ff2f 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -259,7 +259,6 @@ elm_inwin.h \
elm_inwin_eo.h \
elm_inwin_legacy.h \
elm_label.h \
-elm_label_common.h \
elm_label_eo.h \
elm_label_legacy.h \
elm_layout.h \
diff --git a/src/lib/elm_label.eo b/src/lib/elm_label.eo
index a06e0ffe1..4ec9d496b 100644
--- a/src/lib/elm_label.eo
+++ b/src/lib/elm_label.eo
@@ -1,3 +1,14 @@
+enum Elm.Label.Slide_Mode
+{
+ [[
+ @addtogroup Label
+ Slide mode of a label widget
+ ]]
+ none = 0, [[No slide effect.]]
+ auto, [[Slide only if the label area is bigger than the text width length.]]
+ always [[Slide always.]]
+}
+
class Elm.Label (Elm.Layout)
{
eo_prefix: elm_obj_label;
@@ -89,7 +100,7 @@ class Elm.Label (Elm.Layout)
@ingroup Label */
}
values {
- mode: Elm_Label_Slide_Mode; /*@ The slide mode */
+ mode: Elm.Label.Slide_Mode; /*@ The slide mode */
}
}
@property slide_duration {
diff --git a/src/lib/elm_label.h b/src/lib/elm_label.h
index 3396bf0c2..d6187efeb 100644
--- a/src/lib/elm_label.h
+++ b/src/lib/elm_label.h
@@ -39,7 +39,6 @@
* See @ref tutorial_label for a demonstration of how to use a label widget.
* @{
*/
-#include "elm_label_common.h"
#ifdef EFL_EO_API_SUPPORT
#include "elm_label_eo.h"
#endif
diff --git a/src/lib/elm_label_common.h b/src/lib/elm_label_common.h
deleted file mode 100644
index d5d7cff6a..000000000
--- a/src/lib/elm_label_common.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @addtogroup Label
- *
- * @{
- */
-
-/**
- * Slide mode of a label widget
- */
-typedef enum
-{
- ELM_LABEL_SLIDE_MODE_NONE = 0, /**< no slide effect */
- ELM_LABEL_SLIDE_MODE_AUTO, /**< slide only if the label area is bigger than the text width length */
- ELM_LABEL_SLIDE_MODE_ALWAYS /**< slide always */
-} Elm_Label_Slide_Mode;
-
-/**
- * @}
- */