Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl
Dir : e17/libs/ewl/src/lib Modified Files: ewl_expansion.c ewl_expansion.h Log Message: - cleanup =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_expansion.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ewl_expansion.c 14 Feb 2007 10:40:51 -0000 1.1 +++ ewl_expansion.c 14 Feb 2007 20:36:33 -0000 1.2 @@ -47,7 +47,7 @@ w = EWL_WIDGET(cb); - if (!ewl_check_init(w)) + if (!ewl_check_init(EWL_CHECK(w))) DRETURN_INT(FALSE, DLEVEL_STABLE); ewl_widget_appearance_set(w, EWL_EXPANSION_TYPE); @@ -77,7 +77,13 @@ void ewl_expansion_expanded_set(Ewl_Expansion *cb, int c) { + DENTER_FUNCTION(DLEVEL_STABLE); + DCHECK_PARAM_PTR("cb", cb); + DCHECK_TYPE("cb", cb, EWL_EXPANSION_TYPE); + ewl_check_checked_set(EWL_CHECK(cb), c); + + DLEAVE_FUNCTION(DLEVEL_STABLE); } /** @@ -88,7 +94,11 @@ int ewl_expansion_is_expanded(Ewl_Expansion *cb) { - return ewl_check_is_checked(EWL_CHECK(cb)); + DENTER_FUNCTION(DLEVEL_STABLE); + DCHECK_PARAM_PTR_RET("cb", cb, FALSE); + DCHECK_TYPE_RET("cb", cb, EWL_EXPANSION_TYPE, FALSE); + + DRETURN_INT(ewl_check_is_checked(EWL_CHECK(cb)), DLEVEL_STABLE); } /** @@ -122,8 +132,8 @@ ewl_expansion_is_expandable(Ewl_Expansion *cb) { DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR_RET("cb", cb, 0); - DCHECK_TYPE_RET("cb", cb, EWL_EXPANSION_TYPE, 0); + DCHECK_PARAM_PTR_RET("cb", cb, FALSE); + DCHECK_TYPE_RET("cb", cb, EWL_EXPANSION_TYPE, FALSE); DRETURN_INT(cb->expandable, DLEVEL_STABLE); } @@ -166,16 +176,14 @@ */ void ewl_expansion_cb_reveal(Ewl_Widget *w, void *ev_data __UNUSED__, - void *user_data __UNUSED__) + void *user_data __UNUSED__) { - Ewl_Expansion *cb; - DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); - cb = EWL_EXPANSION(w); - ewl_expansion_cb_update_expandable(w, NULL, NULL); + DLEAVE_FUNCTION(DLEVEL_STABLE); } + =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_expansion.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ewl_expansion.h 14 Feb 2007 10:40:51 -0000 1.1 +++ ewl_expansion.h 14 Feb 2007 20:36:33 -0000 1.2 @@ -46,14 +46,17 @@ int ewl_expansion_init(Ewl_Expansion *c); int ewl_expansion_is_expandable(Ewl_Expansion *c); +void ewl_expansion_expandable_set(Ewl_Expansion *c, + int expandable); + int ewl_expansion_is_expanded(Ewl_Expansion *c); void ewl_expansion_expanded_set(Ewl_Expansion *c, int expanded); -void ewl_expansion_expandable_set(Ewl_Expansion *c, int expandable); /* * Internally used callbacks. */ -void ewl_expansion_cb_update_expandable(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_expansion_cb_update_expandable(Ewl_Widget *w, void *ev_data, + void *user_data); void ewl_expansion_cb_reveal(Ewl_Widget *w, void *ev_data, void *user_data); /** ------------------------------------------------------------------------- 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