From: Enlightenment C. <no...@cv...> - 2008-04-08 16:10:06
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_grid.c ewl_dialog.c Log Message: use DRETURN() and not DLEAVE_FUNCTION() =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_grid.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -3 -r1.46 -r1.47 --- ewl_grid.c 22 Mar 2008 21:16:54 -0000 1.46 +++ ewl_grid.c 8 Apr 2008 16:10:00 -0000 1.47 @@ -73,6 +73,7 @@ g->homogeneous_h = FALSE; g->homogeneous_v = FALSE; + g->data_dirty = TRUE; g->orientation = EWL_ORIENTATION_HORIZONTAL; @@ -356,7 +357,7 @@ */ if (start_col < 0) { DWARNING("start_col out of bounds. min is 0."); - DLEAVE_FUNCTION(DLEVEL_STABLE); + DRETURN(DLEVEL_STABLE); } if (end_col >= g->cols) @@ -366,7 +367,7 @@ if (start_row < 0) { DWARNING("start_row out of bounds. min is 0."); - DLEAVE_FUNCTION(DLEVEL_STABLE); + DRETURN(DLEVEL_STABLE); } if (end_row >= g->rows) @@ -380,7 +381,7 @@ if (!(child = ewl_widget_data_get(w,g))) { child = NEW(Ewl_Grid_Child, 1); if (!child) - DLEAVE_FUNCTION(DLEVEL_STABLE); + DRETURN(DLEVEL_STABLE); } else { g->space -= (child->end_col - child->start_col + 1) @@ -532,7 +533,7 @@ */ if (col < 0) { DWARNING("parameter 'col' is out of bounds."); - DLEAVE_FUNCTION(DLEVEL_STABLE); + DRETURN(DLEVEL_STABLE); } else if (col >= g->cols) ewl_grid_dimensions_set(g, col + 1, g->rows); @@ -586,7 +587,7 @@ */ if (col < 0) { DWARNING("parameter 'col' is out of bounds."); - DLEAVE_FUNCTION(DLEVEL_STABLE); + DRETURN(DLEVEL_STABLE); } else if (col >= g->cols) ewl_grid_dimensions_set(g, col + 1, g->rows); @@ -639,7 +640,7 @@ */ if (col < 0) { DWARNING("parameter 'col' is out of bounds."); - DLEAVE_FUNCTION(DLEVEL_STABLE); + DRETURN(DLEVEL_STABLE); } else if (col >= g->cols) ewl_grid_dimensions_set(g, col + 1, g->rows); @@ -671,7 +672,7 @@ */ if (col < 0) { DWARNING("parameter 'col' is out of bounds."); - DLEAVE_FUNCTION(DLEVEL_STABLE); + DRETURN(DLEVEL_STABLE); } else if (col >= g->cols) ewl_grid_dimensions_set(g, col + 1, g->rows); @@ -725,7 +726,7 @@ */ if (row < 0) { DWARNING("parameter 'row' is out of bounds."); - DLEAVE_FUNCTION(DLEVEL_STABLE); + DRETURN(DLEVEL_STABLE); } else if (row >= g->rows) ewl_grid_dimensions_set(g, g->cols, row + 1); @@ -779,7 +780,7 @@ */ if (row < 0) { DWARNING("parameter 'row' is out of bounds."); - DLEAVE_FUNCTION(DLEVEL_STABLE); + DRETURN(DLEVEL_STABLE); } else if (row >= g->rows) ewl_grid_dimensions_set(g, g->cols, row + 1); @@ -832,7 +833,7 @@ */ if (row < 0) { DWARNING("parameter 'row' is out of bounds."); - DLEAVE_FUNCTION(DLEVEL_STABLE); + DRETURN(DLEVEL_STABLE); } else if (row >= g->rows) ewl_grid_dimensions_set(g, g->cols, row + 1); @@ -864,7 +865,7 @@ */ if (row < 0) { DWARNING("parameter 'row' is out of bounds."); - DLEAVE_FUNCTION(DLEVEL_STABLE); + DRETURN(DLEVEL_STABLE); } else if (row >= g->rows) ewl_grid_dimensions_set(g, g->cols, row + 1); @@ -1320,7 +1321,6 @@ default: var += g->row_size[i].preferred_size; - } } =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_dialog.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- ewl_dialog.c 25 Mar 2008 23:56:35 -0000 1.22 +++ ewl_dialog.c 8 Apr 2008 16:10:01 -0000 1.23 @@ -301,10 +301,6 @@ DCHECK_PARAM_PTR(dialog); DCHECK_TYPE(dialog, EWL_DIALOG_TYPE); - if (!dialog) { - DLEAVE_FUNCTION(DLEVEL_STABLE); - } - if (has_sep && (dialog->separator == NULL)) { ewl_container_child_iterate_begin(EWL_CONTAINER(EWL_DIALOG(dialog)->vbox)); n = 0; |