summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/evas/Evas.h2
-rw-r--r--src/lib/evas/Evas_Common.h14
-rw-r--r--src/lib/evas/Evas_Eo.h16
-rw-r--r--src/lib/evas/Evas_Loader.h16
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c16
-rw-r--r--src/lib/evas/include/evas_common_private.h1
-rw-r--r--src/lib/evas/include/evas_private.h1
7 files changed, 16 insertions, 50 deletions
diff --git a/src/lib/evas/Evas.h b/src/lib/evas/Evas.h
index b20576d2fb..dc4d435712 100644
--- a/src/lib/evas/Evas.h
+++ b/src/lib/evas/Evas.h
@@ -253,6 +253,8 @@
253/* This include has been added to support Eo in Evas */ 253/* This include has been added to support Eo in Evas */
254#include <Eo.h> 254#include <Eo.h>
255 255
256#include <Evas_Loader.h>
257
256#ifdef EAPI 258#ifdef EAPI
257# undef EAPI 259# undef EAPI
258#endif 260#endif
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index 7849548b4a..ba3fc8271c 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -536,20 +536,6 @@ typedef enum _Evas_Border_Fill_Mode
536 EVAS_BORDER_FILL_SOLID = 2 /**< Image's center region is to be made solid, even if it has transparency on it */ 536 EVAS_BORDER_FILL_SOLID = 2 /**< Image's center region is to be made solid, even if it has transparency on it */
537} Evas_Border_Fill_Mode; /**< How an image's center region (the complement to the border region) should be rendered by Evas */ 537} Evas_Border_Fill_Mode; /**< How an image's center region (the complement to the border region) should be rendered by Evas */
538 538
539typedef enum _Evas_Image_Scale_Hint
540{
541 EVAS_IMAGE_SCALE_HINT_NONE = 0, /**< No scale hint at all */
542 EVAS_IMAGE_SCALE_HINT_DYNAMIC = 1, /**< Image is being re-scaled over time, thus turning scaling cache @b off for its data */
543 EVAS_IMAGE_SCALE_HINT_STATIC = 2 /**< Image is not being re-scaled over time, thus turning scaling cache @b on for its data */
544} Evas_Image_Scale_Hint; /**< How an image's data is to be treated by Evas, with regard to scaling cache */
545
546typedef enum _Evas_Image_Animated_Loop_Hint
547{
548 EVAS_IMAGE_ANIMATED_HINT_NONE = 0,
549 EVAS_IMAGE_ANIMATED_HINT_LOOP = 1, /**< Image's animation mode is loop like 1->2->3->1->2->3 */
550 EVAS_IMAGE_ANIMATED_HINT_PINGPONG = 2 /**< Image's animation mode is pingpong like 1->2->3->2->1-> ... */
551} Evas_Image_Animated_Loop_Hint;
552
553typedef enum _Evas_Engine_Render_Mode 539typedef enum _Evas_Engine_Render_Mode
554{ 540{
555 EVAS_RENDER_MODE_BLOCKING = 0, 541 EVAS_RENDER_MODE_BLOCKING = 0,
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 6ea32982b7..9a2fa9213f 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -1,21 +1,5 @@
1#include <Eo.h> 1#include <Eo.h>
2 2
3#ifdef _WIN32
4# ifdef EAPI
5# undef EAPI
6# endif
7# ifdef EFL_EVAS_BUILD
8# ifdef DLL_EXPORT
9# define EAPI __declspec(dllexport)
10# else
11# define EAPI
12# endif /* ! DLL_EXPORT */
13# else
14# define EAPI
15# endif /* ! EFL_EVAS_BUILD */
16#else
17#endif /* ! _WIN32 */
18
19EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_IN; 3EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_IN;
20EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_OUT; 4EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_OUT;
21EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_DOWN; 5EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_DOWN;
diff --git a/src/lib/evas/Evas_Loader.h b/src/lib/evas/Evas_Loader.h
index 4f53b7ddb1..3121139733 100644
--- a/src/lib/evas/Evas_Loader.h
+++ b/src/lib/evas/Evas_Loader.h
@@ -1,13 +1,25 @@
1#ifndef _EVAS_LOADER_H 1#ifndef _EVAS_LOADER_H
2#define _EVAS_LOADER_H 2#define _EVAS_LOADER_H
3 3
4#include <Eina.h>
5
6typedef struct _Evas_Image_Load_Opts Evas_Image_Load_Opts; 4typedef struct _Evas_Image_Load_Opts Evas_Image_Load_Opts;
7typedef struct _Evas_Image_Animated Evas_Image_Animated; 5typedef struct _Evas_Image_Animated Evas_Image_Animated;
8typedef struct _Evas_Image_Property Evas_Image_Property; 6typedef struct _Evas_Image_Property Evas_Image_Property;
9typedef struct _Evas_Image_Load_Func Evas_Image_Load_Func; 7typedef struct _Evas_Image_Load_Func Evas_Image_Load_Func;
10 8
9typedef enum _Evas_Image_Animated_Loop_Hint
10{
11 EVAS_IMAGE_ANIMATED_HINT_NONE = 0,
12 EVAS_IMAGE_ANIMATED_HINT_LOOP = 1, /**< Image's animation mode is loop like 1->2->3->1->2->3 */
13 EVAS_IMAGE_ANIMATED_HINT_PINGPONG = 2 /**< Image's animation mode is pingpong like 1->2->3->2->1-> ... */
14} Evas_Image_Animated_Loop_Hint;
15
16typedef enum _Evas_Image_Scale_Hint
17{
18 EVAS_IMAGE_SCALE_HINT_NONE = 0, /**< No scale hint at all */
19 EVAS_IMAGE_SCALE_HINT_DYNAMIC = 1, /**< Image is being re-scaled over time, thus turning scaling cache @b off for its data */
20 EVAS_IMAGE_SCALE_HINT_STATIC = 2 /**< Image is not being re-scaled over time, thus turning scaling cache @b on for its data */
21} Evas_Image_Scale_Hint; /**< How an image's data is to be treated by Evas, with regard to scaling cache */
22
11struct _Evas_Image_Property 23struct _Evas_Image_Property
12{ 24{
13 unsigned int w; 25 unsigned int w;
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index 9e1e3a8cb0..8dbdfe8cbe 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -1,22 +1,6 @@
1#include "evas_common_private.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4#ifdef _WIN32
5# ifdef EAPI
6# undef EAPI
7# endif
8# ifdef EFL_EVAS_BUILD
9# ifdef DLL_EXPORT
10# define EAPI __declspec(dllexport)
11# else
12# define EAPI
13# endif /* ! DLL_EXPORT */
14# else
15# define EAPI
16# endif /* ! EFL_EVAS_BUILD */
17#else
18#endif /* ! _WIN32 */
19
20int _evas_event_counter = 0; 4int _evas_event_counter = 0;
21 5
22EVAS_MEMPOOL(_mp_pc); 6EVAS_MEMPOOL(_mp_pc);
diff --git a/src/lib/evas/include/evas_common_private.h b/src/lib/evas/include/evas_common_private.h
index f051a72a0a..336b7a6231 100644
--- a/src/lib/evas/include/evas_common_private.h
+++ b/src/lib/evas/include/evas_common_private.h
@@ -50,7 +50,6 @@
50#include <Eina.h> 50#include <Eina.h>
51#include "Evas.h" 51#include "Evas.h"
52//#include "Evas_GL.h" 52//#include "Evas_GL.h"
53#include "Evas_Loader.h"
54 53
55#ifndef HAVE_LROUND 54#ifndef HAVE_LROUND
56/* right now i dont care about rendering bugs on platforms without lround 55/* right now i dont care about rendering bugs on platforms without lround
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index b2f2948810..855a130b0d 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -9,7 +9,6 @@
9#include <eina_safety_checks.h> 9#include <eina_safety_checks.h>
10 10
11#include "Evas.h" 11#include "Evas.h"
12#include "Evas_Loader.h"
13 12
14#include "../file/evas_module.h" 13#include "../file/evas_module.h"
15#include "../file/evas_path.h" 14#include "../file/evas_path.h"