Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_stock.h ewl_icon.c ewl_button.c ewl_combo.c
Log Message:
- fix warnings
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_stock.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_stock.h 4 Dec 2006 07:16:39 -0000 1.4
+++ ewl_stock.h 7 Dec 2006 20:04:32 -0000 1.5
@@ -37,6 +37,39 @@
#define EWL_STOCK(stock) ((Ewl_Stock *) stock)
/**
+ * @def EWL_STOCK_LABEL_SET(f)
+ * Typecasts a pointer to a label set pointer
+ */
+#define EWL_STOCK_LABEL_SET(f) ((Ewl_Stock_Label_Set)f)
+
+/**
+ * The label set function definition
+ */
+typedef void (*Ewl_Stock_Label_Set)(Ewl_Stock *s, const char *txt);
+
+/**
+ * @def EWL_STOCK_IMAGE_SET(f)
+ * Typecasts a pointer to an image set pointer
+ */
+#define EWL_STOCK_IMAGE_SET(f) ((Ewl_Stock_Image_Set)f)
+
+/**
+ * The image set function definition
+ */
+typedef void (*Ewl_Stock_Image_Set)(Ewl_Stock *s, const char *file, const char
*key);
+
+/**
+ * @def EWL_STOCK_TOOLTIP_SET(f)
+ * Typecast to the tooltip set pointer
+ */
+#define EWL_STOCK_TOOLTIP_SET(f) ((Ewl_Stock_Tooltip_set)f)
+
+/**
+ * The tooltip set function definition
+ */
+typedef void (*Ewl_Stock_Tooltip_Set)(Ewl_Stock *s, const char *tip);
+
+/**
* @brief An abstract Ewl_Widget to provide the base for Ewl_Icon and
Ewl_Button
*/
struct Ewl_Stock
@@ -48,9 +81,9 @@
struct Ewl_Stock_Funcs
{
- void (*label_set)(Ewl_Stock *s, const char *txt); /**< The label
set function */
- void (*image_set)(Ewl_Stock *s, const char *file, const char *key);
/**< The image set function */
- void (*tooltip_set)(Ewl_Stock *s, const char *tip); /**< The
tooltip set function */
+ Ewl_Stock_Label_Set label_set; /**< The label set function */
+ Ewl_Stock_Image_Set image_set; /**< The image set function */
+ Ewl_Stock_Tooltip_Set tooltip_set; /**< The tooltip set function */
};
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_icon.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- ewl_icon.c 7 Dec 2006 19:07:07 -0000 1.25
+++ ewl_icon.c 7 Dec 2006 20:04:32 -0000 1.26
@@ -4,8 +4,9 @@
#include "ewl_private.h"
static Ewl_Stock_Funcs stock_funcs = {
- ewl_icon_label_set,
- ewl_icon_image_set
+ EWL_STOCK_LABEL_SET(ewl_icon_label_set),
+ EWL_STOCK_IMAGE_SET(ewl_icon_image_set),
+ NULL
};
/* XXX may want to make this configurable, possibly per icon? */
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_button.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- ewl_button.c 3 Dec 2006 06:21:33 -0000 1.42
+++ ewl_button.c 7 Dec 2006 20:04:32 -0000 1.43
@@ -4,8 +4,9 @@
#include "ewl_private.h"
static Ewl_Stock_Funcs stock_funcs = {
- ewl_button_label_set,
- ewl_button_image_set
+ EWL_STOCK_LABEL_SET(ewl_button_label_set),
+ EWL_STOCK_IMAGE_SET(ewl_button_image_set),
+ NULL
};
/**
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_combo.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- ewl_combo.c 6 Dec 2006 15:54:24 -0000 1.40
+++ ewl_combo.c 7 Dec 2006 20:04:32 -0000 1.41
@@ -147,7 +147,8 @@
* @brief Callback for when the button to expand the combo is pressed
*/
void
-ewl_combo_cb_decrement_clicked(Ewl_Widget *w __UNUSED__, void *ev, void *data)
+ewl_combo_cb_decrement_clicked(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__,
+ void *data)
{
Ewl_Combo *combo;
Ewl_Model *model;
-------------------------------------------------------------------------
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
