summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVyacheslav Reutskiy <v.reutskiy@samsung.com>2014-08-22 18:01:28 +0300
committerVyacheslav Reutskiy <v.reutskiy@samsung.com>2014-08-22 18:01:28 +0300
commit98bd65467277e10920d11ec9a8a5ac2bae68e03f (patch)
tree9b392c5970c315ca43350528d4ed4caf22faf994
parent8472715b711f72e87afd5f381ac8798acd15c2e8 (diff)
parent6717d40fc61993773eea2aeb59e91a13bac50e80 (diff)
Merge branch 'develop'0.1.6
Conflicts: configure.ac
-rw-r--r--.gitignore18
-rw-r--r--NEWS9
-rw-r--r--configure.ac6
-rw-r--r--src/lib/Ewe.h2
-rw-r--r--src/lib/Makefile.am1
-rw-r--r--src/lib/ewe_combobox.c10
-rw-r--r--src/lib/ewe_combobox.h5
-rw-r--r--src/lib/ewe_combobox_common.h5
-rw-r--r--src/lib/ewe_combobox_eo.h5
-rw-r--r--src/lib/ewe_combobox_legacy.h6
-rw-r--r--src/lib/ewe_entry.c1
-rw-r--r--src/lib/ewe_entry.h8
-rw-r--r--src/lib/ewe_entry_common.h6
-rw-r--r--src/lib/ewe_entry_eo.h7
-rw-r--r--src/lib/ewe_entry_legacy.h6
-rw-r--r--src/lib/ewe_private.h9
-rw-r--r--src/lib/ewe_ruler.c2
-rw-r--r--src/lib/ewe_ruler.h6
-rw-r--r--src/lib/ewe_ruler_common.h5
-rw-r--r--src/lib/ewe_ruler_eo.h5
-rw-r--r--src/lib/ewe_ruler_legacy.h6
-rw-r--r--src/lib/ewe_statusbar.h8
-rw-r--r--src/lib/ewe_statusbar_common.h3
-rw-r--r--src/lib/ewe_statusbar_eo.h5
-rw-r--r--src/lib/ewe_statusbar_legacy.h3
-rw-r--r--src/lib/ewe_tabs.c1
-rw-r--r--src/lib/ewe_tabs.h7
-rw-r--r--src/lib/ewe_tabs_common.h5
-rw-r--r--src/lib/ewe_tabs_eo.h5
-rw-r--r--src/lib/ewe_tabs_legacy.h5
-rw-r--r--src/lib/ewe_widget_combobox.h2
-rw-r--r--src/lib/ewe_widget_entry.h3
-rw-r--r--src/lib/ewe_widget_ruler.h2
-rw-r--r--src/lib/ewe_widget_statusbar.h7
-rw-r--r--src/lib/ewe_widget_tabs.h6
-rw-r--r--src/lib/ewe_win.c1
-rw-r--r--src/lib/ewe_win.h6
-rw-r--r--src/lib/ewe_win_common.h4
-rw-r--r--src/lib/ewe_win_legacy.h5
39 files changed, 164 insertions, 42 deletions
diff --git a/.gitignore b/.gitignore
index f333098..7386a35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,15 @@ config.log
13config.status 13config.status
14config/ 14config/
15configure 15configure
16compile
17config.guess
18config.rpath
19config.sub
20depcomp
21install-sh
22ltmain.sh
23missing
24test-driver
16ewe_config.h 25ewe_config.h
17intl/ 26intl/
18libtool 27libtool
@@ -25,13 +34,14 @@ ewe.pc
25src/bin/ewe_test 34src/bin/ewe_test
26tests/Doxyfile 35tests/Doxyfile
27 36
28
29
30#build generated files 37#build generated files
31*.edj 38*.edj
32*.la 39*.la
33*.lo 40*.lo
41*.a
34*.o 42*.o
43*.i
44*.s
35*.eo.c 45*.eo.c
36*.eo.h 46*.eo.h
37.libs 47.libs
@@ -55,3 +65,7 @@ tests/*_test
55#do not ignore 65#do not ignore
56!doc/Doxyfile.in 66!doc/Doxyfile.in
57!*.am 67!*.am
68
69#coverage
70*.gcno
71*.gcda
diff --git a/NEWS b/NEWS
index eab2ed5..a180dc2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,14 @@
1========= 1=========
2Ewe 0.1.5 2Ewe 0.1.6
3========= 3=========
4 4
5Changes since 0.1.5
6-------------------
7
8Fixes:
9 * Combobox: rare bug with multiple dropdown windows;
10 * reorganize inclusion of headers to not screw EAPI on Windows
11
5Changes since 0.1.4 12Changes since 0.1.4
6------------------- 13-------------------
7 14
diff --git a/configure.ac b/configure.ac
index 6b07b80..fa85589 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1EWE_VERSION([0], [1], [5]) 1EWE_VERSION([0], [1], [6])
2 2
3AC_INIT([ewe], [ewe_version], [enlightenment-devel@lists.sourceforge.net]) 3AC_INIT([ewe], [ewe_version], [enlightenment-devel@lists.sourceforge.net])
4AC_PREREQ([2.60]) 4AC_PREREQ([2.60])
@@ -29,8 +29,6 @@ if test "x$want_ewe_debug" = "xyes"; then
29 AC_DEFINE([HAVE_EWE_DEBUG], [1], [Set to 1 if debug is requested.]) 29 AC_DEFINE([HAVE_EWE_DEBUG], [1], [Set to 1 if debug is requested.])
30fi 30fi
31 31
32EFL_ENABLE_BIN([ewe-test])
33
34 32
35### Default options with respect to host and global variables 33### Default options with respect to host and global variables
36 34
@@ -67,6 +65,8 @@ AC_SUBST([DEPS_EOLIAN_FLAGS])
67# Force the helper to try external eolian-gen 65# Force the helper to try external eolian-gen
68AM_CONDITIONAL([HAVE_EOLIAN_GEN], [true]) 66AM_CONDITIONAL([HAVE_EOLIAN_GEN], [true])
69 67
68EFL_ENABLE_BIN([ewe-test])
69
70 70
71### Checks for libraries 71### Checks for libraries
72 72
diff --git a/src/lib/Ewe.h b/src/lib/Ewe.h
index 6c6df34..73f5034 100644
--- a/src/lib/Ewe.h
+++ b/src/lib/Ewe.h
@@ -55,4 +55,4 @@
55#include "ewe_tabs.h" 55#include "ewe_tabs.h"
56#include "ewe_win.h" 56#include "ewe_win.h"
57 57
58#endif /* ELEMENTARY_WIDGET_EXTENTIONS */ 58#endif /* ELEMENTARY_WIDGET_EXTENTIONS_H */
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index c0b4883..a7cddf3 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -64,6 +64,7 @@ ewe_win_common.h
64 64
65includesubdir = $(pkgincludedir)-@VMAJ@ 65includesubdir = $(pkgincludedir)-@VMAJ@
66 66
67libewe_la_LIBADD = @ELEMENTARY_LIBS@
67libewe_la_LDFLAGS = @EWE_LTLIBRARY_FLAGS@ 68libewe_la_LDFLAGS = @EWE_LTLIBRARY_FLAGS@
68libewe_la_SOURCES = \ 69libewe_la_SOURCES = \
69ewe_main.c \ 70ewe_main.c \
diff --git a/src/lib/ewe_combobox.c b/src/lib/ewe_combobox.c
index 1704043..3609625 100644
--- a/src/lib/ewe_combobox.c
+++ b/src/lib/ewe_combobox.c
@@ -1,7 +1,6 @@
1#include "ewe_private.h" 1#include "ewe_private.h"
2#include "ewe_win.h" 2#include "ewe_win.h"
3#include "ewe_widget_combobox.h" 3#include "ewe_widget_combobox.h"
4#include <elm_interface_scrollable.h>
5 4
6EAPI Eo_Op EWE_OBJ_COMBOBOX_BASE_ID = EO_NOOP; 5EAPI Eo_Op EWE_OBJ_COMBOBOX_BASE_ID = EO_NOOP;
7 6
@@ -74,6 +73,11 @@ _exp_window_create(Evas **evas, Ewe_Combobox_Smart_Data *sd)
74{ 73{
75 Evas_Object *win; 74 Evas_Object *win;
76 75
76 if (sd->win)
77 {
78 evas_object_smart_callback_del(sd->win, "unfocused", _focus_out_cb);
79 evas_object_del(sd->win);
80 }
77 win = ewe_win_add(sd->top_win, "expand_window", EWE_WIN_DROPDOWN_MENU); 81 win = ewe_win_add(sd->top_win, "expand_window", EWE_WIN_DROPDOWN_MENU);
78 elm_win_autodel_set(win, EINA_TRUE); 82 elm_win_autodel_set(win, EINA_TRUE);
79 elm_win_borderless_set(win, EINA_TRUE); 83 elm_win_borderless_set(win, EINA_TRUE);
@@ -106,7 +110,7 @@ _exp_window_create(Evas **evas, Ewe_Combobox_Smart_Data *sd)
106} 110}
107 111
108static void 112static void
109_expand(Evas_Object *obj) 113_ewe_combobox_expand(Evas_Object *obj)
110{ 114{
111 int top_widget_pos_x, top_widget_pos_y, sc_y_offset, screen_high, list_count; 115 int top_widget_pos_x, top_widget_pos_y, sc_y_offset, screen_high, list_count;
112 Eina_List *l; 116 Eina_List *l;
@@ -184,7 +188,7 @@ _on_clicked(void *data,
184 ERR("Combobox items list is empty"); 188 ERR("Combobox items list is empty");
185 return; 189 return;
186 } 190 }
187 _expand(sd->obj); 191 _ewe_combobox_expand(sd->obj);
188} 192}
189 193
190/*----------------------internal realisation API------------------------------*/ 194/*----------------------internal realisation API------------------------------*/
diff --git a/src/lib/ewe_combobox.h b/src/lib/ewe_combobox.h
index 4b50b63..a0b8686 100644
--- a/src/lib/ewe_combobox.h
+++ b/src/lib/ewe_combobox.h
@@ -16,6 +16,9 @@
16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html. 16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
17 */ 17 */
18 18
19#ifndef EWE_COMBOBOX_H
20#define EWE_COMBOBOX_H
21
19#include "ewe_combobox_common.h" 22#include "ewe_combobox_common.h"
20#ifdef EFL_EO_API_SUPPORT 23#ifdef EFL_EO_API_SUPPORT
21#include "ewe_combobox_eo.h" 24#include "ewe_combobox_eo.h"
@@ -23,3 +26,5 @@
23#ifndef EFL_NOLEGACY_API_SUPPORT 26#ifndef EFL_NOLEGACY_API_SUPPORT
24#include "ewe_combobox_legacy.h" 27#include "ewe_combobox_legacy.h"
25#endif 28#endif
29
30#endif /* EWE_COMBOBOX_H */
diff --git a/src/lib/ewe_combobox_common.h b/src/lib/ewe_combobox_common.h
index 40568ce..15cb707 100644
--- a/src/lib/ewe_combobox_common.h
+++ b/src/lib/ewe_combobox_common.h
@@ -16,6 +16,9 @@
16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html. 16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
17 */ 17 */
18 18
19#ifndef EWE_COMBOBOX_COMMON_H
20#define EWE_COMBOBOX_COMMON_H
21
19typedef struct _Ewe_Combobox_Item Ewe_Combobox_Item; 22typedef struct _Ewe_Combobox_Item Ewe_Combobox_Item;
20 23
21struct _Ewe_Combobox_Item 24struct _Ewe_Combobox_Item
@@ -26,3 +29,5 @@ struct _Ewe_Combobox_Item
26 Eina_Stringshare *style; 29 Eina_Stringshare *style;
27 unsigned int index; 30 unsigned int index;
28}; 31};
32
33#endif /* EWE_COMBOBOX_COMMON_H */
diff --git a/src/lib/ewe_combobox_eo.h b/src/lib/ewe_combobox_eo.h
index fd6fa21..b6945dd 100644
--- a/src/lib/ewe_combobox_eo.h
+++ b/src/lib/ewe_combobox_eo.h
@@ -17,6 +17,9 @@
17 * www.gnu.org/licenses/lgpl.html. 17 * www.gnu.org/licenses/lgpl.html.
18 */ 18 */
19 19
20#ifndef EWE_COMBOBOX_EO_H
21#define EWE_COMBOBOX_EO_H
22
20#include "ewe_combobox.eo.h" 23#include "ewe_combobox.eo.h"
21 24
22#if 0 25#if 0
@@ -68,3 +71,5 @@ enum
68 71
69#define ewe_obj_combobox_select_item_get(ret) EWE_OBJ_COMBOBOX_ID(EWE_OBJ_COMBOBOX_SUB_ID_SELECT_ITEM_GET), EO_TYPECHECK(Ewe_Combobox_Item **, ret) 72#define ewe_obj_combobox_select_item_get(ret) EWE_OBJ_COMBOBOX_ID(EWE_OBJ_COMBOBOX_SUB_ID_SELECT_ITEM_GET), EO_TYPECHECK(Ewe_Combobox_Item **, ret)
70#endif 73#endif
74
75#endif /* EWE_COMBOBOX_EO_H */
diff --git a/src/lib/ewe_combobox_legacy.h b/src/lib/ewe_combobox_legacy.h
index bd5bb2b..bd5992f 100644
--- a/src/lib/ewe_combobox_legacy.h
+++ b/src/lib/ewe_combobox_legacy.h
@@ -1,3 +1,7 @@
1
2#ifndef EWE_COMBOBOX_LEGACY_H
3#define EWE_COMBOBOX_LEGACY_H
4
1/** 5/**
2 * Add a new combobox to the parent 6 * Add a new combobox to the parent
3 * 7 *
@@ -141,3 +145,5 @@ EAPI Eina_Bool
141ewe_combobox_item_style_set(Evas_Object *obj, 145ewe_combobox_item_style_set(Evas_Object *obj,
142 Ewe_Combobox_Item *item, 146 Ewe_Combobox_Item *item,
143 Eina_Stringshare *style); 147 Eina_Stringshare *style);
148
149#endif /* EWE_COMBOBOX_LEGACY_H */
diff --git a/src/lib/ewe_entry.c b/src/lib/ewe_entry.c
index 3e48ab2..3e5c83f 100644
--- a/src/lib/ewe_entry.c
+++ b/src/lib/ewe_entry.c
@@ -1,6 +1,5 @@
1#include "ewe_private.h" 1#include "ewe_private.h"
2#include "ewe_widget_entry.h" 2#include "ewe_widget_entry.h"
3#include "Ewe.h"
4 3
5#define MY_CLASS EWE_ENTRY_CLASS 4#define MY_CLASS EWE_ENTRY_CLASS
6 5
diff --git a/src/lib/ewe_entry.h b/src/lib/ewe_entry.h
index 14b5fc2..8646c7b 100644
--- a/src/lib/ewe_entry.h
+++ b/src/lib/ewe_entry.h
@@ -1,3 +1,7 @@
1
2#ifndef EWE_ENTRY_H
3#define EWE_ENTRY_H
4
1/** 5/**
2 * @defgroup Entry Entry 6 * @defgroup Entry Entry
3 * @ingroup Ewe 7 * @ingroup Ewe
@@ -13,11 +17,13 @@
13 * functions acting on it also work for entry objects. 17 * functions acting on it also work for entry objects.
14 * 18 *
15 */ 19 */
16#include "ewe_entry_common.h"
17 20
21#include "ewe_entry_common.h"
18#ifdef EFL_EO_API_SUPPORT 22#ifdef EFL_EO_API_SUPPORT
19#include "ewe_entry_eo.h" 23#include "ewe_entry_eo.h"
20#endif 24#endif
21#ifndef EFL_NOLEGACY_API_SUPPORT 25#ifndef EFL_NOLEGACY_API_SUPPORT
22#include "ewe_entry_legacy.h" 26#include "ewe_entry_legacy.h"
23#endif 27#endif
28
29#endif /* EWE_ENTRY_H */
diff --git a/src/lib/ewe_entry_common.h b/src/lib/ewe_entry_common.h
index 3f60d7b..5fcfdeb 100644
--- a/src/lib/ewe_entry_common.h
+++ b/src/lib/ewe_entry_common.h
@@ -1,3 +1,7 @@
1
2#ifndef EWE_ENTRY_COMMON_H
3#define EWE_ENTRY_COMMON_H
4
1/** 5/**
2 * @def EWE_REG_EXTENDED 6 * @def EWE_REG_EXTENDED
3 * @brief Regex check option: Use Extended Regular Expressions. 7 * @brief Regex check option: Use Extended Regular Expressions.
@@ -79,3 +83,5 @@
79 * @brief Regex Error: ?, * or + not preceded by valid regular expression. 83 * @brief Regex Error: ?, * or + not preceded by valid regular expression.
80 */ 84 */
81#define EWE_REG_BADRPT 13 85#define EWE_REG_BADRPT 13
86
87#endif /* EWE_ENTRY_COMMON_H */
diff --git a/src/lib/ewe_entry_eo.h b/src/lib/ewe_entry_eo.h
index e56491a..4e31728 100644
--- a/src/lib/ewe_entry_eo.h
+++ b/src/lib/ewe_entry_eo.h
@@ -1,3 +1,6 @@
1#ifndef EWE_ENTRY_EO_H
2#define EWE_ENTRY_EO_H
3
1#include "ewe_entry.eo.h" 4#include "ewe_entry.eo.h"
2 5
3#if 0 6#if 0
@@ -32,4 +35,6 @@ enum
32#define ewe_obj_entry_regex_unset(ret) EWE_OBJ_ENTRY_ID(EWE_OBJ_ENTRY_SUB_ID_REGEX_UNSET), EO_TYPECHECK(Eina_Bool *, ret) 35#define ewe_obj_entry_regex_unset(ret) EWE_OBJ_ENTRY_ID(EWE_OBJ_ENTRY_SUB_ID_REGEX_UNSET), EO_TYPECHECK(Eina_Bool *, ret)
33#define ewe_obj_entry_regex_check(ret) EWE_OBJ_ENTRY_ID(EWE_OBJ_ENTRY_SUB_ID_REGEX_CHECK), EO_TYPECHECK(Eina_Bool *, ret) 36#define ewe_obj_entry_regex_check(ret) EWE_OBJ_ENTRY_ID(EWE_OBJ_ENTRY_SUB_ID_REGEX_CHECK), EO_TYPECHECK(Eina_Bool *, ret)
34 37
35#endif \ No newline at end of file 38#endif
39
40#endif /* EWE_ENTRY_EO_H */
diff --git a/src/lib/ewe_entry_legacy.h b/src/lib/ewe_entry_legacy.h
index 115cfe7..104bcf3 100644
--- a/src/lib/ewe_entry_legacy.h
+++ b/src/lib/ewe_entry_legacy.h
@@ -1,3 +1,7 @@
1
2#ifndef EWE_ENTRY_LEGACY_H
3#define EWE_ENTRY_LEGACY_H
4
1/** 5/**
2 * This adds an entry to @p parent object. 6 * This adds an entry to @p parent object.
3 * 7 *
@@ -120,3 +124,5 @@ EAPI Eina_Bool ewe_entry_regex_autocheck_get(const Evas_Object *obj);
120 * @ingroup Entry 124 * @ingroup Entry
121 */ 125 */
122EAPI void ewe_entry_entry_set(Evas_Object *obj, const char *text); 126EAPI void ewe_entry_entry_set(Evas_Object *obj, const char *text);
127
128#endif /* EWE_ENTRY_LEGACY_H */
diff --git a/src/lib/ewe_private.h b/src/lib/ewe_private.h
index c598bd2..df90da0 100644
--- a/src/lib/ewe_private.h
+++ b/src/lib/ewe_private.h
@@ -22,12 +22,19 @@
22#include "ewe_config.h" 22#include "ewe_config.h"
23#endif 23#endif
24 24
25#include <math.h>
26#include <stdlib.h>
27
25#include <Eo.h> 28#include <Eo.h>
26#include <Evas.h> 29#include <Evas.h>
27#include <Elementary.h> 30#include <Elementary.h>
28#include <elm_widget.h> 31#include <elm_widget.h>
32#include <elm_widget_layout.h>
33#include <elm_interface_scrollable.h>
34
35#include "Ewe.h"
29#include "logger.h" 36#include "logger.h"
30 37
31#define EWE_SAFE_FREE(_h, _fn) do { _fn((void*)_h); _h = NULL; } while (0) 38#define EWE_SAFE_FREE(_h, _fn) do { _fn((void*)_h); _h = NULL; } while (0)
32 39
33#endif /* EWE_PRIV_H */ 40#endif /* EWE_PRIVATE_H */
diff --git a/src/lib/ewe_ruler.c b/src/lib/ewe_ruler.c
index 154160a..ef8ce5e 100644
--- a/src/lib/ewe_ruler.c
+++ b/src/lib/ewe_ruler.c
@@ -15,8 +15,6 @@
15 * You should have received a copy of the GNU Lesser General Public License 15 * You should have received a copy of the GNU Lesser General Public License
16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html. 16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
17 */ 17 */
18#include <math.h>
19#include <stdlib.h>
20#include "ewe_private.h" 18#include "ewe_private.h"
21#include "ewe_widget_ruler.h" 19#include "ewe_widget_ruler.h"
22 20
diff --git a/src/lib/ewe_ruler.h b/src/lib/ewe_ruler.h
index ed36417..74376f4 100644
--- a/src/lib/ewe_ruler.h
+++ b/src/lib/ewe_ruler.h
@@ -16,8 +16,8 @@
16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html. 16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
17 */ 17 */
18 18
19#ifndef EWE_RULER_HEADER_H 19#ifndef EWE_RULER_H
20#define EWE_RULER_HEADER_H 20#define EWE_RULER_H
21 21
22/** 22/**
23 * @defgroup Ruler Ruler 23 * @defgroup Ruler Ruler
@@ -41,4 +41,4 @@
41#include "ewe_ruler_legacy.h" 41#include "ewe_ruler_legacy.h"
42#endif 42#endif
43 43
44#endif /* EWE_RULER_HEADER_H */ 44#endif /* EWE_RULER_H */
diff --git a/src/lib/ewe_ruler_common.h b/src/lib/ewe_ruler_common.h
index 67f3f0e..6071969 100644
--- a/src/lib/ewe_ruler_common.h
+++ b/src/lib/ewe_ruler_common.h
@@ -16,6 +16,9 @@
16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html. 16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
17 */ 17 */
18 18
19#ifndef EWE_RULER_COMMON_H
20#define EWE_RULER_COMMON_H
21
19typedef struct _Ewe_Ruler_Scale Ewe_Ruler_Scale; 22typedef struct _Ewe_Ruler_Scale Ewe_Ruler_Scale;
20struct _Ewe_Ruler_Scale 23struct _Ewe_Ruler_Scale
21{ 24{
@@ -43,3 +46,5 @@ struct _Ewe_Ruler_Marker
43 Eina_Bool visible : 1; 46 Eina_Bool visible : 1;
44 Eina_Bool relative : 1; 47 Eina_Bool relative : 1;
45}; 48};
49
50#endif /* EWE_RULER_COMMON_H */
diff --git a/src/lib/ewe_ruler_eo.h b/src/lib/ewe_ruler_eo.h
index 53d83f6..9ac19e8 100644
--- a/src/lib/ewe_ruler_eo.h
+++ b/src/lib/ewe_ruler_eo.h
@@ -16,6 +16,9 @@
16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html. 16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
17 */ 17 */
18 18
19#ifndef EWE_RULER_EO_H
20#define EWE_RULER_EO_H
21
19#include "ewe_ruler.eo.h" 22#include "ewe_ruler.eo.h"
20 23
21#if 0 24#if 0
@@ -41,3 +44,5 @@ enum
41#define ewe_obj_ruler_zero_offset_set(ret, pos) EWE_OBJ_RULER_ID(EWE_OBJ_RULER_SUB_ID_ZERO_OFFSET_SET),EO_TYPECHECK(Eina_Bool *, ret), EO_TYPECHECK(int, pos) 44#define ewe_obj_ruler_zero_offset_set(ret, pos) EWE_OBJ_RULER_ID(EWE_OBJ_RULER_SUB_ID_ZERO_OFFSET_SET),EO_TYPECHECK(Eina_Bool *, ret), EO_TYPECHECK(int, pos)
42 45
43#endif 46#endif
47
48#endif /* EWE_RULER_EO_H */
diff --git a/src/lib/ewe_ruler_legacy.h b/src/lib/ewe_ruler_legacy.h
index f24e78a..ccf99c7 100644
--- a/src/lib/ewe_ruler_legacy.h
+++ b/src/lib/ewe_ruler_legacy.h
@@ -15,8 +15,8 @@
15 * You should have received a copy of the GNU Lesser General Public License 15 * You should have received a copy of the GNU Lesser General Public License
16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html. 16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
17 */ 17 */
18#ifndef EWE_RULER_LEGACY 18#ifndef EWE_RULER_LEGACY_H
19#define EWE_RULER_LEGACY 19#define EWE_RULER_LEGACY_H
20 20
21/** 21/**
22 * Add new ruler to the given parent object 22 * Add new ruler to the given parent object
@@ -408,4 +408,4 @@ ewe_ruler_marker_style_set(Evas_Object *obj, Ewe_Ruler_Marker *marker, const cha
408EAPI const char * 408EAPI const char *
409ewe_ruler_marker_style_get(const Eo *obj, Ewe_Ruler_Marker *marker); 409ewe_ruler_marker_style_get(const Eo *obj, Ewe_Ruler_Marker *marker);
410 410
411#endif /* EWE_RULER_LEGACY */ 411#endif /* EWE_RULER_LEGACY_H */
diff --git a/src/lib/ewe_statusbar.h b/src/lib/ewe_statusbar.h
index 12de01e..db3ecc7 100644
--- a/src/lib/ewe_statusbar.h
+++ b/src/lib/ewe_statusbar.h
@@ -16,6 +16,9 @@
16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html. 16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
17 */ 17 */
18 18
19#ifndef EWE_STATUSBAR_H
20#define EWE_STATUSBAR_H
21
19/** 22/**
20 * @defgroup Statusbar Statusbar 23 * @defgroup Statusbar Statusbar
21 * @ingroup EWE 24 * @ingroup EWE
@@ -27,12 +30,11 @@
27 * @addtogroup Statusbar 30 * @addtogroup Statusbar
28 * @{ 31 * @{
29 */ 32 */
30#include "ewe_statusbar_common.h"
31 33
34#include "ewe_statusbar_common.h"
32#ifdef EFL_EO_API_SUPPORT 35#ifdef EFL_EO_API_SUPPORT
33#include "ewe_statusbar_eo.h" 36#include "ewe_statusbar_eo.h"
34#endif 37#endif
35
36#ifndef EFL_NOLEGACY_API_SUPPORT 38#ifndef EFL_NOLEGACY_API_SUPPORT
37#include "ewe_statusbar_legacy.h" 39#include "ewe_statusbar_legacy.h"
38#endif 40#endif
@@ -40,3 +42,5 @@
40/** 42/**
41 * @} 43 * @}
42 */ 44 */
45
46#endif /* EWE_STATUSBAR_H */
diff --git a/src/lib/ewe_statusbar_common.h b/src/lib/ewe_statusbar_common.h
index a3dec6b..0c3f213 100644
--- a/src/lib/ewe_statusbar_common.h
+++ b/src/lib/ewe_statusbar_common.h
@@ -16,6 +16,8 @@
16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html. 16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
17 */ 17 */
18 18
19#ifndef EWE_STATUSBAR_COMMON_H
20#define EWE_STATUSBAR_COMMON_H
19 21
20/** 22/**
21 * Defines items align into statusbar 23 * Defines items align into statusbar
@@ -179,3 +181,4 @@ ewe_statusbar_item_content_unset(Ewe_Statusbar_Item *item);
179EAPI Evas_Object * 181EAPI Evas_Object *
180ewe_statusbar_item_statusbar_get(Ewe_Statusbar_Item *item); 182ewe_statusbar_item_statusbar_get(Ewe_Statusbar_Item *item);
181 183
184#endif /* EWE_STATUSBAR_COMMON_H */
diff --git a/src/lib/ewe_statusbar_eo.h b/src/lib/ewe_statusbar_eo.h
index fa044d6..eecfd2b 100644
--- a/src/lib/ewe_statusbar_eo.h
+++ b/src/lib/ewe_statusbar_eo.h
@@ -16,4 +16,9 @@
16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html. 16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
17 */ 17 */
18 18
19#ifndef EWE_STATUSBAR_EO_H
20#define EWE_STATUSBAR_EO_H
21
19#include "ewe_statusbar.eo.h" 22#include "ewe_statusbar.eo.h"
23
24#endif /* EWE_STATUSBAR_EO_H */
diff --git a/src/lib/ewe_statusbar_legacy.h b/src/lib/ewe_statusbar_legacy.h
index 93484bc..6cd5550 100644
--- a/src/lib/ewe_statusbar_legacy.h
+++ b/src/lib/ewe_statusbar_legacy.h
@@ -16,6 +16,8 @@
16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html. 16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
17 */ 17 */
18 18
19#ifndef EWE_STATUSBAR_LEGACY_H
20#define EWE_STATUSBAR_LEGACY_H
19 21
20/** 22/**
21 * Add a new statusbar widget to the given parent object. 23 * Add a new statusbar widget to the given parent object.
@@ -219,3 +221,4 @@ ewe_statusbar_items_align_get(const Evas_Object *obj);
219EAPI Eina_Bool 221EAPI Eina_Bool
220ewe_statusbar_item_remove(Evas_Object *obj, Ewe_Statusbar_Item *item); 222ewe_statusbar_item_remove(Evas_Object *obj, Ewe_Statusbar_Item *item);
221 223
224#endif /* EWE_STATUSBAR_LEGACY_H */
diff --git a/src/lib/ewe_tabs.c b/src/lib/ewe_tabs.c
index 9b508f0..7dca284 100644
--- a/src/lib/ewe_tabs.c
+++ b/src/lib/ewe_tabs.c
@@ -17,7 +17,6 @@
17 */ 17 */
18 18
19#include "ewe_private.h" 19#include "ewe_private.h"
20#include "elm_widget_layout.h"
21#include "ewe_widget_tabs.h" 20#include "ewe_widget_tabs.h"
22 21
23#define MY_CLASS EWE_TABS_CLASS 22#define MY_CLASS EWE_TABS_CLASS
diff --git a/src/lib/ewe_tabs.h b/src/lib/ewe_tabs.h
index b73f6b5..29eb3a6 100644
--- a/src/lib/ewe_tabs.h
+++ b/src/lib/ewe_tabs.h
@@ -16,6 +16,9 @@
16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html. 16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
17 */ 17 */
18 18
19#ifndef EWE_TABS_H
20#define EWE_TABS_H
21
19/** 22/**
20 * @defgroup tabs Tabs 23 * @defgroup tabs Tabs
21 * @ingroup Ewe 24 * @ingroup Ewe
@@ -26,11 +29,11 @@
26 */ 29 */
27 30
28#include "ewe_tabs_common.h" 31#include "ewe_tabs_common.h"
29
30#ifdef EFL_EO_API_SUPPORT 32#ifdef EFL_EO_API_SUPPORT
31#include "ewe_tabs_eo.h" 33#include "ewe_tabs_eo.h"
32#endif 34#endif
33
34#ifndef EFL_NOLEGACY_API_SUPPORT 35#ifndef EFL_NOLEGACY_API_SUPPORT
35#include "ewe_tabs_legacy.h" 36#include "ewe_tabs_legacy.h"
36#endif 37#endif
38
39#endif /* EWE_TABS_H */
diff --git a/src/lib/ewe_tabs_common.h b/src/lib/ewe_tabs_common.h
index e9c186d..dce9c3b 100644
--- a/src/lib/ewe_tabs_common.h
+++ b/src/lib/ewe_tabs_common.h
@@ -16,6 +16,9 @@
16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html. 16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
17 */ 17 */
18 18
19#ifndef EWE_TABS_COMMON_H
20#define EWE_TABS_COMMON_H
21
19typedef struct _Ewe_Tabs_Item Ewe_Tabs_Item; 22typedef struct _Ewe_Tabs_Item Ewe_Tabs_Item;
20 23
21struct _Ewe_Tabs_Item 24struct _Ewe_Tabs_Item
@@ -27,3 +30,5 @@ struct _Ewe_Tabs_Item
27 Eina_Stringshare *style; 30 Eina_Stringshare *style;
28 Eina_Bool disabled; 31 Eina_Bool disabled;
29}; 32};
33
34#endif /* EWE_TABS_COMMON_H */
diff --git a/src/lib/ewe_tabs_eo.h b/src/lib/ewe_tabs_eo.h
index dcbdcbd..99d3cb6 100644
--- a/src/lib/ewe_tabs_eo.h
+++ b/src/lib/ewe_tabs_eo.h
@@ -16,6 +16,9 @@
16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html. 16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
17 */ 17 */
18 18
19#ifndef EWE_TABS_EO_H
20#define EWE_TABS_EO_H
21
19#include "ewe_tabs.eo.h" 22#include "ewe_tabs.eo.h"
20 23
21#if 0 24#if 0
@@ -78,3 +81,5 @@ enum
78 81
79#define ewe_obj_tabs_item_disabled_get(ret, item) EWE_OBJ_TABS_ID(EWE_OBJ_TABS_SUB_ID_ITEM_DISABLED_GET), EO_TYPECHECK(Eina_Bool *, ret), EO_TYPECHECK(const Ewe_Tabs_Item *, item) 82#define ewe_obj_tabs_item_disabled_get(ret, item) EWE_OBJ_TABS_ID(EWE_OBJ_TABS_SUB_ID_ITEM_DISABLED_GET), EO_TYPECHECK(Eina_Bool *, ret), EO_TYPECHECK(const Ewe_Tabs_Item *, item)
80#endif 83#endif
84
85#endif /* EWE_TABS_EO_H */
diff --git a/src/lib/ewe_tabs_legacy.h b/src/lib/ewe_tabs_legacy.h
index 3666727..822b09a 100644
--- a/src/lib/ewe_tabs_legacy.h
+++ b/src/lib/ewe_tabs_legacy.h
@@ -16,6 +16,9 @@
16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html. 16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
17 */ 17 */
18 18
19#ifndef EWE_TABS_LEGACY_H
20#define EWE_TABS_LEGACY_H
21
19/** 22/**
20 * This adds tabs to @p parent object. 23 * This adds tabs to @p parent object.
21 * 24 *
@@ -276,3 +279,5 @@ ewe_tabs_orient_horizontal_set(Evas_Object *obj,
276 */ 279 */
277EAPI Eina_Bool 280EAPI Eina_Bool
278ewe_tabs_orient_horizontal_get(const Evas_Object *obj); 281ewe_tabs_orient_horizontal_get(const Evas_Object *obj);
282
283#endif /* EWE_TABS_LEGACY_H */
diff --git a/src/lib/ewe_widget_combobox.h b/src/lib/ewe_widget_combobox.h
index 88f2c1d..9c7e6c7 100644
--- a/src/lib/ewe_widget_combobox.h
+++ b/src/lib/ewe_widget_combobox.h
@@ -61,4 +61,4 @@ struct _Ewe_Combobox_Smart_Data
61 if (!obj || EINA_UNLIKELY(!eo_isa((obj), EWE_COMBOBOX_CLASS))) \ 61 if (!obj || EINA_UNLIKELY(!eo_isa((obj), EWE_COMBOBOX_CLASS))) \
62 return 62 return
63 63
64#endif 64#endif /* EWE_WIDGET_COMBOBOX_H */
diff --git a/src/lib/ewe_widget_entry.h b/src/lib/ewe_widget_entry.h
index 69f9c7b..15e4ef0 100644
--- a/src/lib/ewe_widget_entry.h
+++ b/src/lib/ewe_widget_entry.h
@@ -24,5 +24,4 @@ struct _Ewe_Entry_Data {
24#define EWE_ENTRY_DATA_GET(obj) \ 24#define EWE_ENTRY_DATA_GET(obj) \
25 Ewe_Entry_Data *sd = eo_data_scope_get(obj, EWE_ENTRY_CLASS) 25 Ewe_Entry_Data *sd = eo_data_scope_get(obj, EWE_ENTRY_CLASS)
26 26
27#endif 27#endif /* EWE_WIDGET_ENTRY_H */
28
diff --git a/src/lib/ewe_widget_ruler.h b/src/lib/ewe_widget_ruler.h
index 67668d3..c07bcb9 100644
--- a/src/lib/ewe_widget_ruler.h
+++ b/src/lib/ewe_widget_ruler.h
@@ -49,4 +49,4 @@ struct _Ewe_Ruler_Smart_Data
49 if (EINA_UNLIKELY(!eo_isa((obj), EWE_RULER_CLASS))) \ 49 if (EINA_UNLIKELY(!eo_isa((obj), EWE_RULER_CLASS))) \
50 return 50 return
51 51
52#endif 52#endif /* EWE_WIDGET_RULER_H */
diff --git a/src/lib/ewe_widget_statusbar.h b/src/lib/ewe_widget_statusbar.h
index 4e61a4b..4973454 100644
--- a/src/lib/ewe_widget_statusbar.h
+++ b/src/lib/ewe_widget_statusbar.h
@@ -16,8 +16,8 @@
16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html. 16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
17 */ 17 */
18 18
19#ifndef EWE_WIDGET_STATUSBAR_ 19#ifndef EWE_WIDGET_STATUSBAR_H
20#define EWE_WIDGET_STATUSBAR_ 20#define EWE_WIDGET_STATUSBAR_H
21 21
22#include "ewe_statusbar.h" 22#include "ewe_statusbar.h"
23/** 23/**
@@ -71,5 +71,4 @@ struct _Ewe_Statusbar_Smart_Data
71#define EWE_STATUSBAR_CHECK(obj) \ 71#define EWE_STATUSBAR_CHECK(obj) \
72 if (EINA_UNLIKELY(!eo_isa((obj), EWE_STATUSBAR_CLASS))) return 72 if (EINA_UNLIKELY(!eo_isa((obj), EWE_STATUSBAR_CLASS))) return
73 73
74#endif 74#endif /* EWE_WIDGET_STATUSBAR_H */
75
diff --git a/src/lib/ewe_widget_tabs.h b/src/lib/ewe_widget_tabs.h
index 9aef729..001417b 100644
--- a/src/lib/ewe_widget_tabs.h
+++ b/src/lib/ewe_widget_tabs.h
@@ -16,8 +16,8 @@
16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html. 16 * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
17 */ 17 */
18 18
19#ifndef ELM_WIDGET_TABS_H 19#ifndef EWE_WIDGET_TABS_H
20#define ELM_WIDGET_TABS_H 20#define EWE_WIDGET_TABS_H
21 21
22#include "ewe_tabs.h" 22#include "ewe_tabs.h"
23 23
@@ -39,4 +39,4 @@ struct _Ewe_Tabs_Smart_Data
39 if (EINA_UNLIKELY(!eo_isa((obj), EWE_TABS_CLASS))) \ 39 if (EINA_UNLIKELY(!eo_isa((obj), EWE_TABS_CLASS))) \
40 return 40 return
41 41
42#endif 42#endif /* EWE_WIDGET_TABS_H */
diff --git a/src/lib/ewe_win.c b/src/lib/ewe_win.c
index 47009f6..8dc1e9e 100644
--- a/src/lib/ewe_win.c
+++ b/src/lib/ewe_win.c
@@ -18,7 +18,6 @@
18 */ 18 */
19 19
20#include "ewe_private.h" 20#include "ewe_private.h"
21#include "Ewe.h"
22 21
23EAPI Evas_Object * 22EAPI Evas_Object *
24ewe_win_add(Evas_Object *parent, const char *name, Ewe_Win_Type type) 23ewe_win_add(Evas_Object *parent, const char *name, Ewe_Win_Type type)
diff --git a/src/lib/ewe_win.h b/src/lib/ewe_win.h
index 9efb76d..9f2aedb 100644
--- a/src/lib/ewe_win.h
+++ b/src/lib/ewe_win.h
@@ -17,8 +17,8 @@
17 * along with this program; If not, see www.gnu.org/licenses/lgpl.html. 17 * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
18 */ 18 */
19 19
20#ifndef EWE_WIN_HEADER_H 20#ifndef EWE_WIN_H
21#define EWE_WIN_HEADER_H 21#define EWE_WIN_H
22 22
23/** 23/**
24 * @defgroup Win Win 24 * @defgroup Win Win
@@ -39,4 +39,4 @@
39#include "ewe_win_legacy.h" 39#include "ewe_win_legacy.h"
40#endif 40#endif
41 41
42#endif /* EWE_WIN_HEADER_H */ 42#endif /* EWE_WIN_H */
diff --git a/src/lib/ewe_win_common.h b/src/lib/ewe_win_common.h
index a8ee555..1f9985f 100644
--- a/src/lib/ewe_win_common.h
+++ b/src/lib/ewe_win_common.h
@@ -27,6 +27,9 @@
27 * Currently, only the X11 backed engines use them. 27 * Currently, only the X11 backed engines use them.
28 */ 28 */
29 29
30#ifndef EWE_WIN_COMMON_H
31#define EWE_WIN_COMMON_H
32
30typedef enum 33typedef enum
31{ 34{
32 EWE_WIN_UNKNOWN = -1, 35 EWE_WIN_UNKNOWN = -1,
@@ -85,3 +88,4 @@ typedef enum
85 other process's plug image object*/ 88 other process's plug image object*/
86} Ewe_Win_Type; 89} Ewe_Win_Type;
87 90
91#endif /* EWE_WIN_COMMON_H */
diff --git a/src/lib/ewe_win_legacy.h b/src/lib/ewe_win_legacy.h
index 09071e9..25968c4 100644
--- a/src/lib/ewe_win_legacy.h
+++ b/src/lib/ewe_win_legacy.h
@@ -17,6 +17,9 @@
17 * along with this program; If not, see www.gnu.org/licenses/lgpl.html. 17 * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
18 */ 18 */
19 19
20#ifndef EWE_WIN_LEGACY_H
21#define EWE_WIN_LEGACY_H
22
20/** 23/**
21 * Adds a window onject. 24 * Adds a window onject.
22 * If this is the first window created, pass NULL as parent. 25 * If this is the first window created, pass NULL as parent.
@@ -60,3 +63,5 @@ ewe_win_floating_mode_get(const Evas_Object *obj);
60 * @ingroup Win 63 * @ingroup Win
61 */ 64 */
62EAPI void ewe_win_render(Evas_Object *obj); 65EAPI void ewe_win_render(Evas_Object *obj);
66
67#endif /* EWE_WIN_LEGACY_H */