forked from enlightenment/efl
dont need bits code.. that will go in another lib - higher level than a canvas
item IMHO SVN revision: 3110
This commit is contained in:
parent
fc068cdd82
commit
bcb7bcea6c
|
@ -45,13 +45,13 @@ AC_SUBST(x_ldflags)
|
|||
AC_SUBST(x_libs)
|
||||
|
||||
#### Find out about E db
|
||||
AC_CHECK_HEADER(Edb.h,
|
||||
AC_CHECK_LIB(edb, e_db_open, ,[
|
||||
echo ""
|
||||
echo "ERROR: E db needed"
|
||||
echo ""
|
||||
AC_MSG_ERROR([Fatal Error: no E db detected.]); exit], -L/usr/local/lib -ldb)
|
||||
)
|
||||
#AC_CHECK_HEADER(Edb.h,
|
||||
#AC_CHECK_LIB(edb, e_db_open, ,[
|
||||
#echo ""
|
||||
#echo "ERROR: E db needed"
|
||||
#echo ""
|
||||
#AC_MSG_ERROR([Fatal Error: no E db detected.]); exit], -L/usr/local/lib -ldb)
|
||||
#)
|
||||
|
||||
#### Find out about Imlib2
|
||||
AC_CHECK_HEADER(Imlib2.h,
|
||||
|
|
|
@ -22,7 +22,6 @@ typedef struct _Evas_Object_Text * Evas_Object_Text;
|
|||
typedef struct _Evas_Object_Rectangle * Evas_Object_Rectangle;
|
||||
typedef struct _Evas_Object_Line * Evas_Object_Line;
|
||||
typedef struct _Evas_Object_Gradient_Box * Evas_Object_Gradient_Box;
|
||||
typedef struct _Evas_Object_Bits * Evas_Object_Bits;
|
||||
|
||||
#define RENDER_METHOD_ALPHA_SOFTWARE 0
|
||||
#define RENDER_METHOD_BASIC_HARDWARE 1
|
||||
|
@ -45,8 +44,6 @@ typedef struct _Evas_Object_Bits * Evas_Object_Bits;
|
|||
#define OBJECT_RECTANGLE 1232
|
||||
#define OBJECT_LINE 1233
|
||||
#define OBJECT_GRADIENT_BOX 1234
|
||||
#define OBJECT_BITS 1235
|
||||
|
||||
|
||||
struct _Evas_Render_Data
|
||||
{
|
||||
|
@ -198,14 +195,6 @@ struct _Evas_Object_Gradient_Box
|
|||
} current, previous;
|
||||
};
|
||||
|
||||
struct _Evas_Object_Bits
|
||||
{
|
||||
struct _Evas_Object_Any object;
|
||||
struct {
|
||||
char *file;
|
||||
} current, previous;
|
||||
};
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
@ -241,13 +230,11 @@ Evas_Object evas_add_text(Evas e, char *font, int size, char *text);
|
|||
Evas_Object evas_add_rectangle(Evas e, int r, int g, int b, int a);
|
||||
Evas_Object evas_add_line(Evas e, int r, int g, int b, int a);
|
||||
Evas_Object evas_add_gradient_box(Evas e);
|
||||
Evas_Object evas_add_bits(Evas e, char *file);
|
||||
|
||||
/* set object settings */
|
||||
void evas_set_image_file(Evas e, Evas_Object o, char *file);
|
||||
void evas_set_image_data(Evas e, Evas_Object o, void *data, Evas_Image_Format format, int w, int h);
|
||||
void evas_set_image_fill(Evas e, Evas_Object o, double x, double y, double w, double h);
|
||||
void evas_set_bits_file(Evas e, Evas_Object o, char *file);
|
||||
void evas_set_color(Evas e, Evas_Object o, int r, int g, int b, int a);
|
||||
void evas_set_gradient(Evas e, Evas_Object o, Evas_Gradient grad);
|
||||
void evas_set_angle(Evas e, Evas_Object o, double angle);
|
||||
|
@ -278,12 +265,6 @@ void evas_get_geometry(Evas e, Evas_Object o, double *x, double *y, double *w, d
|
|||
void evas_show(Evas e, Evas_Object o);
|
||||
void evas_hide(Evas e, Evas_Object o);
|
||||
|
||||
/* evas bits ops */
|
||||
void evas_bits_get_padding(Evas e, Evas_Object o, double *l, double *r, double *t, double *b);
|
||||
void evas_bits_get_min(Evas e, Evas_Object o, double *w, double *h);
|
||||
void evas_bits_get_max(Evas e, Evas_Object o, double *w, double *h);
|
||||
void evas_bits_get_classed_bit_geoemtry(Evas e, Evas_Object o, char *class, double *x, double *y, double *w, double *h);
|
||||
|
||||
/* image query ops */
|
||||
void evas_get_image_size(Evas e, Evas_Object o, int *w, int *h);
|
||||
|
||||
|
|
|
@ -30,7 +30,6 @@ include_HEADERS = \
|
|||
Evas.h
|
||||
|
||||
libevas_la_SOURCES = \
|
||||
evas_bits.c \
|
||||
evas_callbacks.c \
|
||||
evas_events.c \
|
||||
evas_gl_routines.c \
|
||||
|
|
|
@ -1,31 +0,0 @@
|
|||
#include "Evas.h"
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
|
||||
Evas_Object
|
||||
evas_add_bits(Evas e, char *file)
|
||||
{
|
||||
}
|
||||
|
||||
/* evas bits ops */
|
||||
void
|
||||
evas_bits_get_padding(Evas e, Evas_Object o, double *l, double *r, double *t, double *b)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
evas_bits_get_min(Evas e, Evas_Object o, double *w, double *h)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
evas_bits_get_max(Evas e, Evas_Object o, double *w, double *h)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
evas_bits_get_classed_bit_geoemtry(Evas e, Evas_Object o, char *class, double *x, double *y, double *w, double *h)
|
||||
{
|
||||
}
|
|
@ -225,15 +225,7 @@ evas_render(Evas e)
|
|||
oo->previous = oo->current;
|
||||
}
|
||||
break;
|
||||
case OBJECT_BITS:
|
||||
{
|
||||
Evas_Object_Bits oo;
|
||||
|
||||
oo = o;
|
||||
if (1)
|
||||
real_change = 1;
|
||||
oo->previous = oo->current;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -452,15 +444,6 @@ evas_render(Evas e)
|
|||
}
|
||||
free(pointsx);
|
||||
free(pointsy);
|
||||
/* func_image_draw(im,
|
||||
e->current.display,
|
||||
e->current.drawable,
|
||||
e->current.drawable_width,
|
||||
e->current.drawable_height,
|
||||
0, 0,
|
||||
func_image_get_width(im),
|
||||
func_image_get_height(im),
|
||||
x, y, w, h);*/
|
||||
func_image_free(im);
|
||||
}
|
||||
}
|
||||
|
@ -493,12 +476,7 @@ evas_render(Evas e)
|
|||
oo = o;
|
||||
}
|
||||
break;
|
||||
case OBJECT_BITS:
|
||||
{
|
||||
Evas_Object_Bits oo;
|
||||
|
||||
oo = o;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue