Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
ewl_container.h ewl_menu_base.c ewl_row.c ewl_seeker.c
ewl_seeker.h ewl_selectionbar.c ewl_selectionbar.h
ewl_spinner.c ewl_spinner.h ewl_table.c ewl_table.h
Log Message:
Cleanup a few mismatched return types and fix a check for the return value of
the container init function in the row code.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_container.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- ewl_container.h 18 Mar 2004 03:41:23 -0000 1.31
+++ ewl_container.h 18 Mar 2004 06:16:31 -0000 1.32
@@ -116,8 +116,12 @@
int ewl_container_parent_of(Ewl_Widget *c, Ewl_Widget *w);
void ewl_container_prefer_largest(Ewl_Container *c,
Ewl_Orientation o);
+
void ewl_container_call_child_add(Ewl_Container *c, Ewl_Widget *w);
void ewl_container_call_child_remove(Ewl_Container *c, Ewl_Widget *w);
+void ewl_container_call_child_show(Ewl_Container *c, Ewl_Widget *w);
+void ewl_container_call_child_hide(Ewl_Container *c, Ewl_Widget *w);
+
Ewl_Container *ewl_container_get_end_redirect(Ewl_Container *c);
Ewl_Container *ewl_container_get_redirect(Ewl_Container *c);
void ewl_container_set_redirect(Ewl_Container *c, Ewl_Container *rc);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_menu_base.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- ewl_menu_base.c 18 Mar 2004 03:41:23 -0000 1.27
+++ ewl_menu_base.c 18 Mar 2004 06:16:31 -0000 1.28
@@ -322,9 +322,11 @@
void
ewl_menu_popup_hold_cb(Ewl_Widget * w, void *ev_data, void *user_data)
{
- Ewl_Menu_Base *menu = EWL_MENU_BASE(user_data);
+ Ewl_Menu_Base *menu;
DENTER_FUNCTION(DLEVEL_STABLE);
+ menu = EWL_MENU_BASE(user_data);
+
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_row.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- ewl_row.c 18 Mar 2004 03:41:23 -0000 1.24
+++ ewl_row.c 18 Mar 2004 06:16:31 -0000 1.25
@@ -35,7 +35,7 @@
DCHECK_PARAM_PTR_RET("row", row, FALSE);
- if (ewl_container_init(EWL_CONTAINER(row), "row"))
+ if (!ewl_container_init(EWL_CONTAINER(row), "row"))
DRETURN_INT(FALSE, DLEVEL_STABLE);
ewl_container_show_notify(EWL_CONTAINER(row), ewl_row_child_show_cb);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_seeker.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- ewl_seeker.c 18 Mar 2004 03:41:23 -0000 1.52
+++ ewl_seeker.c 18 Mar 2004 06:16:31 -0000 1.53
@@ -31,12 +31,12 @@
* Initializes the seeker @a s to the orientation @a orientation to default
* values and callbacks.
*/
-void ewl_seeker_init(Ewl_Seeker * s, Ewl_Orientation orientation)
+int ewl_seeker_init(Ewl_Seeker * s, Ewl_Orientation orientation)
{
Ewl_Widget *w;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("s", s);
+ DCHECK_PARAM_PTR_RET("s", s, FALSE);
w = EWL_WIDGET(s);
@@ -101,7 +101,7 @@
ewl_container_notify_callback(EWL_CONTAINER(s),
EWL_CALLBACK_MOUSE_MOVE);
- DLEAVE_FUNCTION(DLEVEL_STABLE);
+ DRETURN_INT(FALSE, DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_seeker.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- ewl_seeker.h 19 Nov 2003 20:18:35 -0000 1.20
+++ ewl_seeker.h 18 Mar 2004 06:16:31 -0000 1.21
@@ -59,7 +59,7 @@
#define ewl_hseeker_new() ewl_seeker_new(EWL_ORIENTATION_HORIZONTAL);
Ewl_Widget *ewl_seeker_new(Ewl_Orientation orientation);
-void ewl_seeker_init(Ewl_Seeker * s, Ewl_Orientation orientation);
+int ewl_seeker_init(Ewl_Seeker * s, Ewl_Orientation orientation);
void ewl_seeker_set_value(Ewl_Seeker * s, double v);
double ewl_seeker_get_value(Ewl_Seeker * s);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_selectionbar.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ewl_selectionbar.c 18 Mar 2004 03:41:23 -0000 1.17
+++ ewl_selectionbar.c 18 Mar 2004 06:16:31 -0000 1.18
@@ -37,14 +37,14 @@
* Returns no value. Sets up the default callbacks and values for the
* the selectionbar
*/
-void ewl_selectionbar_init(Ewl_Selectionbar * s, Ewl_Widget * parent)
+int ewl_selectionbar_init(Ewl_Selectionbar * s, Ewl_Widget * parent)
{
Ewl_Widget *w;
Ewl_Embed *embed;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("s", s);
+ DCHECK_PARAM_PTR_RET("s", s, FALSE);
w = EWL_WIDGET(s);
@@ -59,7 +59,7 @@
s->bar = NEW(Ewl_Container, 1);
if (!s->bar)
- DRETURN(DLEVEL_STABLE);
+ DRETURN_INT(FALSE, DLEVEL_STABLE);
if (!ewl_container_init(EWL_CONTAINER(s->bar), "selectionbar"))
DRETURN_INT(FALSE, DLEVEL_STABLE);
@@ -104,7 +104,7 @@
s->OPEN = 1;
s->mouse_x = 0;
- DLEAVE_FUNCTION(DLEVEL_STABLE);
+ DRETURN_INT(FALSE, DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_selectionbar.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_selectionbar.h 14 Jan 2004 20:42:54 -0000 1.6
+++ ewl_selectionbar.h 18 Mar 2004 06:16:31 -0000 1.7
@@ -28,11 +28,10 @@
int OPEN; /* Boolean, open or closed */
};
-Ewl_Widget *ewl_selectionbar_new(Ewl_Widget * parent);
-void ewl_selectionbar_init(Ewl_Selectionbar * s,
- Ewl_Widget * parent);
-void ewl_selectionbar_set_size(Ewl_Selectionbar * s, int w, int h1,
- int h2);
+Ewl_Widget *ewl_selectionbar_new(Ewl_Widget * parent);
+int ewl_selectionbar_init(Ewl_Selectionbar * s, Ewl_Widget * parent);
+void ewl_selectionbar_set_size(Ewl_Selectionbar * s, int w, int h1,
+ int h2);
/*
* Internally used callbacks, override at your own risk.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_spinner.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- ewl_spinner.c 18 Mar 2004 03:41:23 -0000 1.47
+++ ewl_spinner.c 18 Mar 2004 06:16:31 -0000 1.48
@@ -27,12 +27,12 @@
*
* Sets the fields and callbacks of the spinner @a s their default values.
*/
-void ewl_spinner_init(Ewl_Spinner * s)
+int ewl_spinner_init(Ewl_Spinner * s)
{
Ewl_Widget *w;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("s", s);
+ DCHECK_PARAM_PTR_RET("s", s, FALSE);
w = EWL_WIDGET(s);
@@ -89,7 +89,7 @@
ewl_callback_append(s->button_decrease, EWL_CALLBACK_KEY_DOWN,
ewl_spinner_key_down_cb, NULL);
- DLEAVE_FUNCTION(DLEVEL_STABLE);
+ DRETURN_INT(FALSE, DLEVEL_STABLE);
}
/**
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_spinner.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ewl_spinner.h 18 Mar 2004 03:41:23 -0000 1.21
+++ ewl_spinner.h 18 Mar 2004 06:16:31 -0000 1.22
@@ -44,7 +44,7 @@
};
Ewl_Widget *ewl_spinner_new(void);
-void ewl_spinner_init(Ewl_Spinner * s);
+int ewl_spinner_init(Ewl_Spinner * s);
void ewl_spinner_set_value(Ewl_Spinner * s, double value);
double ewl_spinner_get_value(Ewl_Spinner * s);
void ewl_spinner_set_digits(Ewl_Spinner * s, int digits);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_table.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- ewl_table.c 18 Mar 2004 03:41:23 -0000 1.40
+++ ewl_table.c 18 Mar 2004 06:16:31 -0000 1.41
@@ -36,15 +36,15 @@
* Responsible for setting up default values and callbacks withing the table
* structure
*/
-void ewl_table_init(Ewl_Table * t, int cols, int rows, char **col_headers)
+int ewl_table_init(Ewl_Table * t, int cols, int rows, char **col_headers)
{
Ewl_Widget *button;
Ewl_Cell *cell;
int i;
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("t", t);
- DCHECK_PARAM_PTR("col_headers", col_headers);
+ DCHECK_PARAM_PTR_RET("t", t, FALSE);
+ DCHECK_PARAM_PTR_RET("col_headers", col_headers, FALSE);
/*
* Iniitialize the tables inherited fields
@@ -91,7 +91,7 @@
ewl_callback_append(EWL_WIDGET(t), EWL_CALLBACK_CONFIGURE,
ewl_table_configure_cb, NULL);
- DLEAVE_FUNCTION(DLEVEL_STABLE);
+ DRETURN_INT(FALSE, DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_table.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ewl_table.h 13 Feb 2004 06:25:20 -0000 1.18
+++ ewl_table.h 18 Mar 2004 06:16:31 -0000 1.19
@@ -48,7 +48,7 @@
Ewl_Widget *ewl_table_new(int cols, int rows, char **col_headers);
-void ewl_table_init(Ewl_Table * t, int cols, int rows,
+int ewl_table_init(Ewl_Table * t, int cols, int rows,
char **col_headers);
void ewl_table_add(Ewl_Table * table, Ewl_Cell * cell, int start_col,
int end_col, int start_row, int end_row);
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
