Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_bin.c etk_widget.c etk_widget.h
Log Message:
* [Bin] The child is now correctly swallowed (it fixes a bug with the combobox)
* [Widget] Remove two useless funcs (etk_widget_is_swallowing_widget/object())
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_bin.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- etk_bin.c 17 Aug 2006 17:18:14 -0000 1.15
+++ etk_bin.c 28 Aug 2006 22:08:29 -0000 1.16
@@ -83,7 +83,7 @@
if (child)
{
etk_widget_parent_set(child, ETK_WIDGET(bin));
- etk_widget_swallow_widget(ETK_WIDGET(bin), "swallow_area", bin->child);
+ etk_widget_swallow_widget(ETK_WIDGET(bin), "swallow_area", child);
bin->child = child;
etk_signal_emit_by_name("child_added", ETK_OBJECT(bin), NULL, child);
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_widget.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -3 -r1.79 -r1.80
--- etk_widget.c 26 Aug 2006 09:38:06 -0000 1.79
+++ etk_widget.c 28 Aug 2006 22:08:29 -0000 1.80
@@ -1185,30 +1185,6 @@
}
/**
- * @brief Checks if @a swallower is currently swallowing @a swallowed
- * @param swallower a widget
- * @param swallowed the widget to check if it is swallowed by @a swallower
- * @return Returns ETK_TRUE if @a swallower is swallowing @a swallowed, and
ETK_FALSE otherwise
- * @widget_implementation
- */
-Etk_Bool etk_widget_is_swallowing_widget(Etk_Widget *swallower, Etk_Widget
*swallowed)
-{
- Evas_List *l;
- Etk_Widget_Swallowed_Object *swo;
-
- if (!swallower || !swallowed)
- return ETK_FALSE;
-
- for (l = swallower->swallowed_objects; l; l = l->next)
- {
- swo = l->data;
- if (swo->widget == swallowed)
- return ETK_TRUE;
- }
- return ETK_FALSE;
-}
-
-/**
* @brief Checks if the widget is swallowed by its parent
* @return Returns ETK_TRUE if the widget is swallowed by its parent
* @widget_implementation
@@ -1273,30 +1249,6 @@
break;
}
}
-}
-
-/**
- * @brief Checks if the widget swallows the object
- * @param widget a widget
- * @param object an evas object
- * @return Returns ETK_TRUE if @a widget is swallowing @a object
- * @widget_implementation
- */
-Etk_Bool etk_widget_is_swallowing_object(Etk_Widget *widget, Evas_Object
*object)
-{
- Evas_List *l;
- Etk_Widget_Swallowed_Object *swallowed_object;
-
- if (!widget || !object)
- return ETK_FALSE;
-
- for (l = widget->swallowed_objects; l; l = l->next)
- {
- swallowed_object = l->data;
- if (swallowed_object->object == object)
- return ETK_TRUE;
- }
- return ETK_FALSE;
}
/**
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_widget.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- etk_widget.h 24 Aug 2006 18:09:16 -0000 1.37
+++ etk_widget.h 28 Aug 2006 22:08:29 -0000 1.38
@@ -171,11 +171,9 @@
Etk_Bool etk_widget_swallow_widget(Etk_Widget *swallower,
const char *part, Etk_Widget *to_swallow);
void etk_widget_unswallow_widget(Etk_Widget *swallower,
Etk_Widget *swallowed);
-Etk_Bool etk_widget_is_swallowing_widget(Etk_Widget
*swallower, Etk_Widget *swallowed);
Etk_Bool etk_widget_is_swallowed(Etk_Widget *widget);
Etk_Bool etk_widget_swallow_object(Etk_Widget *swallower,
const char *part, Evas_Object *object);
void etk_widget_unswallow_object(Etk_Widget *swallower,
Evas_Object *object);
-Etk_Bool etk_widget_is_swallowing_object(Etk_Widget
*swallower, Evas_Object *object);
Etk_Widget_Swallow_Error etk_widget_swallow_error_get();
Etk_Bool etk_widget_member_object_add(Etk_Widget *widget, Evas_Object *object);
-------------------------------------------------------------------------
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
