summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.in101
-rw-r--r--data/objects/Makefile.am2
-rw-r--r--data/themes/Makefile.am19
-rw-r--r--elementary.pc.in4
-rw-r--r--src/bin/Makefile.am6
-rw-r--r--src/lib/Elementary.h.in (renamed from src/lib/Elementary.h)42
-rw-r--r--src/lib/Makefile.am16
-rw-r--r--src/lib/elm_bg.c2
-rw-r--r--src/lib/elm_main.c18
-rw-r--r--src/lib/elm_priv.h10
-rw-r--r--src/lib/elm_win.c6
-rw-r--r--src/lib/els_pan.c2
12 files changed, 180 insertions, 48 deletions
diff --git a/configure.in b/configure.in
index 801eee626..967552a40 100644
--- a/configure.in
+++ b/configure.in
@@ -4,6 +4,8 @@ rm -f config.cache
4AC_INIT(elementary, 0.1.0.0, enlightenment-devel@lists.sourceforge.net) 4AC_INIT(elementary, 0.1.0.0, enlightenment-devel@lists.sourceforge.net)
5AC_PREREQ(2.52) 5AC_PREREQ(2.52)
6AC_CONFIG_SRCDIR(configure.in) 6AC_CONFIG_SRCDIR(configure.in)
7AC_CANONICAL_BUILD
8AC_CANONICAL_HOST
7 9
8AM_INIT_AUTOMAKE(1.6 dist-bzip2) 10AM_INIT_AUTOMAKE(1.6 dist-bzip2)
9AM_CONFIG_HEADER(elementary_config.h) 11AM_CONFIG_HEADER(elementary_config.h)
@@ -28,39 +30,82 @@ VMIC=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $3);}'`
28SNAP=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $4);}'` 30SNAP=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $4);}'`
29version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN" 31version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN"
30AC_SUBST(version_info) 32AC_SUBST(version_info)
33
31PKG_PROG_PKG_CONFIG 34PKG_PROG_PKG_CONFIG
32 35
33PKG_CHECK_MODULES([ELEMENTARY], [ 36lt_enable_auto_import=""
34 eina-0 37ELM_UNIX_DEF="#undef"
35 eet 38ELM_WIN32_DEF="#undef"
36 evas 39ELM_WINCE_DEF="#undef"
37 ecore 40case "$host_os" in
38 ecore-evas 41 mingw32* | cegcc*)
39 ecore-job 42 PKG_CHECK_MODULES([EVIL], [evil])
40 ecore-txt 43 AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed.])
41 ecore-file 44 dnl needed for correct definition of EAPI
42 edje 45 AC_DEFINE(ELEMENTARY_BUILD, 1, [Define to mention that evas is built])
43 edbus 46 lt_enable_auto_import="-Wl,--enable-auto-import"
44 ]) 47 ELM_WINCE_DEF="#define"
48 ;;
49 mingw*)
50 PKG_CHECK_MODULES([EVIL], [evil])
51 AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed.])
52 dnl needed for correct definition of EAPI
53 AC_DEFINE(ELEMENTARY_BUILD, 1, [Define to mention that evas is built])
54 lt_enable_auto_import="-Wl,--enable-auto-import"
55 ELM_WIN32_DEF="#define"
56 ;;
57 *)
58 ELM_UNIX_DEF="#define"
59 ;;
60esac
61AC_SUBST(lt_enable_auto_import)
62AC_SUBST(ELM_UNIX_DEF)
63AC_SUBST(ELM_WIN32_DEF)
64AC_SUBST(ELM_WINCE_DEF)
45 65
46have_elementary_x="no" 66PKG_CHECK_MODULES([ELEMENTARY],
47PKG_CHECK_MODULES([ELEMENTARY_X], [ecore-x], [ 67 [
48 AC_DEFINE(HAVE_ELEMENTARY_X, 1, [X11 support for Elementary]) 68 eina-0
49 have_elementary_x="yes" 69 eet
50 ], [ 70 evas
51 have_elementary_x="no" 71 ecore
52 ]) 72 ecore-evas
73 ecore-job
74 ecore-txt
75 ecore-file
76 edje
77 ]
78)
53 79
54AC_SUBST(ELEMENTARY_X_CFLAGS) 80have_elementary_x="no"
55AC_SUBST(ELEMENTARY_X_LIBS) 81PKG_CHECK_MODULES([ELEMENTARY_X],
82 [ecore-x],
83 [
84 AC_DEFINE(HAVE_ELEMENTARY_X, 1, [X11 support for Elementary])
85 have_elementary_x="yes"
86 ],
87 [have_elementary_x="no"]
88)
56 89
57have_elementary_fb="no" 90have_elementary_fb="no"
58PKG_CHECK_MODULES([ELEMENTARY_FB], [ecore-fb], [ 91PKG_CHECK_MODULES([ELEMENTARY_FB],
59 AC_DEFINE(HAVE_ELEMENTARY_FB, 1, [FB support for Elementary]) 92 [ecore-fb],
60 have_elementary_fb="yes" 93 [
61 ], [ 94 AC_DEFINE(HAVE_ELEMENTARY_FB, 1, [FB support for Elementary])
62 have_elementary_fb="no" 95 have_elementary_fb="yes"
63 ]) 96 ],
97 [have_elementary_fb="no"]
98)
99
100have_elementary_wince="no"
101PKG_CHECK_MODULES([ELEMENTARY_WINCE],
102 [ecore-wince],
103 [
104 AC_DEFINE(HAVE_ELEMENTARY_WINCE, 1, [Windows CE support for Elementary])
105 have_elementary_wince="yes"
106 ],
107 [have_elementary_wince="no"]
108)
64 109
65my_libs="-lm" 110my_libs="-lm"
66AC_SUBST(my_libs) 111AC_SUBST(my_libs)
@@ -70,6 +115,7 @@ Makefile
70elementary.pc 115elementary.pc
71src/Makefile 116src/Makefile
72src/lib/Makefile 117src/lib/Makefile
118src/lib/Elementary.h
73src/bin/Makefile 119src/bin/Makefile
74data/Makefile 120data/Makefile
75data/themes/Makefile 121data/themes/Makefile
@@ -93,6 +139,7 @@ echo
93echo "Engines:" 139echo "Engines:"
94echo " X11...........: ${have_elementary_x}" 140echo " X11...........: ${have_elementary_x}"
95echo " Framebuffer...: ${have_elementary_fb}" 141echo " Framebuffer...: ${have_elementary_fb}"
142echo " Windows CE....: ${have_elementary_wince}"
96echo 143echo
97echo "------------------------------------------------------------------------" 144echo "------------------------------------------------------------------------"
98echo 145echo
diff --git a/data/objects/Makefile.am b/data/objects/Makefile.am
index 168440d11..2fc9326e4 100644
--- a/data/objects/Makefile.am
+++ b/data/objects/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
2MAINTAINERCLEANFILES = Makefile.in 2MAINTAINERCLEANFILES = Makefile.in
3 3
4EDJE_CC = edje_cc 4EDJE_CC = edje_cc
5EDJE_FLAGS = -v -id $(top_srcdir)/data -fd $(top_srcdir)/data 5EDJE_FLAGS = -v -id $(top_srcdir)/data/objects -fd $(top_srcdir)/data/objects
6 6
7filesdir = $(datadir)/elementary/objects 7filesdir = $(datadir)/elementary/objects
8 8
diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 1bf15d876..ab6675096 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -68,6 +68,25 @@ outdent-bottom.png \
68updown.png \ 68updown.png \
69leftright.png \ 69leftright.png \
70hoversel_entry_bg.png \ 70hoversel_entry_bg.png \
71cur_box.png \
72cur_hi.png \
73cur_shad.png \
74cur_shine.png \
75cur_glow.png \
76bubble_3.png \
77bubble_shine3.png \
78bubble_4.png \
79bubble_shine4.png \
80bubble_1.png \
81bubble_shine.png \
82bubble_2.png \
83icon_home.png \
84icon_close.png \
85icon_apps.png \
86icon_arrow_up.png \
87icon_arrow_down.png \
88icon_arrow_left.png \
89icon_arrow_right.png \
71bt_dis_shine.png \ 90bt_dis_shine.png \
72icon_left_arrow.png \ 91icon_left_arrow.png \
73icon_right_arrow.png \ 92icon_right_arrow.png \
diff --git a/elementary.pc.in b/elementary.pc.in
index 6ee3ecce2..bc7878322 100644
--- a/elementary.pc.in
+++ b/elementary.pc.in
@@ -8,5 +8,5 @@ Description: Mobile device touchscreen widget library
8Requires: evas ecore ecore-x ecore-evas ecore-job ecore-txt ecore-file eet edje 8Requires: evas ecore ecore-x ecore-evas ecore-job ecore-txt ecore-file eet edje
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -lelementary 10Libs: -L${libdir} -lelementary
11Libs.private: @my_libs@ @ELEMENTARY_LIBS@ @ELEMENTARY_X_LIBS@ @ELEMENTARY_FB_LIBS@ 11Libs.private: @my_libs@ @ELEMENTARY_LIBS@ @ELEMENTARY_X_LIBS@ @ELEMENTARY_FB_LIBS@ @ELEMENTARY_WINCE_LIBS@
12Cflags: -I${includedir} -I${includedir}/elementary @ELEMENTARY_CFLAGS@ @ELEMENTARY_X_CFLAGS@ @ELEMENTARY_FB_CFLAGS@ 12Cflags: -I${includedir} -I${includedir}/elementary @ELEMENTARY_CFLAGS@ @ELEMENTARY_X_CFLAGS@ @ELEMENTARY_FB_CFLAGS@ @ELEMENTARY_WINCE_CFLAGS@
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 5cd5c395c..0ba67d24c 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -7,11 +7,13 @@ AM_CPPFLAGS = \
7-I$(top_srcdir)/src/lib \ 7-I$(top_srcdir)/src/lib \
8-I$(top_srcdir)/src/bin \ 8-I$(top_srcdir)/src/bin \
9-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 9-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
10@ELEMENTARY_CFLAGS@ @ELEMENTARY_X_CFLAGS@ @ELEMENTARY_FB_CFLAGS@ 10@ELEMENTARY_CFLAGS@ \
11@ELEMENTARY_X_CFLAGS@ \
12@ELEMENTARY_FB_CFLAGS@ \
13@ELEMENTARY_WINCE_CFLAGS@
11 14
12bin_PROGRAMS = elementary_test 15bin_PROGRAMS = elementary_test
13 16
14elementary_test_SOURCES = test.c 17elementary_test_SOURCES = test.c
15elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la 18elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la
16elementary_test_LDFLAGS = 19elementary_test_LDFLAGS =
17elementary_test_DEPENDENCIES = $(top_builddir)/src/lib/libelementary.la
diff --git a/src/lib/Elementary.h b/src/lib/Elementary.h.in
index 1c04f7302..16fc2cfd7 100644
--- a/src/lib/Elementary.h
+++ b/src/lib/Elementary.h.in
@@ -16,6 +16,10 @@
16 * 16 *
17 */ 17 */
18 18
19@ELM_UNIX_DEF@ ELM_UNIX
20@ELM_WIN32_DEF@ ELM_WIN32
21@ELM_WINCE_DEF@ ELM_WINCE
22
19/* Standard headers for standard system calls etc. */ 23/* Standard headers for standard system calls etc. */
20#include <stdio.h> 24#include <stdio.h>
21#include <stdlib.h> 25#include <stdlib.h>
@@ -51,6 +55,34 @@
51#include <Ecore_File.h> 55#include <Ecore_File.h>
52#include <Edje.h> 56#include <Edje.h>
53 57
58
59#ifdef EAPI
60# undef EAPI
61#endif
62
63#ifdef _WIN32
64# ifdef ELEMENTARY_BUILD
65# ifdef DLL_EXPORT
66# define EAPI __declspec(dllexport)
67# else
68# define EAPI
69# endif /* ! DLL_EXPORT */
70# else
71# define EAPI __declspec(dllimport)
72# endif /* ! EFL_EVAS_BUILD */
73#else
74# ifdef __GNUC__
75# if __GNUC__ >= 4
76# define EAPI __attribute__ ((visibility("default")))
77# else
78# define EAPI
79# endif
80# else
81# define EAPI
82# endif
83#endif /* ! _WIN32 */
84
85
54/* allow usage from c++ */ 86/* allow usage from c++ */
55#ifdef __cplusplus 87#ifdef __cplusplus
56extern "C" { 88extern "C" {
@@ -315,8 +347,8 @@ extern "C" {
315 typedef enum _Elm_Icon_Type 347 typedef enum _Elm_Icon_Type
316 { 348 {
317 ELM_ICON_NONE, 349 ELM_ICON_NONE,
318 ELM_ICON_FILE, 350 ELM_ICON_FILE,
319 ELM_ICON_STANDARD 351 ELM_ICON_STANDARD
320 } Elm_Icon_Type; 352 } Elm_Icon_Type;
321 typedef struct _Elm_Hoversel_Item Elm_Hoversel_Item; 353 typedef struct _Elm_Hoversel_Item Elm_Hoversel_Item;
322 EAPI Evas_Object *elm_hoversel_add(Evas_Object *parent); 354 EAPI Evas_Object *elm_hoversel_add(Evas_Object *parent);
@@ -326,13 +358,17 @@ extern "C" {
326 EAPI void elm_hoversel_hover_end(Evas_Object *obj); 358 EAPI void elm_hoversel_hover_end(Evas_Object *obj);
327 EAPI Elm_Hoversel_Item *elm_hoversel_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data); 359 EAPI Elm_Hoversel_Item *elm_hoversel_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
328 EAPI void elm_hoversel_item_del(Elm_Hoversel_Item *item); 360 EAPI void elm_hoversel_item_del(Elm_Hoversel_Item *item);
329 361 /* smart callbacks called:
362 */
363
330 typedef struct _Elm_Toolbar_Item Elm_Toolbar_Item; 364 typedef struct _Elm_Toolbar_Item Elm_Toolbar_Item;
331 EAPI Evas_Object *elm_toolbar_add(Evas_Object *parent); 365 EAPI Evas_Object *elm_toolbar_add(Evas_Object *parent);
332 EAPI Elm_Toolbar_Item *elm_toolbar_item_add(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data); 366 EAPI Elm_Toolbar_Item *elm_toolbar_item_add(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
333 EAPI void elm_toolbar_item_del(Elm_Toolbar_Item *item); 367 EAPI void elm_toolbar_item_del(Elm_Toolbar_Item *item);
334 EAPI void elm_toolbar_item_select(Elm_Toolbar_Item *item); 368 EAPI void elm_toolbar_item_select(Elm_Toolbar_Item *item);
335 EAPI void elm_toolbar_scrollable_set(Evas_Object *obj, Evas_Bool scrollable); 369 EAPI void elm_toolbar_scrollable_set(Evas_Object *obj, Evas_Bool scrollable);
370 /* smart callbacks called:
371 */
336 372
337 //////////////////////////////////////////////////////////////////////////// 373 ////////////////////////////////////////////////////////////////////////////
338 /// FIXME: TODO LIST /////////////////////////////////////////////////////// 374 /// FIXME: TODO LIST ///////////////////////////////////////////////////////
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 98b33cfdb..d9d2e0890 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -7,7 +7,10 @@ AM_CPPFLAGS = \
7-I$(top_srcdir) \ 7-I$(top_srcdir) \
8-I$(top_srcdir)/src/lib \ 8-I$(top_srcdir)/src/lib \
9-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 9-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
10@ELEMENTARY_CFLAGS@ @ELEMENTARY_X_CFLAGS@ @ELEMENTARY_FB_CFLAGS@ 10@ELEMENTARY_CFLAGS@ \
11@ELEMENTARY_X_CFLAGS@ \
12@ELEMENTARY_FB_CFLAGS@ \
13@ELEMENTARY_WINCE_CFLAGS@
11 14
12lib_LTLIBRARIES = libelementary.la 15lib_LTLIBRARIES = libelementary.la
13 16
@@ -54,11 +57,6 @@ els_icon.c \
54els_icon.h 57els_icon.h
55 58
56 59
57libelementary_la_CFLAGS = 60libelementary_la_CFLAGS =
58libelementary_la_LIBADD = @my_libs@ @ELEMENTARY_LIBS@ @ELEMENTARY_X_LIBS@ @ELEMENTARY_FB_LIBS@ 61libelementary_la_LIBADD = @ELEMENTARY_LIBS@ @ELEMENTARY_X_LIBS@ @ELEMENTARY_FB_LIBS@ @ELEMENTARY_WINCE_LIBS@ @my_libs@
59libelementary_la_LDFLAGS = -version-info @version_info@ 62libelementary_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
60libelementary_la_DEPENDENCIES = $(top_builddir)/elementary_config.h
61
62clean-local:
63 @rm -rf *.gcno
64
diff --git a/src/lib/elm_bg.c b/src/lib/elm_bg.c
index 299ebfd6d..5996d3404 100644
--- a/src/lib/elm_bg.c
+++ b/src/lib/elm_bg.c
@@ -1,3 +1,5 @@
1#include <string.h>
2
1#include <Elementary.h> 3#include <Elementary.h>
2#include "elm_priv.h" 4#include "elm_priv.h"
3 5
diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index 28133fe57..325f9a651 100644
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -1,3 +1,11 @@
1#ifdef HAVE_CONFIG_H
2# include "elementary_config.h"
3#endif
4
5#ifdef HAVE_EVIL
6# include <Evil.h>
7#endif
8
1#include <Elementary.h> 9#include <Elementary.h>
2#include "elm_priv.h" 10#include "elm_priv.h"
3 11
@@ -107,6 +115,10 @@ elm_init(int argc, char **argv)
107 (!strcasecmp(elm_engine, "opengl-x11")) || 115 (!strcasecmp(elm_engine, "opengl-x11")) ||
108 (!strcasecmp(elm_engine, "opengl_x11"))) 116 (!strcasecmp(elm_engine, "opengl_x11")))
109 _elm_config->engine = ELM_OPENGL_X11; 117 _elm_config->engine = ELM_OPENGL_X11;
118 else if ((!strcasecmp(elm_engine, "wince-fb")) ||
119 (!strcasecmp(elm_engine, "software-16-wince-fb")) ||
120 (!strcasecmp(elm_engine, "software_16_wince_fb")))
121 _elm_config->engine = ELM_SOFTWARE_16_WINCE;
110 } 122 }
111 123
112 _elm_config->thumbscroll_enable = 1; 124 _elm_config->thumbscroll_enable = 1;
@@ -121,7 +133,8 @@ elm_init(int argc, char **argv)
121 if ((_elm_config->engine == ELM_SOFTWARE_X11) || 133 if ((_elm_config->engine == ELM_SOFTWARE_X11) ||
122 (_elm_config->engine == ELM_SOFTWARE_16_X11) || 134 (_elm_config->engine == ELM_SOFTWARE_16_X11) ||
123 (_elm_config->engine == ELM_XRENDER_X11) || 135 (_elm_config->engine == ELM_XRENDER_X11) ||
124 (_elm_config->engine == ELM_OPENGL_X11)) 136 (_elm_config->engine == ELM_OPENGL_X11) ||
137 (_elm_config->engine == ELM_SOFTWARE_16_WINCE))
125 { 138 {
126#ifdef HAVE_ELEMENTARY_X 139#ifdef HAVE_ELEMENTARY_X
127 int val = 1000; 140 int val = 1000;
@@ -179,7 +192,8 @@ elm_shutdown(void)
179 if ((_elm_config->engine == ELM_SOFTWARE_X11) || 192 if ((_elm_config->engine == ELM_SOFTWARE_X11) ||
180 (_elm_config->engine == ELM_SOFTWARE_16_X11) || 193 (_elm_config->engine == ELM_SOFTWARE_16_X11) ||
181 (_elm_config->engine == ELM_XRENDER_X11) || 194 (_elm_config->engine == ELM_XRENDER_X11) ||
182 (_elm_config->engine == ELM_OPENGL_X11)) 195 (_elm_config->engine == ELM_OPENGL_X11) ||
196 (_elm_config->engine == ELM_SOFTWARE_16_WINCE))
183 { 197 {
184#ifdef HAVE_ELEMENTARY_X 198#ifdef HAVE_ELEMENTARY_X
185 ecore_event_handler_del(_elm_event_property_change); 199 ecore_event_handler_del(_elm_event_property_change);
diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h
index fe38b76d6..17fb9bb40 100644
--- a/src/lib/elm_priv.h
+++ b/src/lib/elm_priv.h
@@ -1,7 +1,9 @@
1#ifndef ELM_PRIV_H 1#ifndef ELM_PRIV_H
2#define ELM_PRIV_H 2#define ELM_PRIV_H
3 3
4#include "elementary_config.h" 4#ifdef HAVE_CONFIG_H
5# include "elementary_config.h"
6#endif
5 7
6#ifdef HAVE_ELEMENTARY_X 8#ifdef HAVE_ELEMENTARY_X
7#include <Ecore_X.h> 9#include <Ecore_X.h>
@@ -9,6 +11,9 @@
9#ifdef HAVE_ELEMENTARY_FB 11#ifdef HAVE_ELEMENTARY_FB
10#include <Ecore_Fb.h> 12#include <Ecore_Fb.h>
11#endif 13#endif
14#ifdef HAVE_ELEMENTARY_WINCE
15/* #include <Ecore_WinCE.h> */
16#endif
12#ifdef HAVE_ALLOCA_H 17#ifdef HAVE_ALLOCA_H
13#include <alloca.h> 18#include <alloca.h>
14#endif 19#endif
@@ -27,7 +32,8 @@ typedef enum _Elm_Engine
27 ELM_SOFTWARE_FB, 32 ELM_SOFTWARE_FB,
28 ELM_SOFTWARE_16_X11, 33 ELM_SOFTWARE_16_X11,
29 ELM_XRENDER_X11, 34 ELM_XRENDER_X11,
30 ELM_OPENGL_X11 35 ELM_OPENGL_X11,
36 ELM_SOFTWARE_16_WINCE
31} Elm_Engine; 37} Elm_Engine;
32 38
33typedef struct _Elm_Config Elm_Config; 39typedef struct _Elm_Config Elm_Config;
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 3309ab9fc..2649a40a3 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -83,6 +83,7 @@ _elm_win_obj_intercept_resize(void *data, Evas_Object *obj, Evas_Coord w, Evas_C
83 switch (_elm_config->engine) 83 switch (_elm_config->engine)
84 { 84 {
85 case ELM_SOFTWARE_FB: 85 case ELM_SOFTWARE_FB:
86 case ELM_SOFTWARE_16_WINCE:
86 break; 87 break;
87 case ELM_SOFTWARE_X11: 88 case ELM_SOFTWARE_X11:
88 case ELM_SOFTWARE_16_X11: 89 case ELM_SOFTWARE_16_X11:
@@ -245,6 +246,7 @@ _elm_win_xwindow_get(Elm_Win *win)
245 if (win->ee) win->xwin = ecore_evas_software_x11_window_get(win->ee); 246 if (win->ee) win->xwin = ecore_evas_software_x11_window_get(win->ee);
246 break; 247 break;
247 case ELM_SOFTWARE_FB: 248 case ELM_SOFTWARE_FB:
249 case ELM_SOFTWARE_16_WINCE:
248 break; 250 break;
249 case ELM_SOFTWARE_16_X11: 251 case ELM_SOFTWARE_16_X11:
250 if (win->ee) win->xwin = ecore_evas_software_x11_16_window_get(win->ee); 252 if (win->ee) win->xwin = ecore_evas_software_x11_16_window_get(win->ee);
@@ -393,6 +395,9 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
393 case ELM_OPENGL_X11: 395 case ELM_OPENGL_X11:
394 win->ee = ecore_evas_gl_x11_new(NULL, 0, 0, 0, 1, 1); 396 win->ee = ecore_evas_gl_x11_new(NULL, 0, 0, 0, 1, 1);
395 break; 397 break;
398 case ELM_SOFTWARE_16_WINCE:
399 win->ee = ecore_evas_software_wince_fb_new(NULL, 0, 0, 1, 1);
400 break;
396 default: 401 default:
397 break; 402 break;
398 } 403 }
@@ -454,6 +459,7 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
454 459
455 switch (_elm_config->engine) 460 switch (_elm_config->engine)
456 { 461 {
462 case ELM_SOFTWARE_16_WINCE:
457 case ELM_SOFTWARE_FB: 463 case ELM_SOFTWARE_FB:
458 ecore_evas_fullscreen_set(win->ee, 1); 464 ecore_evas_fullscreen_set(win->ee, 1);
459 break; 465 break;
diff --git a/src/lib/els_pan.c b/src/lib/els_pan.c
index b63420a56..d686faeca 100644
--- a/src/lib/els_pan.c
+++ b/src/lib/els_pan.c
@@ -1,3 +1,5 @@
1#include <string.h>
2
1#include <Elementary.h> 3#include <Elementary.h>
2#include "elm_priv.h" 4#include "elm_priv.h"
3 5