Enlightenment CVS committal
Author : sebastid
Project : e17
Module : libs/esmart
Dir : e17/libs/esmart/src/lib/esmart_container
Modified Files:
Esmart_Container.h esmart_container.c
esmart_container_element.c
Log Message:
EAPI
===================================================================
RCS file: /cvs/e/e17/libs/esmart/src/lib/esmart_container/Esmart_Container.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- Esmart_Container.h 5 Sep 2005 09:55:14 -0000 1.8
+++ Esmart_Container.h 6 Sep 2006 07:17:48 -0000 1.9
@@ -1,6 +1,27 @@
#ifndef ESMART_CONTAINER_H
#define ESMART_CONTAINER_H
+#ifdef EAPI
+#undef EAPI
+#endif
+#ifdef WIN32
+# ifdef BUILDING_DLL
+# define EAPI __declspec(dllexport)
+# else
+# define EAPI __declspec(dllimport)
+# endif
+#else
+# ifdef __GNUC__
+# if __GNUC__ >= 4
+# define EAPI __attribute__ ((visibility("default")))
+# else
+# define EAPI
+# endif
+# else
+# define EAPI
+# endif
+#endif
+
#include <Evas.h>
/*****
@@ -41,73 +62,73 @@
};
typedef enum _Container_Fill_Policy Container_Fill_Policy;
-Evas_Object *esmart_container_new(Evas *evas);
+EAPI Evas_Object *esmart_container_new(Evas *evas);
-void esmart_container_direction_set(Evas_Object *container,
Container_Direction direction);
-Container_Direction esmart_container_direction_get(Evas_Object *container);
+EAPI void esmart_container_direction_set(Evas_Object *container,
Container_Direction direction);
+EAPI Container_Direction esmart_container_direction_get(Evas_Object
*container);
-void esmart_container_padding_set(Evas_Object *container, double l, double r,
- double t, double b);
-void esmart_container_padding_get(Evas_Object *container, double *l, double *r,
- double *t, double *b);
+EAPI void esmart_container_padding_set(Evas_Object *container, double l,
double r,
+ double t, double b);
+EAPI void esmart_container_padding_get(Evas_Object *container, double *l,
double *r,
+ double *t, double *b);
-void esmart_container_fill_policy_set(Evas_Object *container,
- Container_Fill_Policy fill);
-Container_Fill_Policy esmart_container_fill_policy_get(Evas_Object
*container);
+EAPI void esmart_container_fill_policy_set(Evas_Object *container,
+ Container_Fill_Policy fill);
+EAPI Container_Fill_Policy esmart_container_fill_policy_get(Evas_Object
*container);
-void esmart_container_alignment_set(Evas_Object *container,
- Container_Alignment align);
-Container_Alignment esmart_container_alignment_get(Evas_Object *container);
+EAPI void esmart_container_alignment_set(Evas_Object *container,
+ Container_Alignment align);
+EAPI Container_Alignment esmart_container_alignment_get(Evas_Object
*container);
-void esmart_container_spacing_set(Evas_Object *container,
- int spacing);
-int esmart_container_spacing_get(Evas_Object *container);
+EAPI void esmart_container_spacing_set(Evas_Object *container,
+ int spacing);
+EAPI int esmart_container_spacing_get(Evas_Object *container);
-void esmart_container_move_button_set(Evas_Object *container, int move_button);
-int esmart_container_move_button_get(Evas_Object *container);
+EAPI void esmart_container_move_button_set(Evas_Object *container, int
move_button);
+EAPI int esmart_container_move_button_get(Evas_Object *container);
/* element adding/removing */
-void esmart_container_element_append(Evas_Object *container, Evas_Object
*element);
-void esmart_container_element_prepend(Evas_Object *container, Evas_Object
*element);
-void esmart_container_element_append_relative(Evas_Object *container,
- Evas_Object *element,
- Evas_Object *relative);
-void esmart_container_element_prepend_relative(Evas_Object *container,
- Evas_Object *element,
- Evas_Object *relative);
-void esmart_container_element_remove(Evas_Object *container, Evas_Object
*element);
-void esmart_container_element_destroy(Evas_Object *container, Evas_Object
*element);
-void esmart_container_empty (Evas_Object *container);
-void esmart_container_sort(Evas_Object *container, int (*func)(Evas_Object *,
Evas_Object *));
+EAPI void esmart_container_element_append(Evas_Object *container, Evas_Object
*element);
+EAPI void esmart_container_element_prepend(Evas_Object *container, Evas_Object
*element);
+EAPI void esmart_container_element_append_relative(Evas_Object *container,
+ Evas_Object *element,
+ Evas_Object *relative);
+EAPI void esmart_container_element_prepend_relative(Evas_Object *container,
+ Evas_Object *element,
+ Evas_Object *relative);
+EAPI void esmart_container_element_remove(Evas_Object *container, Evas_Object
*element);
+EAPI void esmart_container_element_destroy(Evas_Object *container, Evas_Object
*element);
+EAPI void esmart_container_empty (Evas_Object *container);
+EAPI void esmart_container_sort(Evas_Object *container, int
(*func)(Evas_Object *, Evas_Object *));
-Evas_List *esmart_container_elements_get(Evas_Object *container);
+EAPI Evas_List *esmart_container_elements_get(Evas_Object *container);
/* scrolling */
-void esmart_container_scroll_start(Evas_Object *container, double velocity);
-void esmart_container_scroll_stop(Evas_Object *container);
-void esmart_container_scroll(Evas_Object *container, int val);
-
-void esmart_container_scroll_offset_set(Evas_Object *container, int val);
-int esmart_container_scroll_offset_get(Evas_Object *container);
-void esmart_container_scroll_percent_set(Evas_Object *container, double
percent);
-double esmart_container_scroll_percent_get(Evas_Object *container);
-void esmart_container_scroll_to(Evas_Object *container, Evas_Object
*element);
+EAPI void esmart_container_scroll_start(Evas_Object *container, double
velocity);
+EAPI void esmart_container_scroll_stop(Evas_Object *container);
+EAPI void esmart_container_scroll(Evas_Object *container, int val);
+
+EAPI void esmart_container_scroll_offset_set(Evas_Object *container, int
val);
+EAPI int esmart_container_scroll_offset_get(Evas_Object *container);
+EAPI void esmart_container_scroll_percent_set(Evas_Object *container, double
percent);
+EAPI double esmart_container_scroll_percent_get(Evas_Object *container);
+EAPI void esmart_container_scroll_to(Evas_Object *container, Evas_Object
*element);
/* callbacks */
-void esmart_container_callback_order_change_set(Evas_Object *obj,
- void (*func)(void *data),
- void *data);
+EAPI void esmart_container_callback_order_change_set(Evas_Object *obj,
+ void (*func)(void *data),
+ void *data);
-double esmart_container_elements_length_get(Evas_Object *container);
-double esmart_container_elements_orig_length_get(Evas_Object *container);
+EAPI double esmart_container_elements_length_get(Evas_Object *container);
+EAPI double esmart_container_elements_orig_length_get(Evas_Object *container);
-int esmart_container_layout_plugin_set(Evas_Object *container, const char
*name);
+EAPI int esmart_container_layout_plugin_set(Evas_Object *container, const char
*name);
#ifdef __cplusplus
===================================================================
RCS file: /cvs/e/e17/libs/esmart/src/lib/esmart_container/esmart_container.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- esmart_container.c 14 Jan 2006 15:29:13 -0000 1.14
+++ esmart_container.c 6 Sep 2006 07:17:48 -0000 1.15
@@ -30,7 +30,8 @@
return _sort_func(o, oo);
}
-void esmart_container_sort(Evas_Object *container, int (*func)(Evas_Object *,
Evas_Object *))
+EAPI void
+esmart_container_sort(Evas_Object *container, int (*func)(Evas_Object *,
Evas_Object *))
{
Container *cont;
@@ -47,7 +48,8 @@
_container_elements_fix(cont);
}
-void esmart_container_direction_set(Evas_Object *container,
Container_Direction direction)
+EAPI void
+esmart_container_direction_set(Evas_Object *container, Container_Direction
direction)
{
Container *cont;
@@ -60,7 +62,8 @@
_container_elements_fix(cont);
}
-Container_Direction esmart_container_direction_get(Evas_Object *container)
+EAPI Container_Direction
+esmart_container_direction_get(Evas_Object *container)
{
Container *cont;
@@ -70,7 +73,8 @@
return cont->direction;
}
-void esmart_container_padding_set(Evas_Object *container, double l, double r,
+EAPI void
+esmart_container_padding_set(Evas_Object *container, double l, double r,
double t, double b)
{
Container *cont;
@@ -92,7 +96,8 @@
_container_elements_fix(cont);
}
-void esmart_container_padding_get(Evas_Object *container, double *l, double *r,
+EAPI void
+esmart_container_padding_get(Evas_Object *container, double *l, double *r,
double *t, double *b)
{
Container *cont;
@@ -105,7 +110,8 @@
if (b) *b = cont->padding.b;
}
-void esmart_container_scroll(Evas_Object *container, int val)
+EAPI void
+esmart_container_scroll(Evas_Object *container, int val)
{
Container *cont;
double size, length, pad, max_scroll;
@@ -137,7 +143,8 @@
_container_elements_fix(cont);
}
-void esmart_container_scroll_offset_set(Evas_Object *container, int
scroll_offset)
+EAPI void
+esmart_container_scroll_offset_set(Evas_Object *container, int scroll_offset)
{
Container *cont;
@@ -150,7 +157,8 @@
_container_elements_fix(cont);
}
-int esmart_container_scroll_offset_get(Evas_Object *container)
+EAPI int
+esmart_container_scroll_offset_get(Evas_Object *container)
{
Container *cont;
@@ -160,7 +168,8 @@
}
-void esmart_container_alignment_set(Evas_Object *container,
+EAPI void
+esmart_container_alignment_set(Evas_Object *container,
Container_Alignment align)
{
Container *cont;
@@ -176,7 +185,8 @@
}
-Container_Alignment esmart_container_alignment_get(Evas_Object *container)
+EAPI Container_Alignment
+esmart_container_alignment_get(Evas_Object *container)
{
Container *cont;
@@ -186,8 +196,9 @@
return cont->align;
}
-void esmart_container_fill_policy_set(Evas_Object *container,
- Container_Fill_Policy fill)
+EAPI void
+esmart_container_fill_policy_set(Evas_Object *container,
+ Container_Fill_Policy fill)
{
Container *cont;
@@ -203,7 +214,8 @@
}
-Container_Fill_Policy esmart_container_fill_policy_get(Evas_Object *container)
+EAPI Container_Fill_Policy
+esmart_container_fill_policy_get(Evas_Object *container)
{
Container *cont;
@@ -213,7 +225,8 @@
return cont->fill;
}
-void esmart_container_spacing_set(Evas_Object *container, int spacing)
+EAPI void
+esmart_container_spacing_set(Evas_Object *container, int spacing)
{
Container *cont;
@@ -226,7 +239,8 @@
_container_elements_fix(cont);
}
-int esmart_container_spacing_get(Evas_Object *container)
+EAPI int
+esmart_container_spacing_get(Evas_Object *container)
{
Container *cont;
@@ -236,7 +250,8 @@
return cont->spacing;
}
-void esmart_container_move_button_set(Evas_Object *container, int move_button)
+EAPI void
+esmart_container_move_button_set(Evas_Object *container, int move_button)
{
Container *cont;
@@ -248,7 +263,8 @@
cont->move_button = move_button;
}
-int esmart_container_move_button_get(Evas_Object *container)
+EAPI int
+esmart_container_move_button_get(Evas_Object *container)
{
Container *cont;
@@ -258,7 +274,8 @@
return cont->move_button;
}
-void esmart_container_callback_order_change_set(Evas_Object *container, void
(*func)(void *data), void *data)
+EAPI void
+esmart_container_callback_order_change_set(Evas_Object *container, void
(*func)(void *data), void *data)
{
Container *cont;
@@ -269,7 +286,7 @@
cont->data_order_change = data;
}
-double
+EAPI double
esmart_container_elements_length_get(Evas_Object *container)
{
Container *cont;
@@ -302,7 +319,7 @@
return length;
}
-void
+EAPI void
esmart_container_scroll_start(Evas_Object *container, double velocity)
{
Container *cont = _container_fetch(container);
@@ -312,7 +329,7 @@
cont->plugin->scroll_start(cont, velocity);
}
-void
+EAPI void
esmart_container_scroll_stop(Evas_Object *container)
{
Container *cont;
@@ -324,7 +341,7 @@
cont->plugin->scroll_stop(cont);
}
-void
+EAPI void
esmart_container_scroll_percent_set(Evas_Object *container, double percent)
{
Container *cont;
@@ -340,7 +357,7 @@
esmart_container_scroll_offset_set(container, -percent * (length - size));
}
-double
+EAPI double
esmart_container_scroll_percent_get(Evas_Object *container)
{
Container *cont;
@@ -357,7 +374,7 @@
else return (double)(cont->scroll.offset) / (size - length);
}
-void
+EAPI void
esmart_container_scroll_to(Evas_Object *container, Evas_Object *element)
{
Container *cont;
@@ -372,7 +389,7 @@
cont->plugin->scroll_to(cont, el);
}
-double
+EAPI double
esmart_container_elements_orig_length_get(Evas_Object *container)
{
Container *cont;
===================================================================
RCS file:
/cvs/e/e17/libs/esmart/src/lib/esmart_container/esmart_container_element.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- esmart_container_element.c 8 Jan 2005 15:08:00 -0000 1.3
+++ esmart_container_element.c 6 Sep 2006 07:17:48 -0000 1.4
@@ -3,7 +3,8 @@
/*** element API ***/
-void esmart_container_element_append(Evas_Object *container, Evas_Object
*element)
+EAPI void
+esmart_container_element_append(Evas_Object *container, Evas_Object *element)
{
Container *cont;
Container_Element *el = NULL;
@@ -20,7 +21,8 @@
_container_elements_fix(cont);
}
-void esmart_container_element_prepend(Evas_Object *container, Evas_Object
*element)
+EAPI void
+esmart_container_element_prepend(Evas_Object *container, Evas_Object *element)
{
Container *cont;
Container_Element *el;
@@ -37,7 +39,8 @@
_container_elements_fix(cont);
}
-void esmart_container_element_append_relative(Evas_Object *container,
+EAPI void
+esmart_container_element_append_relative(Evas_Object *container,
Evas_Object *element,
Evas_Object *relative)
{
@@ -59,7 +62,8 @@
_container_elements_fix(cont);
}
-void esmart_container_element_prepend_relative(Evas_Object *container,
+EAPI void
+esmart_container_element_prepend_relative(Evas_Object *container,
Evas_Object *element,
Evas_Object *relative)
{
@@ -81,7 +85,8 @@
_container_elements_fix(cont);
}
-void esmart_container_element_remove(Evas_Object *container, Evas_Object
*element)
+EAPI void
+esmart_container_element_remove(Evas_Object *container, Evas_Object *element)
{
Container *cont;
Container_Element *el;
@@ -101,8 +106,8 @@
_container_scale_scroll(cont, old_length);
}
-void esmart_container_element_destroy(Evas_Object *container, Evas_Object
-*element)
+EAPI void
+esmart_container_element_destroy(Evas_Object *container, Evas_Object *element)
{
Container *cont;
Container_Element *el;
@@ -124,7 +129,8 @@
_container_scale_scroll(cont, old_length);
}
-void esmart_container_empty (Evas_Object *container)
+EAPI void
+esmart_container_empty(Evas_Object *container)
{
Container *cont;
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
