Enlightenment CVS committal
Author : pfritz
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_scrollbar.c ewl_seeker.c ewl_spectrum.c ewl_spinner.c
ewl_statusbar.c ewl_table.c ewl_text.c ewl_tree.c ewl_tree2.c
ewl_window.c
Log Message:
use the correct tests, some clean-ups
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_scrollbar.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ewl_scrollbar.c 29 Mar 2007 19:49:17 -0000 1.19
+++ ewl_scrollbar.c 2 Apr 2007 19:35:11 -0000 1.20
@@ -483,7 +483,9 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
+ DCHECK_PARAM_PTR("user_data", user_data);
DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("user_data", user_data, EWL_SCROLLBAR_TYPE);
s = EWL_SCROLLBAR(user_data);
if (w == s->increment)
@@ -520,6 +522,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("user_data", user_data);
+ DCHECK_TYPE("user_data", user_data, EWL_SCROLLBAR_TYPE);
s = EWL_SCROLLBAR(user_data);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_seeker.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- ewl_seeker.c 29 Mar 2007 19:25:09 -0000 1.25
+++ ewl_seeker.c 2 Apr 2007 19:35:11 -0000 1.26
@@ -272,7 +272,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_SEEKER_TYPE);
s = EWL_SEEKER(w);
r = EWL_RANGE(w);
@@ -349,6 +349,7 @@
DCHECK_PARAM_PTR("w", w);
DCHECK_PARAM_PTR("ev_data", ev_data);
DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w->parent", w->parent, EWL_SEEKER_TYPE);
ev = ev_data;
s = EWL_SEEKER(w->parent);
@@ -378,6 +379,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w->parent", w->parent, EWL_SEEKER_TYPE);
EWL_SEEKER(w->parent)->dragstart = 0;
@@ -404,7 +406,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
DCHECK_PARAM_PTR("ev_data", ev_data);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_SEEKER_TYPE);
s = EWL_SEEKER(w);
r = EWL_RANGE(w);
@@ -463,7 +465,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
DCHECK_PARAM_PTR("ev_data", ev_data);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_SEEKER_TYPE);
ev = ev_data;
s = EWL_SEEKER(w);
@@ -560,7 +562,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
DCHECK_PARAM_PTR("ev_data", ev_data);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_SEEKER_TYPE);
ev = ev_data;
r = EWL_RANGE(w);
@@ -612,7 +614,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("p", p);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("p", p, EWL_CONTAINER_TYPE);
+ DCHECK_TYPE("p", p, EWL_SEEKER_TYPE);
DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
r = EWL_RANGE(p);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_spectrum.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- ewl_spectrum.c 29 Mar 2007 19:25:09 -0000 1.35
+++ ewl_spectrum.c 2 Apr 2007 19:35:11 -0000 1.36
@@ -318,7 +318,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_SPECTRUM_TYPE);
sp = EWL_SPECTRUM(w);
if (!REALIZED(sp))
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_spinner.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- ewl_spinner.c 29 Mar 2007 19:25:09 -0000 1.29
+++ ewl_spinner.c 2 Apr 2007 19:35:11 -0000 1.30
@@ -10,7 +10,7 @@
static void ewl_spinner_entry_update(Ewl_Spinner *s);
static int ewl_spinner_timer(void *data);
-
+static void ewl_spinner_child_handle(Ewl_Spinner *s);
/**
* @return Returns a new spinner widget on success, NULL on failure.
* @brief Allocate a new spinner widget
@@ -411,16 +411,15 @@
* @brief The increase value callback
*/
void
-ewl_spinner_cb_increase_value(Ewl_Widget *w, void *ev_data,
+ewl_spinner_cb_increase_value(Ewl_Widget *w __UNUSED__, void *ev_data,
void *user_data)
{
Ewl_Spinner *s;
Ewl_Range *r;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("w", w);
DCHECK_PARAM_PTR("user_data", user_data);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("user_data", w, EWL_SPINNER_TYPE);
s = EWL_SPINNER(user_data);
r = EWL_RANGE(s);
@@ -457,6 +456,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("user_data", user_data);
+ DCHECK_TYPE("user_data", user_data, EWL_SPINNER_TYPE);
s = user_data;
if (s->timer) {
@@ -479,16 +479,15 @@
* @brief The decrease value callback
*/
void
-ewl_spinner_cb_decrease_value(Ewl_Widget *w, void *ev_data,
+ewl_spinner_cb_decrease_value(Ewl_Widget *w __UNUSED__, void *ev_data,
void *user_data)
{
Ewl_Spinner *s;
Ewl_Range *r;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("w", w);
DCHECK_PARAM_PTR("user_data", user_data);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("user_data", w, EWL_SPINNER_TYPE);
s = EWL_SPINNER(user_data);
r = EWL_RANGE(s);
@@ -526,7 +525,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_SPINNER_TYPE);
s = EWL_SPINNER(w);
if (s->timer) {
@@ -585,17 +584,13 @@
}
static void
-ewl_spinner_child_handle(Ewl_Container *c,
- Ewl_Widget *w __UNUSED__)
+ewl_spinner_child_handle(Ewl_Spinner *s)
{
- Ewl_Spinner *s;
int pvw, pvh, pew, peh;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("c", c);
- DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE);
-
- s = EWL_SPINNER(c);
+ DCHECK_PARAM_PTR("s", s);
+ DCHECK_TYPE("s", s, EWL_SPINNER_TYPE);
pvw = ewl_object_preferred_w_get(EWL_OBJECT(s->vbox));
pvh = ewl_object_preferred_h_get(EWL_OBJECT(s->vbox));
@@ -603,7 +598,7 @@
pew = ewl_object_preferred_w_get(EWL_OBJECT(s->entry));
peh = ewl_object_preferred_h_get(EWL_OBJECT(s->entry));
- ewl_object_preferred_inner_size_set(EWL_OBJECT(c), pvw + pew,
+ ewl_object_preferred_inner_size_set(EWL_OBJECT(s), pvw + pew,
MAX(peh, pvh));
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -617,15 +612,13 @@
* @brief The child show callback
*/
void
-ewl_spinner_cb_child_show(Ewl_Container *c, Ewl_Widget *w)
+ewl_spinner_cb_child_show(Ewl_Container *c, Ewl_Widget *w __UNUSED__)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("c", c);
- DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("c", c, EWL_SPINNER_TYPE);
- ewl_spinner_child_handle(c, w);
+ ewl_spinner_child_handle(EWL_SPINNER(c));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -640,17 +633,15 @@
* @brief The child resize callback
*/
void
-ewl_spinner_cb_child_resize(Ewl_Container *c, Ewl_Widget *w,
+ewl_spinner_cb_child_resize(Ewl_Container *c, Ewl_Widget *w __UNUSED__,
int size __UNUSED__,
Ewl_Orientation o __UNUSED__)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("c", c);
- DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("c", c, EWL_SPINNER_TYPE);
- ewl_spinner_child_handle(c, w);
+ ewl_spinner_child_handle(EWL_SPINNER(c));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_statusbar.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ewl_statusbar.c 29 Mar 2007 19:25:09 -0000 1.12
+++ ewl_statusbar.c 2 Apr 2007 19:35:11 -0000 1.13
@@ -328,6 +328,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
+ DCHECK_TYPE("w", w, EWL_STATUSBAR_TYPE);
sb = EWL_STATUSBAR(w);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_table.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- ewl_table.c 29 Mar 2007 19:25:09 -0000 1.25
+++ ewl_table.c 2 Apr 2007 19:35:11 -0000 1.26
@@ -447,7 +447,9 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
+ DCHECK_PARAM_PTR("user_data", user_data);
DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("user_data", user_data, EWL_TABLE_TYPE);
t = EWL_TABLE(user_data);
gc = (Ewl_Grid_Child *) ewl_widget_data_get(w, (void *) t->grid);
@@ -480,29 +482,25 @@
*---------------------------------*/
Ewl_Table *table;
- Ewl_Object *o;
Ewl_Widget *child;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_TABLE_TYPE);
table = EWL_TABLE(w);
- o = EWL_OBJECT(w);
ewl_object_geometry_request(EWL_OBJECT(table->grid),
- CURRENT_X(o), CURRENT_Y(o),
- CURRENT_W(o) - INSET_LEFT(o) +
- INSET_RIGHT(o),
- CURRENT_H(o) - INSET_TOP(o) +
- INSET_BOTTOM(o));
+ CURRENT_X(w), CURRENT_Y(w),
+ CURRENT_W(w) - INSET_LEFT(w) +
+ INSET_RIGHT(w),
+ CURRENT_H(w) - INSET_TOP(w) +
+ INSET_BOTTOM(w));
+ /* XXX is this really needed? Doesn't the Container do that already? */
ecore_dlist_goto_first(EWL_CONTAINER(table->grid)->children);
- while ((child =
- ecore_dlist_next(EWL_CONTAINER(table->grid)->children)) !=
NULL) {
-
+ while ((child = ecore_dlist_next(EWL_CONTAINER(table->grid)->children)))
ewl_widget_configure(child);
- }
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_text.c,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -3 -r1.163 -r1.164
--- ewl_text.c 29 Mar 2007 19:25:09 -0000 1.163
+++ ewl_text.c 2 Apr 2007 19:35:11 -0000 1.164
@@ -3554,7 +3554,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_TEXT_TYPE);
/* don't do anything if we're obscured */
if (OBSCURED(w))
@@ -3606,7 +3606,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_TEXT_TYPE);
t = EWL_TEXT(w);
@@ -3713,7 +3713,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_TEXT_TYPE);
t = EWL_TEXT(w);
if (t->textblock)
@@ -3740,7 +3740,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_TEXT_TYPE);
t = EWL_TEXT(w);
evas_object_hide(t->textblock);
@@ -3764,7 +3764,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_TEXT_TYPE);
t = EWL_TEXT(w);
@@ -3803,7 +3803,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_TEXT_TYPE);
event = ev;
t = EWL_TEXT(w);
@@ -3873,7 +3873,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_TEXT_TYPE);
event = ev;
t = EWL_TEXT(w);
@@ -3913,7 +3913,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_TEXT_TYPE);
event = ev;
t = EWL_TEXT(w);
@@ -3945,13 +3945,15 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("c", c);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE);
+ DCHECK_TYPE("c", c, EWL_TEXT_TYPE);
DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
- if (!(appearance = ewl_widget_appearance_get(w)))
+ if (!(appearance = ewl_widget_appearance_get(w)))
DRETURN(DLEVEL_STABLE);
- /* if this is a trigger then add it as such */
+ /* if this is a trigger then add it as such
+ * Note: we cannot do a simple type check here, because a text selection
+ * is also of the type EWL_TEXT_TRIGGER */
if (!strcmp(appearance, EWL_TEXT_TRIGGER_TYPE))
ewl_text_trigger_add(EWL_TEXT(c), EWL_TEXT_TRIGGER(w));
@@ -3976,13 +3978,15 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("c", c);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE);
+ DCHECK_TYPE("c", c, EWL_TEXT_TYPE);
DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
if (!(appearance = ewl_widget_appearance_get(w)))
DRETURN(DLEVEL_STABLE);
- /* if this is a trigger, remove it as such */
+ /* if this is a trigger, remove it as such
+ * Note: we cannot do a simple type check here, because a text selection
+ * is also of the type EWL_TEXT_TRIGGER */
if (!strcmp(appearance, EWL_TEXT_TRIGGER_TYPE))
ewl_text_trigger_del(EWL_TEXT(c), EWL_TEXT_TRIGGER(w));
@@ -5011,6 +5015,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("data", data);
+ DCHECK_TYPE("data", data, EWL_TEXT_TRIGGER_TYPE);
trigger = data;
ewl_callback_call_with_event_data(EWL_WIDGET(trigger),
@@ -5034,6 +5039,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("data", data);
+ DCHECK_TYPE("data", data, EWL_TEXT_TRIGGER_TYPE);
trigger = data;
ewl_callback_call_with_event_data(EWL_WIDGET(trigger),
@@ -5057,6 +5063,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("data", data);
+ DCHECK_TYPE("data", data, EWL_TEXT_TRIGGER_TYPE);
trigger = data;
ewl_callback_call_with_event_data(EWL_WIDGET(trigger),
@@ -5080,6 +5087,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("data", data);
+ DCHECK_TYPE("data", data, EWL_TEXT_TRIGGER_TYPE);
trigger = data;
ewl_callback_call_with_event_data(EWL_WIDGET(trigger),
@@ -5212,7 +5220,8 @@
{
context_hash = ecore_hash_new(ewl_text_context_hash_key,
ewl_text_context_hash_cmp);
- ecore_hash_set_free_value(context_hash,
ewl_text_context_cb_free);
+ ecore_hash_set_free_value(context_hash,
+ ewl_text_context_cb_free);
}
DRETURN_INT(TRUE, DLEVEL_STABLE);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- ewl_tree.c 29 Mar 2007 19:25:09 -0000 1.48
+++ ewl_tree.c 2 Apr 2007 19:35:11 -0000 1.49
@@ -754,7 +754,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_TREE_TYPE);
tree = EWL_TREE(w);
scroll =
ewl_scrollpane_hscrollbar_value_get(EWL_SCROLLPANE(tree->scrollarea));
@@ -784,15 +784,16 @@
* @brief The header configure callback
*/
void
-ewl_tree_cb_header_configure(Ewl_Widget *w, void *ev_data __UNUSED__,
- void *user_data __UNUSED__)
+ewl_tree_cb_header_configure(Ewl_Widget *w __UNUSED__, void *ev_data
__UNUSED__,
+ void *user_data)
{
- Ewl_Widget *scrollarea = user_data;
+ Ewl_Widget *scrollarea;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_PARAM_PTR("user_data", user_data);
+ DCHECK_TYPE("user_data", user_data, EWL_WIDGET_TYPE);
+ scrollarea = user_data;
ewl_widget_configure(scrollarea);
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -814,7 +815,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_TREE_TYPE);
tree = EWL_TREE(w);
IF_FREE_LIST(tree->selected);
@@ -1082,7 +1083,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_TREE_NODE_TYPE);
node = EWL_TREE_NODE(w);
if (!node->tree)
@@ -1136,7 +1137,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_TREE_NODE_TYPE);
node = EWL_TREE_NODE(w);
if (!node->tree)
@@ -1165,8 +1166,8 @@
Ewl_Tree_Node *node;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_PARAM_PTR("user_data", user_data);
+ DCHECK_TYPE("user_data", user_data, EWL_TREE_NODE_TYPE);
node = EWL_TREE_NODE(user_data);
@@ -1195,7 +1196,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("c", c);
- DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE);
+ DCHECK_TYPE("c", c, EWL_TREE_NODE_TYPE);
node = EWL_TREE_NODE(c);
if (w != node->handle && !node->row)
@@ -1246,7 +1247,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("c", c);
- DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE);
+ DCHECK_TYPE("c", c, EWL_TREE_NODE_TYPE);
node = EWL_TREE_NODE(c);
@@ -1291,7 +1292,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("c", c);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE);
+ DCHECK_TYPE("c", c, EWL_TREE_NODE_TYPE);
DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
node = EWL_TREE_NODE(c);
@@ -1357,6 +1358,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w->parent", w->parent, EWL_TREE_NODE_TYPE);
ev = ev_data;
node = EWL_TREE_NODE(w->parent);
@@ -1393,6 +1395,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w->parent", w->parent, EWL_TREE_NODE_TYPE);
node = EWL_TREE_NODE(w->parent);
tree = node->tree;
@@ -1420,8 +1423,9 @@
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("user_data", user_data);
+ DCHECK_TYPE("user_data", user_data, EWL_WIDGET_TYPE);
- ewl_widget_configure(user_data);
+ ewl_widget_configure(EWL_WIDGET(user_data));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -1439,6 +1443,9 @@
void *data)
{
Ewl_Tree *tree;
+
+ DCHECK_PARAM_PTR("data", data);
+ DCHECK_TYPE("data", data, EWL_TREE_TYPE);
DENTER_FUNCTION(DLEVEL_STABLE);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree2.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -3 -r1.76 -r1.77
--- ewl_tree2.c 1 Apr 2007 23:06:40 -0000 1.76
+++ ewl_tree2.c 2 Apr 2007 19:35:11 -0000 1.77
@@ -465,7 +465,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_TREE2_TYPE);
t = EWL_TREE2(w);
@@ -780,6 +780,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("data", data);
+ DCHECK_TYPE("data", data, EWL_TREE2_TYPE);
tree = data;
ewl_widget_configure(EWL_WIDGET(tree->rows));
@@ -788,14 +789,15 @@
}
static void
-ewl_tree2_cb_row_clicked(Ewl_Widget *w, void *ev __UNUSED__, void *data)
+ewl_tree2_cb_row_clicked(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__,
+ void *data)
{
Ewl_Tree2 *tree;
Ewl_Tree2_Node *node;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_PARAM_PTR("data", data);
+ DCHECK_TYPE("data", data, EWL_TREE2_NODE_TYPE);
node = data;
tree = EWL_TREE2(node->tree);
@@ -844,7 +846,9 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
+ DCHECK_PARAM_PTR("data", data);
DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("data", data, EWL_TREE2_NODE_TYPE);
row = EWL_ROW(w->parent);
node = EWL_TREE2_NODE(data);
@@ -1150,7 +1154,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_TREE2_NODE_TYPE);
node = EWL_TREE2_NODE(w);
if (!node->tree)
@@ -1194,8 +1198,8 @@
void *data)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_PARAM_PTR("data", data);
+ DCHECK_TYPE("data", data, EWL_TREE2_NODE_TYPE);
if (ewl_tree2_node_expandable_get(EWL_TREE2_NODE(data)))
{
@@ -1215,7 +1219,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("c", c);
- DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE);
+ DCHECK_TYPE("c", c, EWL_TREE2_NODE_TYPE);
node = EWL_TREE2_NODE(c);
if (node->handle && node->expanded) {
@@ -1251,7 +1255,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("c", c);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE);
+ DCHECK_TYPE("c", c, EWL_TREE2_NODE_TYPE);
DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
node = EWL_TREE2_NODE(c);
@@ -1296,7 +1300,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("c", c);
- DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE);
+ DCHECK_TYPE("c", c, EWL_TREE2_NODE_TYPE);
node = EWL_TREE2_NODE(c);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_window.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -3 -r1.78 -r1.79
--- ewl_window.c 29 Mar 2007 19:25:09 -0000 1.78
+++ ewl_window.c 2 Apr 2007 19:35:11 -0000 1.79
@@ -785,7 +785,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_WINDOW_TYPE);
window = EWL_WINDOW(w);
@@ -827,7 +827,7 @@
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_WINDOW_TYPE);
if (EWL_WINDOW(w)->flags & EWL_WINDOW_TRANSIENT)
ewl_window_transient_for(EWL_WINDOW(w),
@@ -856,7 +856,8 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
DCHECK_PARAM_PTR("user_data", user_data);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_WINDOW_TYPE);
+ DCHECK_TYPE("user_data", user_data, EWL_WINDOW_TYPE);
win = EWL_WINDOW(user_data);
/*
@@ -891,7 +892,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_WINDOW_TYPE);
embed = EWL_EMBED(w);
win = EWL_WINDOW(w);
@@ -925,7 +926,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_WINDOW_TYPE);
win = EWL_WINDOW(w);
if (!win->window)
@@ -965,7 +966,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_WINDOW_TYPE);
win = EWL_WINDOW(w);
@@ -991,7 +992,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("widget", widget);
- DCHECK_TYPE("widget", widget, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("widget", widget, EWL_WINDOW_TYPE);
win = EWL_WINDOW(widget);
@@ -1021,7 +1022,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_WINDOW_TYPE);
win = EWL_WINDOW(w);
@@ -1051,7 +1052,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE("w", w, EWL_WINDOW_TYPE);
win = EWL_WINDOW(w);
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
