Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_colorpicker.c
Log Message:
- type checking
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_colorpicker.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ewl_colorpicker.c 23 Oct 2005 16:05:37 -0000 1.10
+++ ewl_colorpicker.c 23 Oct 2005 17:09:01 -0000 1.11
@@ -8,16 +8,19 @@
* @brief Allocate and initialize a new color picker widget.
*/
Ewl_Widget *
-ewl_colorpicker_new()
+ewl_colorpicker_new(void)
{
Ewl_ColorPicker *cp;
DENTER_FUNCTION(DLEVEL_STABLE);
cp = NEW(Ewl_ColorPicker, 1);
+ if (!cp)
+ DRETURN_PTR(NULL, DLEVEL_STABLE);
+
if (!ewl_colorpicker_init(cp))
{
- FREE(cp);
+ ewl_widget_destroy(EWL_WIDGET(cp));
cp = NULL;
}
@@ -33,7 +36,7 @@
ewl_colorpicker_init(Ewl_ColorPicker *cp)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("cp", cp, 0);
+ DCHECK_PARAM_PTR_RET("cp", cp, FALSE);
if (!ewl_box_init(EWL_BOX(cp)))
DRETURN_INT(FALSE, DLEVEL_STABLE);
@@ -78,13 +81,25 @@
void
ewl_colorpicker_color_set(Ewl_ColorPicker *cp, int r, int g, int b)
{
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR("cp", cp);
+ DCHECK_TYPE("cp", cp, "colorpicker");
+
ewl_spectrum_rgba_set(EWL_SPECTRUM(cp->spectrum), r, g, b, 255);
+
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
}
void
ewl_colorpicker_hue_set(Ewl_ColorPicker *cp, float h)
{
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR("cp", cp);
+ DCHECK_TYPE("cp", cp, "colorpicker");
+
ewl_spectrum_hsv_set(EWL_SPECTRUM(cp->spectrum), h, 1, 1);
+
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
}
void
@@ -95,6 +110,9 @@
int r, g, b, a;
DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR("w", w);
+ DCHECK_PARAM_PTR("data", data);
+ DCHECK_TYPE("w", w, "widget");
cp = data;
sp = EWL_SPECTRUM(w);
@@ -115,6 +133,9 @@
Ewl_Spectrum *sp;
DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR("w", w);
+ DCHECK_PARAM_PTR("data", data);
+ DCHECK_TYPE("w", w, "widget");
cp = data;
sp = EWL_SPECTRUM(w);
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
