Enlightenment CVS committal
Author : pfritz
Project : e17
Module : libs/esmart
Dir : e17/libs/esmart/src/lib/esmart_container
Modified Files:
esmart_container.c esmart_container_smart.c
Log Message:
- make internal functions static
- remove unused functions
===================================================================
RCS file: /cvs/e/e17/libs/esmart/src/lib/esmart_container/esmart_container.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- esmart_container.c 12 Jul 2008 06:40:36 -0000 1.16
+++ esmart_container.c 16 Jul 2008 21:37:49 -0000 1.17
@@ -18,7 +18,7 @@
#include "Esmart_Container.h"
#include "esmart_container_private.h"
-int _container_scroll_timer(void *data);
+//static int _container_scroll_timer(void *data);
/*** external API ***/
@@ -671,11 +671,11 @@
}
}
-
-int
+/* XXX Can we remove this? */
+#if 0
+static int
_container_scroll_timer(void *data)
{
-// Scroll_Data *sd = data;
Container *cont = data;
double dt, dx, size, pad, max_scroll;
@@ -698,3 +698,5 @@
_container_elements_fix(cont);
return 1;
}
+#endif
+
===================================================================
RCS file:
/cvs/e/e17/libs/esmart/src/lib/esmart_container/esmart_container_smart.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- esmart_container_smart.c 12 Jul 2008 06:40:36 -0000 1.7
+++ esmart_container_smart.c 16 Jul 2008 21:37:49 -0000 1.8
@@ -15,20 +15,15 @@
#include "esmart_container_private.h"
/* smart object handlers */
-void _container_add(Evas_Object *obj);
-void _container_del(Evas_Object *obj);
-void _container_layer_set(Evas_Object *obj, int l);
-void _container_raise(Evas_Object *obj);
-void _container_lower(Evas_Object *obj);
-void _container_stack_above(Evas_Object *obj, Evas_Object *above);
-void _container_stack_below(Evas_Object *obj, Evas_Object *below);
-void _container_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
-void _container_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-void _container_show(Evas_Object *obj);
-void _container_hide(Evas_Object *obj);
-void _container_color_set(Evas_Object *obj, int r, int g, int b, int a);
-void _container_clip_set(Evas_Object *obj, Evas_Object *clip);
-void _container_clip_unset(Evas_Object *obj);
+static void _container_add(Evas_Object *obj);
+static void _container_del(Evas_Object *obj);
+static void _container_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
+static void _container_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
+static void _container_show(Evas_Object *obj);
+static void _container_hide(Evas_Object *obj);
+static void _container_color_set(Evas_Object *obj, int r, int g, int b, int a);
+static void _container_clip_set(Evas_Object *obj, Evas_Object *clip);
+static void _container_clip_unset(Evas_Object *obj);
Evas_Smart *_container_smart_get();
@@ -85,7 +80,7 @@
return smart;
}
-void
+static void
_container_add(Evas_Object *obj)
{
Container *data;
@@ -119,7 +114,7 @@
}
-void
+static void
_container_del(Evas_Object *obj)
{
Container *data;
@@ -136,109 +131,7 @@
free(data);
}
-void
-_container_layer_set(Evas_Object *obj, int layer)
-{
- Container *data;
- Evas_List *l;
-
- data = evas_object_smart_data_get(obj);
-
- for (l = data->elements; l; l = l->next)
- {
- Container_Element *el = l->data;
-
- evas_object_layer_set(el->obj, layer);
- evas_object_layer_set(el->grabber, layer);
- }
-
- evas_object_layer_set(data->clipper, layer);
- evas_object_layer_set(data->grabber, layer);
-
-}
-
-void
-_container_raise(Evas_Object *obj)
-{
- Container *data;
- Evas_List *l;
-
- data = evas_object_smart_data_get(obj);
-
- for (l = data->elements; l; l = l->next)
- {
- Container_Element *el = l->data;
-
- evas_object_raise(el->obj);
- evas_object_raise(el->grabber);
- }
-
- evas_object_raise(data->clipper);
- evas_object_raise(data->grabber);
-}
-
-void
-_container_lower(Evas_Object *obj)
-{
- Container *data;
- Evas_List *l;
-
- data = evas_object_smart_data_get(obj);
-
- for (l = data->elements; l; l = l->next)
- {
- Container_Element *el = l->data;
-
- evas_object_lower(el->obj);
- evas_object_lower(el->grabber);
- }
-
- evas_object_lower(data->clipper);
- evas_object_lower(data->grabber);
-}
-
-void
-_container_stack_above(Evas_Object *obj, Evas_Object *above)
-{
- Container *data;
- Evas_List *l;
-
- data = evas_object_smart_data_get(obj);
-
- evas_object_stack_above(data->grabber, above);
- evas_object_stack_above(data->clipper, above);
-
- for (l = data->elements; l; l = l->next)
- {
- Container_Element *el = l->data;
-
- evas_object_stack_above(el->grabber, above);
- evas_object_stack_above(el->obj, above);
- }
-
-}
-
-void
-_container_stack_below(Evas_Object *obj, Evas_Object *below)
-{
- Container *data;
- Evas_List *l;
-
- data = evas_object_smart_data_get(obj);
-
- for (l = data->elements; l; l = l->next)
- {
- Container_Element *el = l->data;
-
- evas_object_stack_below(el->obj, below);
- evas_object_stack_below(el->grabber, below);
- }
-
- evas_object_stack_below(data->clipper, below);
- evas_object_stack_below(data->grabber, below);
-}
-
-void
+static void
_container_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
{
Container *data;
@@ -256,7 +149,7 @@
_container_elements_fix(data);
}
-void
+static void
_container_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
{
Container *data;
@@ -280,7 +173,7 @@
data->changed = 1;
}
-void
+static void
_container_show(Evas_Object *obj)
{
Container *data;
@@ -291,7 +184,7 @@
evas_object_show(data->grabber);
}
-void
+static void
_container_hide(Evas_Object *obj)
{
Container *data;
@@ -303,7 +196,7 @@
}
-void
+static void
_container_color_set(Evas_Object *obj, int r, int g, int b, int a)
{
Container *data;
@@ -314,7 +207,7 @@
data->clipper_orig_alpha = a;
}
-void
+static void
_container_clip_set(Evas_Object *obj, Evas_Object *clip)
{
Container *data;
@@ -325,7 +218,7 @@
evas_object_clip_set(data->grabber, clip);
}
-void
+static void
_container_clip_unset(Evas_Object *obj)
{
Container *data;
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
