Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_calendar.c ewl_grid.c ewl_grid.h ewl_table.c ewl_table.h
Log Message:
- formatting
- API break.
- change ewl_grid_dimension_set to ewl_grid_dimensions_set
- change ewl_grid_col_w_set/get to ewl_grid_column_w_set/get
- change ewl_table_col_w_set/get to ewl_table_column_w_set/get
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_calendar.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ewl_calendar.c 9 Jul 2006 23:01:32 -0000 1.16
+++ ewl_calendar.c 10 Jul 2006 02:43:24 -0000 1.17
@@ -106,7 +106,7 @@
ewl_widget_show(next_button);
ib->grid = ewl_grid_new();
- ewl_grid_dimension_set(EWL_GRID(ib->grid), 7, 7);
+ ewl_grid_dimensions_set(EWL_GRID(ib->grid), 7, 7);
ewl_container_child_append(EWL_CONTAINER(vbox), EWL_WIDGET(ib->grid));
ewl_object_fill_policy_set(EWL_OBJECT(ib->grid), EWL_FLAG_FILL_FILL);
ewl_object_minimum_h_set(EWL_OBJECT(ib->grid), 100);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_grid.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ewl_grid.c 9 Jul 2006 23:01:32 -0000 1.17
+++ ewl_grid.c 10 Jul 2006 02:43:24 -0000 1.18
@@ -13,12 +13,11 @@
/**
* @param cols: number of columns
* @param rows: number of rows
- * @return Returns a pointer to a newly allocated grid on success,
- * NULL on failure.
+ * @return Returns a pointer to a grid on success or NULL on failure.
* @brief Create a new Ewl_Grid widget
*/
Ewl_Widget *
-ewl_grid_new()
+ewl_grid_new(void)
{
Ewl_Grid *g;
@@ -36,7 +35,6 @@
DRETURN_PTR(EWL_WIDGET(g), DLEVEL_STABLE);
}
-
/**
* @param g: the grid
* @param cols: number of columns
@@ -63,29 +61,26 @@
ewl_container_add_notify_set(EWL_CONTAINER(g), ewl_grid_child_add_cb);
ewl_container_remove_notify_set(EWL_CONTAINER(g),
ewl_grid_child_remove_cb);
- ewl_container_show_notify_set(EWL_CONTAINER(g),
- ewl_grid_child_show_cb);
ewl_container_resize_notify_set(EWL_CONTAINER(g),
ewl_grid_child_resize_cb);
/*
* the smallest size where a grid make sense
*/
- ewl_grid_dimension_set(g, 2, 2);
+ ewl_grid_dimensions_set(g, 2, 2);
g->homogeneous_h = FALSE;
g->homogeneous_v = FALSE;
g->orientation = EWL_ORIENTATION_HORIZONTAL;
+
/*
* Append callbacks
*/
- ewl_callback_append(EWL_WIDGET(g), EWL_CALLBACK_REALIZE,
- ewl_grid_realize_cb, NULL);
ewl_callback_append(EWL_WIDGET(g), EWL_CALLBACK_CONFIGURE,
- ewl_grid_configure_cb, NULL);
+ ewl_grid_configure_cb, NULL);
ewl_callback_prepend(EWL_WIDGET(g), EWL_CALLBACK_DESTROY,
- ewl_grid_destroy_cb, NULL);
+ ewl_grid_destroy_cb, NULL);
ewl_widget_focusable_set(EWL_WIDGET(g), FALSE);
@@ -100,7 +95,7 @@
* @brief Clears the grid and sets new geometry
*/
void
-ewl_grid_dimension_set(Ewl_Grid *g, int cols, int rows)
+ewl_grid_dimensions_set(Ewl_Grid *g, int cols, int rows)
{
Ewl_Widget *w;
Ewl_Grid_Info *col_new, *row_new;
@@ -112,7 +107,7 @@
w = EWL_WIDGET(g);
- if (cols == g->cols && rows == g->rows)
+ if ((cols == g->cols) && (rows == g->rows))
DRETURN(DLEVEL_STABLE);
IF_FREE(g->map);
@@ -173,12 +168,13 @@
DCHECK_PARAM_PTR("g", g);
DCHECK_TYPE("g", g, EWL_GRID_TYPE);
- if (g->orientation != orientation) {
- g->orientation = orientation;
- g->data_dirty = TRUE;
+ if (g->orientation == orientation)
+ DRETURN(DLEVEL_STABLE);
+
+ g->orientation = orientation;
+ g->data_dirty = TRUE;
- ewl_widget_configure(EWL_WIDGET(g));
- }
+ ewl_widget_configure(EWL_WIDGET(g));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -216,6 +212,7 @@
if (g->homogeneous_h != h)
ewl_grid_hhomogeneous_set(g, h);
+
if (g->homogeneous_v != h)
ewl_grid_vhomogeneous_set(g, h);
@@ -239,11 +236,12 @@
DCHECK_PARAM_PTR("g", g);
DCHECK_TYPE("g", g, EWL_GRID_TYPE);
- if (g->homogeneous_h != h) {
- g->homogeneous_h = h;
- g->data_dirty = TRUE;
- ewl_widget_configure(EWL_WIDGET(g));
- }
+ if (g->homogeneous_h == h)
+ DRETURN(DLEVEL_STABLE);
+
+ g->homogeneous_h = h;
+ g->data_dirty = TRUE;
+ ewl_widget_configure(EWL_WIDGET(g));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -265,11 +263,12 @@
DCHECK_PARAM_PTR("g", g);
DCHECK_TYPE("g", g, EWL_GRID_TYPE);
- if (g->homogeneous_v != h) {
- g->homogeneous_v = h;
- g->data_dirty = TRUE;
- ewl_widget_configure(EWL_WIDGET(g));
- }
+ if (g->homogeneous_v == h)
+ DRETURN(DLEVEL_STABLE);
+
+ g->homogeneous_v = h;
+ g->data_dirty = TRUE;
+ ewl_widget_configure(EWL_WIDGET(g));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -316,7 +315,8 @@
*/
void
ewl_grid_child_position_set(Ewl_Grid *g, Ewl_Widget *w,
- int start_col, int end_col, int start_row, int end_row)
+ int start_col, int end_col,
+ int start_row, int end_row)
{
Ewl_Grid_Child *child;
int new_cols, new_rows;
@@ -338,6 +338,7 @@
DWARNING("start_col out of bounds. min is 1\n");
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
+
if (end_col > g->cols)
new_cols = end_col;
else
@@ -347,6 +348,7 @@
DWARNING("start_row out of bounds. min is 1\n");
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
+
if (end_row > g->rows)
new_rows = end_row;
else
@@ -369,7 +371,7 @@
/*
* if there is to less space resize the grid
*/
- if (g->space > new_cols * new_rows) {
+ if (g->space > (new_cols * new_rows)) {
if (g->orientation == EWL_ORIENTATION_HORIZONTAL)
new_rows = g->space / new_cols + 1;
else
@@ -379,8 +381,8 @@
/*
* store the child info in the child widget
*/
- ewl_widget_data_set(w, (void *) g, child);
- ewl_grid_dimension_set(g, new_cols, new_rows);
+ ewl_widget_data_set(w, (void *)g, child);
+ ewl_grid_dimensions_set(g, new_cols, new_rows);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -394,7 +396,7 @@
* @brief Set the widget of a column
*/
void
-ewl_grid_col_w_set(Ewl_Grid *g, int col, float relw, int width)
+ewl_grid_column_w_set(Ewl_Grid *g, int col, float relw, int width)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("g", g);
@@ -408,7 +410,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
else if (col > g->cols) {
- ewl_grid_dimension_set(g, col, g->rows);
+ ewl_grid_dimensions_set(g, col, g->rows);
}
g->col_size[col - 1].override = 1;
@@ -432,14 +434,14 @@
* This function returns only the size set by the user.
*/
void
-ewl_grid_col_w_get(Ewl_Grid *g, int col, float *relw, int *width)
+ewl_grid_column_w_get(Ewl_Grid *g, int col, float *relw, int *width)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("g", g);
DCHECK_PARAM_PTR("width", width);
DCHECK_TYPE("g", g, EWL_GRID_TYPE);
- if (col > g->cols || col < 1) {
+ if ((col > g->cols) || (col < 1)) {
if (width) *width = 0;
if (relw) *relw = 0.0;
}
@@ -471,7 +473,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
else if (row > g->rows) {
- ewl_grid_dimension_set(g, g->cols, row);
+ ewl_grid_dimensions_set(g, g->cols, row);
}
g->row_size[row - 1].override = 1;
@@ -501,7 +503,7 @@
DCHECK_PARAM_PTR("height", height);
DCHECK_TYPE("g", g, EWL_GRID_TYPE);
- if (row > g->rows || row < 1) {
+ if ((row > g->rows) || (row < 1)) {
if (height) *height = 0;
if (relh) *relh = 0.0;
}
@@ -519,27 +521,6 @@
* @param ev_data: UNUSED
* @param user_data: UNUSED
* @return Returns no value
- * @brief The realize callback
- */
-void
-ewl_grid_realize_cb(Ewl_Widget *w, void *ev_data __UNUSED__,
- void *user_data __UNUSED__)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
-
- ewl_widget_configure(w);
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-/**
- * @internal
- * @param w: The widget to work with
- * @param ev_data: UNUSED
- * @param user_data: UNUSED
- * @return Returns no value
* @brief The configure callback
*/
void
@@ -552,7 +533,7 @@
int c_w = 0, c_h = 0; /* child width/height */
int c_x = 0, c_y = 0; /* child x/y coordinate */
int col, row;
- int i;
+ int i = 0;
void (*go_next)(Ewl_Grid *g, int *c, int *r);
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -563,12 +544,12 @@
if (!g->map)
ewl_grid_map_recalc(g);
+
if (g->data_dirty)
ewl_grid_child_data_collect(g);
ewl_grid_resize(g);
- i = 0;
/*
* setup the position stuff for the floating
* widgets
@@ -580,7 +561,7 @@
go_next = ewl_grid_vmap_position_next;
ecore_dlist_goto_first(EWL_CONTAINER(w)->children);
- while ((child = ecore_dlist_next(EWL_CONTAINER(w)->children)) != NULL) {
+ while ((child = ecore_dlist_next(EWL_CONTAINER(w)->children))) {
/*
* reset geometry values for the next child
*/
@@ -589,19 +570,18 @@
c_w = 0;
c_h = 0;
- c = (Ewl_Grid_Child *) ewl_widget_data_get(child, (void *) g);
-
+ c = (Ewl_Grid_Child *)ewl_widget_data_get(child, (void *) g);
if (c) {
/*
* calculate the geometry of the fixed widgets
*/
/* calculate child widgets width */
- for (i = c->start_col - 1; i < c->end_col; i++)
+ for (i = (c->start_col - 1); i < c->end_col; i++)
c_w += g->col_size[i].current_size;
/* calculate child widgets height */
- for (i = c->start_row - 1; i < c->end_row; i++)
+ for (i = (c->start_row - 1); i < c->end_row; i++)
c_h += g->row_size[i].current_size;
/* calculate child widgets x coordinate */
@@ -688,19 +668,16 @@
g->map = NEW(char, g->cols * g->rows);
ecore_dlist_goto_first(EWL_CONTAINER(g)->children);
- while ((child = ecore_dlist_next(EWL_CONTAINER(g)->children)) != NULL) {
- c = (Ewl_Grid_Child *) ewl_widget_data_get(child, (void *) g);
+ while ((child = ecore_dlist_next(EWL_CONTAINER(g)->children))) {
+ c = (Ewl_Grid_Child *) ewl_widget_data_get(child, (void *)g);
+ if (!c) continue;
- if (c) {
/*
* mark all positions that content a positioned widget
*/
- for (l = c->start_col - 1; l < c->end_col && l < g->cols; l++)
- for (k = c->start_row - 1; k < c->end_row
- && k < g->rows; k++)
+ for (l = (c->start_col - 1); l < c->end_col && l < g->cols; l++)
+ for (k = c->start_row - 1; k < c->end_row && k <
g->rows; k++)
g->map[g->cols * k + l] = 1;
-
- }
}
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -737,62 +714,61 @@
* First collect the data of the non-fixed postion widgets
*/
ecore_dlist_goto_first(EWL_CONTAINER(g)->children);
- while ((child = ecore_dlist_next(EWL_CONTAINER(g)->children)) != NULL) {
+ while ((child = ecore_dlist_next(EWL_CONTAINER(g)->children))) {
+ int pref_w, pref_h;
+
c = (Ewl_Grid_Child *) ewl_widget_data_get(child, (void *) g);
+ if (c) continue;
- if (!c) {
- int pref_w, pref_h;
- /*
- * go to the next free place
- */
- pref_w = ewl_object_preferred_w_get(EWL_OBJECT(child));
- pref_h = ewl_object_preferred_h_get(EWL_OBJECT(child));
- g->col_size[col].preferred_size
- = MAX(g->col_size[col].preferred_size, pref_w);
- g->row_size[row].preferred_size
- = MAX(g->row_size[row].preferred_size, pref_h);
+ /*
+ * go to the next free place
+ */
+ pref_w = ewl_object_preferred_w_get(EWL_OBJECT(child));
+ pref_h = ewl_object_preferred_h_get(EWL_OBJECT(child));
+ g->col_size[col].preferred_size =
+ MAX(g->col_size[col].preferred_size, pref_w);
+ g->row_size[row].preferred_size =
+ MAX(g->row_size[row].preferred_size, pref_h);
- go_next(g, &col, &row);
- }
+ go_next(g, &col, &row);
}
/*
* and now collect the data of the fixed postion widgets
*/
ecore_dlist_goto_first(EWL_CONTAINER(g)->children);
- while ((child = ecore_dlist_next(EWL_CONTAINER(g)->children)) != NULL) {
+ while ((child = ecore_dlist_next(EWL_CONTAINER(g)->children))) {
+ int pref_w = 0, pref_h = 0;
+ int i;
+
c = (Ewl_Grid_Child *) ewl_widget_data_get(child, (void *) g);
+ if (!c) continue;
- if (c) {
- int pref_w, pref_h;
- int i;
- pref_w = pref_h = 0;
- /*
- * first calculate the current preferred size
- * of the cells
- */
- for (i = c->start_col - 1; i < c->end_col; i++)
- pref_w += g->col_size[i].preferred_size;
- for (i = c->start_row - 1; i < c->end_row; i++)
- pref_h += g->row_size[i].preferred_size;
+ /*
+ * first calculate the current preferred size
+ * of the cells
+ */
+ for (i = (c->start_col - 1); i < c->end_col; i++)
+ pref_w += g->col_size[i].preferred_size;
+
+ for (i = (c->start_row - 1); i < c->end_row; i++)
+ pref_h += g->row_size[i].preferred_size;
- pref_w = ewl_object_preferred_w_get(EWL_OBJECT(child))
- - pref_w;
- pref_h = ewl_object_preferred_h_get(EWL_OBJECT(child))
- - pref_h;
+ pref_w = ewl_object_preferred_w_get(EWL_OBJECT(child)) - pref_w;
+ pref_h = ewl_object_preferred_h_get(EWL_OBJECT(child)) - pref_h;
- if (pref_w > 0) {
- pref_w /= c->end_col - c->start_col + 1;
- for (i = c->start_col - 1; i < c->end_col; i++)
- g->col_size[i].preferred_size += pref_w;
- }
- if (pref_h > 0) {
- pref_h /= c->end_row - c->start_row + 1;
- for (i = c->start_row - 1; i < c->end_row; i++)
- g->row_size[i].preferred_size += pref_h;
- }
+ if (pref_w > 0) {
+ pref_w /= c->end_col - c->start_col + 1;
+ for (i = (c->start_col - 1); i < c->end_col; i++)
+ g->col_size[i].preferred_size += pref_w;
+ }
+
+ if (pref_h > 0) {
+ pref_h /= c->end_row - c->start_row + 1;
+ for (i = (c->start_row - 1); i < c->end_row; i++)
+ g->row_size[i].preferred_size += pref_h;
}
}
@@ -829,9 +805,9 @@
if (g->homogeneous_v) {
int i, size;
- for (i = 0, size = 0; i < g->rows; i++) {
+ for (i = 0, size = 0; i < g->rows; i++)
size = MAX(size, g->row_size[i].preferred_size);
- }
+
ewl_object_preferred_inner_h_set(EWL_OBJECT(g), size * g->rows);
}
else {
@@ -875,6 +851,7 @@
new_w = CURRENT_W(g);
new_h = CURRENT_H(g);
+
/*
* calculated the new columns' widths
*/
@@ -911,9 +888,7 @@
for (i = 0; i < g->cols; i++)
if (!g->col_size[i].override)
g->col_size[i].current_size =
- (int)g->col_size[i].current_size
- * rel;
-
+ (int)g->col_size[i].current_size * rel;
}
/*
@@ -951,8 +926,7 @@
for (i = 0; i < g->rows; i++)
if (!g->row_size[i].override)
g->row_size[i].current_size =
- g->row_size[i].current_size
- * rel;
+ g->row_size[i].current_size * rel;
}
/*
@@ -963,8 +937,10 @@
left_over = new_w;
for (i = 0; i < g->cols; i++)
left_over -= g->col_size[i].current_size;
+
if (g->cols == 0)
g->cols = 1;
+
while (left_over != 0) {
if (left_over > 0) {
g->col_size[left_over % g->cols].current_size += 1;
@@ -979,8 +955,10 @@
left_over = new_h;
for (i = 0; i < g->rows; i++)
left_over -= g->row_size[i].current_size;
+
if (g->rows == 0)
g->rows = 1;
+
while (left_over != 0) {
if (left_over > 0) {
g->row_size[left_over % g->rows].current_size += 1;
@@ -1025,7 +1003,7 @@
col = 0;
row++;
}
- } while (g->map[col + row * g->cols] != 0);
+ } while (g->map[col + (row * g->cols)] != 0);
*c = col;
*r = row;
@@ -1063,7 +1041,7 @@
row = 0;
col++;
}
- } while (g->map[col + row * g->cols] != 0);
+ } while (g->map[col + (row * g->cols)] != 0);
*c = col;
*r = row;
@@ -1123,12 +1101,12 @@
g->data_dirty = TRUE;
g->space++;
- if (g->space > g->cols * g->rows) {
+ if (g->space > (g->cols * g->rows)) {
if (g->orientation == EWL_ORIENTATION_HORIZONTAL)
- ewl_grid_dimension_set(g, g->cols,
- g->space / g->cols + 1);
+ ewl_grid_dimensions_set(g, g->cols,
+ (g->space / g->cols) + 1);
else
- ewl_grid_dimension_set(g, g->space / g->rows + 1,
+ ewl_grid_dimensions_set(g, (g->space / g->rows) + 1,
g->rows);
}
@@ -1169,25 +1147,6 @@
IF_FREE(g->map);
g->map = NULL;
g->data_dirty = TRUE;
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-/**
- * @internal
- * @param p: The container to work with
- * @param c: The widget to work with
- * @return Returns no value
- * @brief Notify the grid that a child has been added.
- */
-void
-ewl_grid_child_show_cb(Ewl_Container *p, Ewl_Widget *c)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("p", p);
- DCHECK_PARAM_PTR("c", c);
- DCHECK_TYPE("p", p, EWL_CONTAINER_TYPE);
- DCHECK_TYPE("c", c, EWL_WIDGET_TYPE);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_grid.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ewl_grid.h 9 Jul 2006 23:01:32 -0000 1.15
+++ ewl_grid.h 10 Jul 2006 02:43:24 -0000 1.16
@@ -87,27 +87,30 @@
int end_row; /**< The end row */
};
-Ewl_Widget *ewl_grid_new();
+Ewl_Widget *ewl_grid_new(void);
int ewl_grid_init(Ewl_Grid *g);
void ewl_grid_child_position_set(Ewl_Grid *g, Ewl_Widget *child,
- int start_col, int end_col, int start_row,
- int end_row);
+ int start_col, int end_col, int start_row,
+ int end_row);
-void ewl_grid_dimension_set(Ewl_Grid *g, int col, int row);
-void ewl_grid_col_w_set(Ewl_Grid *g, int col, float relw, int
width);
-void ewl_grid_row_h_set(Ewl_Grid *g, int row, float relh, int
height);
+void ewl_grid_dimensions_set(Ewl_Grid *g, int col, int row);
+
+void ewl_grid_column_w_set(Ewl_Grid *g, int col, float relw, int
width);
+void ewl_grid_column_w_get(Ewl_Grid *g, int col, float *relw, int
*width);
-void ewl_grid_col_w_get(Ewl_Grid *g, int col, float *relw, int
*width);
+void ewl_grid_row_h_set(Ewl_Grid *g, int row, float relh, int
height);
void ewl_grid_row_h_get(Ewl_Grid *g, int row, float *relh, int
*height);
void ewl_grid_orientation_set(Ewl_Grid *g, Ewl_Orientation
orientation);
Ewl_Orientation ewl_grid_orientation_get(Ewl_Grid *g);
void ewl_grid_homogeneous_set(Ewl_Grid *g, unsigned int h);
+
void ewl_grid_hhomogeneous_set(Ewl_Grid *g, unsigned int h);
-void ewl_grid_vhomogeneous_set(Ewl_Grid *g, unsigned int h);
unsigned int ewl_grid_hhomogeneous_get(Ewl_Grid *g);
+
+void ewl_grid_vhomogeneous_set(Ewl_Grid *g, unsigned int h);
unsigned int ewl_grid_vhomogeneous_get(Ewl_Grid *g);
/*
@@ -120,9 +123,8 @@
void ewl_grid_child_remove_cb(Ewl_Container *p, Ewl_Widget *c, int idx);
void ewl_grid_child_show_cb(Ewl_Container *p, Ewl_Widget *c);
void ewl_grid_child_resize_cb(Ewl_Container *p, Ewl_Widget *child,
- int size, Ewl_Orientation o);
-void ewl_grid_child_destroy_cb(Ewl_Widget *w, void *ev_data,
- void *user_data);
+ int size, Ewl_Orientation o);
+void ewl_grid_child_destroy_cb(Ewl_Widget *w, void *ev_data, void *user_data);
/**
* @}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_table.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ewl_table.c 9 Jul 2006 23:01:32 -0000 1.16
+++ ewl_table.c 10 Jul 2006 02:43:24 -0000 1.17
@@ -67,9 +67,9 @@
*/
t->grid = (Ewl_Grid *)ewl_grid_new();
if (col_headers)
- ewl_grid_dimension_set(t->grid, cols, rows + 1);
+ ewl_grid_dimensions_set(t->grid, cols, rows + 1);
else
- ewl_grid_dimension_set(t->grid, cols, rows);
+ ewl_grid_dimensions_set(t->grid, cols, rows);
ewl_container_child_append(EWL_CONTAINER(t), EWL_WIDGET(t->grid));
ewl_widget_show(EWL_WIDGET(t->grid));
@@ -272,13 +272,13 @@
* @brief Set the width of a table column
*/
void
-ewl_table_col_w_set(Ewl_Table *table, int col, int width)
+ewl_table_column_w_set(Ewl_Table *table, int col, int width)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("table", table);
DCHECK_TYPE("table", table, EWL_TABLE_TYPE);
- ewl_grid_col_w_set(table->grid, col, 0.0,width);
+ ewl_grid_column_w_set(table->grid, col, 0.0,width);
ewl_widget_configure(EWL_WIDGET(table));
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -292,13 +292,13 @@
* @brief Get the width of a table column
*/
void
-ewl_table_col_w_get(Ewl_Table *table, int col, int *width)
+ewl_table_column_w_get(Ewl_Table *table, int col, int *width)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("table", table);
DCHECK_TYPE("table", table, EWL_TABLE_TYPE);
- ewl_grid_col_w_get(table->grid, col, NULL, width);
+ ewl_grid_column_w_get(table->grid, col, NULL, width);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -363,9 +363,9 @@
ewl_container_reset(EWL_CONTAINER(t->grid));
if (col_headers != NULL)
- ewl_grid_dimension_set(EWL_GRID(t->grid), cols, rows+1);
+ ewl_grid_dimensions_set(EWL_GRID(t->grid), cols, rows+1);
else
- ewl_grid_dimension_set(EWL_GRID(t->grid), cols, rows);
+ ewl_grid_dimensions_set(EWL_GRID(t->grid), cols, rows);
if (col_headers != NULL) {
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_table.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ewl_table.h 8 May 2006 18:31:51 -0000 1.13
+++ ewl_table.h 10 Jul 2006 02:43:24 -0000 1.14
@@ -64,10 +64,10 @@
void ewl_table_reset(Ewl_Table *t, int cols, int rows,
char **c_headers);
-void ewl_table_col_w_set(Ewl_Table *table, int col, int width);
+void ewl_table_column_w_set(Ewl_Table *table, int col, int width);
void ewl_table_row_h_set(Ewl_Table *table, int row, int height);
-void ewl_table_col_w_get(Ewl_Table *table, int col, int *width);
+void ewl_table_column_w_get(Ewl_Table *table, int col, int *width);
void ewl_table_row_h_get(Ewl_Table *table, int row, int *height);
void ewl_table_col_row_get(Ewl_Table *table, Ewl_Cell *cell,
-------------------------------------------------------------------------
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
