forked from enlightenment/efl
evas: cleanup headers. Should work on windows.
This commit is contained in:
parent
67df5b4ad1
commit
e888a07c0a
|
@ -253,6 +253,8 @@
|
||||||
/* This include has been added to support Eo in Evas */
|
/* This include has been added to support Eo in Evas */
|
||||||
#include <Eo.h>
|
#include <Eo.h>
|
||||||
|
|
||||||
|
#include <Evas_Loader.h>
|
||||||
|
|
||||||
#ifdef EAPI
|
#ifdef EAPI
|
||||||
# undef EAPI
|
# undef EAPI
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -536,20 +536,6 @@ typedef enum _Evas_Border_Fill_Mode
|
||||||
EVAS_BORDER_FILL_SOLID = 2 /**< Image's center region is to be made solid, even if it has transparency on it */
|
EVAS_BORDER_FILL_SOLID = 2 /**< Image's center region is to be made solid, even if it has transparency on it */
|
||||||
} Evas_Border_Fill_Mode; /**< How an image's center region (the complement to the border region) should be rendered by Evas */
|
} Evas_Border_Fill_Mode; /**< How an image's center region (the complement to the border region) should be rendered by Evas */
|
||||||
|
|
||||||
typedef enum _Evas_Image_Scale_Hint
|
|
||||||
{
|
|
||||||
EVAS_IMAGE_SCALE_HINT_NONE = 0, /**< No scale hint at all */
|
|
||||||
EVAS_IMAGE_SCALE_HINT_DYNAMIC = 1, /**< Image is being re-scaled over time, thus turning scaling cache @b off for its data */
|
|
||||||
EVAS_IMAGE_SCALE_HINT_STATIC = 2 /**< Image is not being re-scaled over time, thus turning scaling cache @b on for its data */
|
|
||||||
} Evas_Image_Scale_Hint; /**< How an image's data is to be treated by Evas, with regard to scaling cache */
|
|
||||||
|
|
||||||
typedef enum _Evas_Image_Animated_Loop_Hint
|
|
||||||
{
|
|
||||||
EVAS_IMAGE_ANIMATED_HINT_NONE = 0,
|
|
||||||
EVAS_IMAGE_ANIMATED_HINT_LOOP = 1, /**< Image's animation mode is loop like 1->2->3->1->2->3 */
|
|
||||||
EVAS_IMAGE_ANIMATED_HINT_PINGPONG = 2 /**< Image's animation mode is pingpong like 1->2->3->2->1-> ... */
|
|
||||||
} Evas_Image_Animated_Loop_Hint;
|
|
||||||
|
|
||||||
typedef enum _Evas_Engine_Render_Mode
|
typedef enum _Evas_Engine_Render_Mode
|
||||||
{
|
{
|
||||||
EVAS_RENDER_MODE_BLOCKING = 0,
|
EVAS_RENDER_MODE_BLOCKING = 0,
|
||||||
|
|
|
@ -1,21 +1,5 @@
|
||||||
#include <Eo.h>
|
#include <Eo.h>
|
||||||
|
|
||||||
#ifdef _WIN32
|
|
||||||
# ifdef EAPI
|
|
||||||
# undef EAPI
|
|
||||||
# endif
|
|
||||||
# ifdef EFL_EVAS_BUILD
|
|
||||||
# ifdef DLL_EXPORT
|
|
||||||
# define EAPI __declspec(dllexport)
|
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# endif /* ! DLL_EXPORT */
|
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# endif /* ! EFL_EVAS_BUILD */
|
|
||||||
#else
|
|
||||||
#endif /* ! _WIN32 */
|
|
||||||
|
|
||||||
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_IN;
|
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_IN;
|
||||||
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_OUT;
|
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_OUT;
|
||||||
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_DOWN;
|
EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_DOWN;
|
||||||
|
|
|
@ -1,13 +1,25 @@
|
||||||
#ifndef _EVAS_LOADER_H
|
#ifndef _EVAS_LOADER_H
|
||||||
#define _EVAS_LOADER_H
|
#define _EVAS_LOADER_H
|
||||||
|
|
||||||
#include <Eina.h>
|
|
||||||
|
|
||||||
typedef struct _Evas_Image_Load_Opts Evas_Image_Load_Opts;
|
typedef struct _Evas_Image_Load_Opts Evas_Image_Load_Opts;
|
||||||
typedef struct _Evas_Image_Animated Evas_Image_Animated;
|
typedef struct _Evas_Image_Animated Evas_Image_Animated;
|
||||||
typedef struct _Evas_Image_Property Evas_Image_Property;
|
typedef struct _Evas_Image_Property Evas_Image_Property;
|
||||||
typedef struct _Evas_Image_Load_Func Evas_Image_Load_Func;
|
typedef struct _Evas_Image_Load_Func Evas_Image_Load_Func;
|
||||||
|
|
||||||
|
typedef enum _Evas_Image_Animated_Loop_Hint
|
||||||
|
{
|
||||||
|
EVAS_IMAGE_ANIMATED_HINT_NONE = 0,
|
||||||
|
EVAS_IMAGE_ANIMATED_HINT_LOOP = 1, /**< Image's animation mode is loop like 1->2->3->1->2->3 */
|
||||||
|
EVAS_IMAGE_ANIMATED_HINT_PINGPONG = 2 /**< Image's animation mode is pingpong like 1->2->3->2->1-> ... */
|
||||||
|
} Evas_Image_Animated_Loop_Hint;
|
||||||
|
|
||||||
|
typedef enum _Evas_Image_Scale_Hint
|
||||||
|
{
|
||||||
|
EVAS_IMAGE_SCALE_HINT_NONE = 0, /**< No scale hint at all */
|
||||||
|
EVAS_IMAGE_SCALE_HINT_DYNAMIC = 1, /**< Image is being re-scaled over time, thus turning scaling cache @b off for its data */
|
||||||
|
EVAS_IMAGE_SCALE_HINT_STATIC = 2 /**< Image is not being re-scaled over time, thus turning scaling cache @b on for its data */
|
||||||
|
} Evas_Image_Scale_Hint; /**< How an image's data is to be treated by Evas, with regard to scaling cache */
|
||||||
|
|
||||||
struct _Evas_Image_Property
|
struct _Evas_Image_Property
|
||||||
{
|
{
|
||||||
unsigned int w;
|
unsigned int w;
|
||||||
|
|
|
@ -1,22 +1,6 @@
|
||||||
#include "evas_common_private.h"
|
#include "evas_common_private.h"
|
||||||
#include "evas_private.h"
|
#include "evas_private.h"
|
||||||
|
|
||||||
#ifdef _WIN32
|
|
||||||
# ifdef EAPI
|
|
||||||
# undef EAPI
|
|
||||||
# endif
|
|
||||||
# ifdef EFL_EVAS_BUILD
|
|
||||||
# ifdef DLL_EXPORT
|
|
||||||
# define EAPI __declspec(dllexport)
|
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# endif /* ! DLL_EXPORT */
|
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# endif /* ! EFL_EVAS_BUILD */
|
|
||||||
#else
|
|
||||||
#endif /* ! _WIN32 */
|
|
||||||
|
|
||||||
int _evas_event_counter = 0;
|
int _evas_event_counter = 0;
|
||||||
|
|
||||||
EVAS_MEMPOOL(_mp_pc);
|
EVAS_MEMPOOL(_mp_pc);
|
||||||
|
|
|
@ -50,7 +50,6 @@
|
||||||
#include <Eina.h>
|
#include <Eina.h>
|
||||||
#include "Evas.h"
|
#include "Evas.h"
|
||||||
//#include "Evas_GL.h"
|
//#include "Evas_GL.h"
|
||||||
#include "Evas_Loader.h"
|
|
||||||
|
|
||||||
#ifndef HAVE_LROUND
|
#ifndef HAVE_LROUND
|
||||||
/* right now i dont care about rendering bugs on platforms without lround
|
/* right now i dont care about rendering bugs on platforms without lround
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
#include <eina_safety_checks.h>
|
#include <eina_safety_checks.h>
|
||||||
|
|
||||||
#include "Evas.h"
|
#include "Evas.h"
|
||||||
#include "Evas_Loader.h"
|
|
||||||
|
|
||||||
#include "../file/evas_module.h"
|
#include "../file/evas_module.h"
|
||||||
#include "../file/evas_path.h"
|
#include "../file/evas_path.h"
|
||||||
|
|
Loading…
Reference in New Issue