Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
Tag: SPLIT
ewl_list.h ewl_object.h ewl_table.c
Log Message:
Syncing up my working directory before merging to head. Should just be a few
minor object and test app changes.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_list.h,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -3 -r1.8.2.2 -r1.8.2.3
--- ewl_list.h 7 Nov 2002 01:54:37 -0000 1.8.2.2
+++ ewl_list.h 14 Jan 2003 19:32:04 -0000 1.8.2.3
@@ -31,7 +31,7 @@
void ewl_list_append_widgets(Ewl_Widget * widget,
Ewl_Widget * widgets[]);
-void ewl_list_preppend_widgets(Ewl_Widget * widget,
+void ewl_list_prepend_widgets(Ewl_Widget * widget,
Ewl_Widget * widgets[]);
void ewl_list_insert_widgets(Ewl_Widget * widget,
Ewl_Widget * widgets[], int pos);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_object.h,v
retrieving revision 1.23.2.9
retrieving revision 1.23.2.10
diff -u -3 -r1.23.2.9 -r1.23.2.10
--- ewl_object.h 7 Nov 2002 01:54:37 -0000 1.23.2.9
+++ ewl_object.h 14 Jan 2003 19:32:18 -0000 1.23.2.10
@@ -1,4 +1,3 @@
-
#ifndef __EWL_OBJECT_H__
#define __EWL_OBJECT_H__
@@ -26,7 +25,7 @@
*/
struct {
int l, r, t, b;
- } pad , insets;
+ } pad, insets;
Ewl_Fill_Policy fill_policy;
Ewl_Alignment alignment;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_table.c,v
retrieving revision 1.26.2.10
retrieving revision 1.26.2.11
diff -u -3 -r1.26.2.10 -r1.26.2.11
--- ewl_table.c 7 Nov 2002 01:54:37 -0000 1.26.2.10
+++ ewl_table.c 14 Jan 2003 19:32:49 -0000 1.26.2.11
@@ -21,17 +21,11 @@
* @rows: the number of rows
* @col_headers: the column titles
*
- * Returns a pointer to a newly allocated grid on success, NULL on
+ * Returns a pointer to a newly allocated table on success, NULL on
* failure.
*/
Ewl_Widget *ewl_table_new(int cols, int rows, char **col_headers)
{
-
- /*---------------------------------
- * DEVELOPER NOTE:
- * the regular new function
- *---------------------------------*/
-
Ewl_Table *t;
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -41,10 +35,8 @@
DRETURN_PTR(NULL, DLEVEL_STABLE);
memset(t, 0, sizeof(Ewl_Table));
-
ewl_table_init(t, cols, rows, col_headers);
-
DRETURN_PTR(EWL_WIDGET(t), DLEVEL_STABLE);
}
@@ -60,13 +52,6 @@
*/
void ewl_table_init(Ewl_Table * t, int cols, int rows, char **col_headers)
{
-
- /*---------------------------------
- * DEVELOPER NOTE:
- * the regular init function
- *---------------------------------*/
-
-
Ewl_Widget *button;
Ewl_Table_Child *child;
int i;
@@ -75,25 +60,17 @@
DCHECK_PARAM_PTR("t", t);
DCHECK_PARAM_PTR("col_headers", col_headers);
-
/*
* Iniitialize the tables inherited fields
*/
- ewl_container_init(EWL_CONTAINER(t),
- "/box/vertical", NULL, NULL);
+ ewl_container_init(EWL_CONTAINER(t), "table", NULL, NULL);
ewl_object_set_fill_policy(EWL_OBJECT(t), EWL_FILL_POLICY_FILL);
- ewl_theme_data_set_str(EWL_WIDGET(t), "/box/vertical/base/visible",
- "no");
-
/*
* Create a new grid
*/
t->grid = (Ewl_Grid *) ewl_grid_new(cols, rows);
ewl_container_append_child(EWL_CONTAINER(t), EWL_WIDGET(t->grid));
- ewl_theme_data_set_str(EWL_WIDGET(t->grid),
- "/box/vertical/base/visible", "no");
-
/*
* Add the column headers to the grid
@@ -102,8 +79,6 @@
for (i = 1; i <= cols; i++) {
button = ewl_button_new(col_headers[i - 1]);
- ewl_object_set_fill_policy(EWL_OBJECT(button),
- EWL_FILL_POLICY_VSHRINK);
ewl_widget_disable(button);
child = __ewl_table_create_child(button);
ewl_grid_add(t->grid, EWL_WIDGET(child), i, i, 1, 1);
@@ -128,7 +103,6 @@
ewl_callback_append(EWL_WIDGET(t), EWL_CALLBACK_REALIZE,
__ewl_table_show, NULL);
-
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -172,7 +146,6 @@
ewl_widget_show(EWL_WIDGET(child));
-
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -212,7 +185,6 @@
}
txt = ewl_button_new(text);
- ewl_theme_data_set_str(txt, "/button/base/visible", "no");
child = __ewl_table_create_child(txt);
ewl_grid_add(table->grid, EWL_WIDGET(child),
start_col, end_col, start_row, end_row);
@@ -220,7 +192,6 @@
ewl_callback_prepend(child->widget, EWL_CALLBACK_MOUSE_UP,
__ewl_table_child_select, table);
-
DRETURN_PTR(EWL_WIDGET(child), DLEVEL_STABLE);
}
@@ -621,8 +592,6 @@
INSET_RIGHT(o),
CURRENT_H(o) - INSET_TOP(o) +
INSET_BOTTOM(o));
-
-
gc = (Ewl_Grid_Child *) ewl_widget_get_data(w, (void *) g);
-------------------------------------------------------
This SF.NET email is sponsored by: Take your first step towards giving
your online business a competitive advantage. Test-drive a Thawte SSL
certificate - our easy online guide will show you how. Click here to get
started: http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0027en
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
