From 3492586afc12c134715798a682dce888727d0eb8 Mon Sep 17 00:00:00 2001 From: Yakov Goldberg Date: Wed, 8 Jul 2015 12:18:03 +0300 Subject: [PATCH] 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. --- legacy/elementary/src/lib/Makefile.am | 1 - legacy/elementary/src/lib/elm_label.eo | 13 ++++++++++++- legacy/elementary/src/lib/elm_label.h | 1 - legacy/elementary/src/lib/elm_label_common.h | 19 ------------------- 4 files changed, 12 insertions(+), 22 deletions(-) delete mode 100644 legacy/elementary/src/lib/elm_label_common.h diff --git a/legacy/elementary/src/lib/Makefile.am b/legacy/elementary/src/lib/Makefile.am index a098a4f02d..6fc31ff2f0 100644 --- a/legacy/elementary/src/lib/Makefile.am +++ b/legacy/elementary/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/legacy/elementary/src/lib/elm_label.eo b/legacy/elementary/src/lib/elm_label.eo index a06e0ffe1b..4ec9d496b5 100644 --- a/legacy/elementary/src/lib/elm_label.eo +++ b/legacy/elementary/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/legacy/elementary/src/lib/elm_label.h b/legacy/elementary/src/lib/elm_label.h index 3396bf0c24..d6187efeb0 100644 --- a/legacy/elementary/src/lib/elm_label.h +++ b/legacy/elementary/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/legacy/elementary/src/lib/elm_label_common.h b/legacy/elementary/src/lib/elm_label_common.h deleted file mode 100644 index d5d7cff6a3..0000000000 --- a/legacy/elementary/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; - -/** - * @} - */