Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl
Dir : e17/libs/ewl/src/lib Modified Files: ewl_checkbutton.c ewl_checkbutton.h ewl_radiobutton.c ewl_radiobutton.h Log Message: - change Ewl_CheckButton -> Ewl_Checkbutton for consistency =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_checkbutton.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- ewl_checkbutton.c 12 Jan 2006 18:21:18 -0000 1.8 +++ ewl_checkbutton.c 15 Feb 2006 17:53:25 -0000 1.9 @@ -10,11 +10,11 @@ Ewl_Widget * ewl_checkbutton_new(void) { - Ewl_CheckButton *b; + Ewl_Checkbutton *b; DENTER_FUNCTION(DLEVEL_STABLE); - b = NEW(Ewl_CheckButton, 1); + b = NEW(Ewl_Checkbutton, 1); if (!b) DRETURN_PTR(NULL, DLEVEL_STABLE); @@ -35,7 +35,7 @@ * default values. */ int -ewl_checkbutton_init(Ewl_CheckButton *cb) +ewl_checkbutton_init(Ewl_Checkbutton *cb) { Ewl_Button *b; Ewl_Widget *w; @@ -74,7 +74,7 @@ * @return Returns no value. * @brief Update the checked state of the check button. */ -void ewl_checkbutton_checked_set(Ewl_CheckButton *cb, int c) +void ewl_checkbutton_checked_set(Ewl_Checkbutton *cb, int c) { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("cb", cb); @@ -88,7 +88,7 @@ /** * @brief Retrieve the checked state of a check button. */ -int ewl_checkbutton_is_checked(Ewl_CheckButton *cb) +int ewl_checkbutton_is_checked(Ewl_Checkbutton *cb) { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR_RET("cb", cb, FALSE); @@ -107,7 +107,7 @@ * Changes the position of the label associated with the check button. */ void -ewl_checkbutton_label_position_set(Ewl_CheckButton *cb, Ewl_Position p) +ewl_checkbutton_label_position_set(Ewl_Checkbutton *cb, Ewl_Position p) { Ewl_Button *b; @@ -148,7 +148,7 @@ ewl_checkbutton_clicked_cb(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { - Ewl_CheckButton *cb; + Ewl_Checkbutton *cb; DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_checkbutton.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- ewl_checkbutton.h 12 Jan 2006 18:21:18 -0000 1.7 +++ ewl_checkbutton.h 15 Feb 2006 17:53:25 -0000 1.8 @@ -1,10 +1,9 @@ -#ifndef __EWL_CHECKBUTTON_H__ -#define __EWL_CHECKBUTTON_H__ +#ifndef EWL_CHECKBUTTON_H +#define EWL_CHECKBUTTON_H /** - * @file ewl_checkbutton.h - * @defgroup Ewl_CheckButton CheckButton: A CheckButton with Label - * @brief Defines an Ewl_CheckButton that inherits from Ewl_Widget and + * @defgroup Ewl_Checkbutton Ewl_Checkbutton: An Ewl_Checkbutton with Label + * @brief Defines an Ewl_Checkbutton that inherits from Ewl_Widget and * provides an Ewl_Check that changes value on each click. * * @{ @@ -21,35 +20,32 @@ * The button class is a basic button with a label. This class is inherited by * the check button and radio button classes. */ -typedef struct Ewl_CheckButton Ewl_CheckButton; +typedef struct Ewl_Checkbutton Ewl_Checkbutton; /** * @def EWL_CHECKBUTTON(button) - * Typecasts a pointer to an Ewl_CheckButton pointer. + * Typecasts a pointer to an Ewl_Checkbutton pointer. */ -#define EWL_CHECKBUTTON(button) ((Ewl_CheckButton *) button) +#define EWL_CHECKBUTTON(button) ((Ewl_Checkbutton *) button) /** - * @struct Ewl_CheckButton + * @struct Ewl_Checkbutton * Inherits from Ewl_Widget and expands to provide a stateful check button. */ -struct Ewl_CheckButton +struct Ewl_Checkbutton { Ewl_Button button; /**< Inherit the basic button properties */ - - Ewl_Position label_position; /**< Order of label and check */ - Ewl_Widget *check; /**< Check widget represented */ }; Ewl_Widget *ewl_checkbutton_new(void); -int ewl_checkbutton_init(Ewl_CheckButton *cb); +int ewl_checkbutton_init(Ewl_Checkbutton *cb); -void ewl_checkbutton_checked_set(Ewl_CheckButton *cb, int checked); -int ewl_checkbutton_is_checked(Ewl_CheckButton *cb); +void ewl_checkbutton_checked_set(Ewl_Checkbutton *cb, int checked); +int ewl_checkbutton_is_checked(Ewl_Checkbutton *cb); -void ewl_checkbutton_label_position_set(Ewl_CheckButton *cb, +void ewl_checkbutton_label_position_set(Ewl_Checkbutton *cb, Ewl_Position p); /* @@ -62,4 +58,4 @@ * @} */ -#endif /* __EWL_CHECKBUTTON_H__ */ +#endif =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_radiobutton.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- ewl_radiobutton.c 12 Jan 2006 18:21:19 -0000 1.7 +++ ewl_radiobutton.c 15 Feb 2006 17:53:25 -0000 1.8 @@ -38,7 +38,7 @@ int ewl_radiobutton_init(Ewl_Radiobutton *rb) { - Ewl_CheckButton *cb; + Ewl_Checkbutton *cb; Ewl_Widget *w; DENTER_FUNCTION(DLEVEL_STABLE); @@ -102,7 +102,7 @@ ewl_radiobutton_clicked_cb(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { - Ewl_CheckButton *cb; + Ewl_Checkbutton *cb; Ewl_Radiobutton *rb; int oc; @@ -115,7 +115,7 @@ oc = ewl_checkbutton_is_checked(cb); if (rb->chain && !ecore_list_is_empty(rb->chain)) { - Ewl_CheckButton *c; + Ewl_Checkbutton *c; ecore_list_goto_first(rb->chain); while ((c = ecore_list_next(rb->chain)) != NULL) { =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_radiobutton.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- ewl_radiobutton.h 12 Jan 2006 18:21:19 -0000 1.5 +++ ewl_radiobutton.h 15 Feb 2006 17:53:25 -0000 1.6 @@ -30,12 +30,12 @@ #define EWL_RADIOBUTTON(button) ((Ewl_Radiobutton *) button) /** - * Inherits from Ewl_CheckButton and extends it to provide grouping buttons + * Inherits from Ewl_Checkbutton and extends it to provide grouping buttons * to limit to a single selection in a group at a given time. */ struct Ewl_Radiobutton { - Ewl_CheckButton button; /**< Inherit from Ewl_CheckButton */ + Ewl_Checkbutton button; /**< Inherit from Ewl_Checkbutton */ Ecore_List *chain; /**< List of members of the group */ }; @@ -46,7 +46,7 @@ /** * @def ewl_radiobutton_checked_set(r, c) - * Shortcut for setting the checked status on the inherited Ewl_CheckButton + * Shortcut for setting the checked status on the inherited Ewl_Checkbutton * fields. */ #define ewl_radiobutton_checked_set(r, c) \ @@ -54,7 +54,7 @@ /** * @def ewl_radiobutton_is_checked(r) - * Shortcut for checking the checked status on the inherited Ewl_CheckButton + * Shortcut for checking the checked status on the inherited Ewl_Checkbutton * fields. */ #define ewl_radiobutton_is_checked(r) \ ------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs