Enlightenment CVS committal
Author : pfritz
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_tree.c ewl_text.c ewl_radiobutton.c ewl_embed.c
ewl_attach.h
Log Message:
fix warnings
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- ewl_tree.c 11 Jun 2008 23:04:45 -0000 1.73
+++ ewl_tree.c 18 Jul 2008 12:32:02 -0000 1.74
@@ -726,7 +726,7 @@
/* update our sort information and call the sort function, skipping
* over SORT_NONE */
- tree->sort.column = (unsigned int)data;
+ tree->sort.column = INTPTR_TO_INT(data);
tree->sort.direction = ((tree->sort.direction + 1) %
EWL_SORT_DIRECTION_MAX);
if (!tree->sort.direction) tree->sort.direction ++;
@@ -779,7 +779,7 @@
ewl_callback_append(EWL_WIDGET(box), EWL_CALLBACK_CLICKED,
ewl_tree_cb_column_sort,
- (unsigned int *)column);
+ INT_TO_INTPTR(column));
c = ewl_button_new();
ewl_container_child_append(box, c);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_text.c,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -3 -r1.203 -r1.204
--- ewl_text.c 13 Jul 2008 00:05:41 -0000 1.203
+++ ewl_text.c 18 Jul 2008 12:32:02 -0000 1.204
@@ -804,7 +804,7 @@
DCHECK_PARAM_PTR_RET(t, 0);
DCHECK_TYPE_RET(t, EWL_TEXT_TYPE, 0);
- DRETURN_INT(t->obscure, DLEVEL_STABLE);
+ DRETURN_PTR(t->obscure, DLEVEL_STABLE);
}
/**
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_radiobutton.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ewl_radiobutton.c 7 May 2008 13:38:25 -0000 1.23
+++ ewl_radiobutton.c 18 Jul 2008 12:32:02 -0000 1.24
@@ -92,7 +92,7 @@
DCHECK_PARAM_PTR_RET(rb, 0);
DCHECK_TYPE_RET(rb, EWL_RADIOBUTTON_TYPE, 0);
- DRETURN_INT(rb->value, DLEVEL_STABLE);
+ DRETURN_PTR(rb->value, DLEVEL_STABLE);
}
/**
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -3 -r1.148 -r1.149
--- ewl_embed.c 17 Jun 2008 22:31:34 -0000 1.148
+++ ewl_embed.c 18 Jul 2008 12:32:02 -0000 1.149
@@ -1720,9 +1720,9 @@
pointer = argb->handle;
}
- if (!pointer) {
- if (!(pointer = (int)ewl_attach_get(w,
- EWL_ATTACH_TYPE_MOUSE_CURSOR)))
+ if (!pointer)
+ {
+ if (!(pointer = ewl_attach_mouse_cursor_get(w)))
pointer = EWL_MOUSE_CURSOR_LEFT_PTR;
}
ewl_engine_pointer_set(embed, pointer);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_attach.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- ewl_attach.h 17 Jun 2008 22:02:49 -0000 1.24
+++ ewl_attach.h 18 Jul 2008 12:32:02 -0000 1.25
@@ -75,12 +75,19 @@
/**
- * @def ewl_attach_mouse_cursor_set(w, data)
+ * @def ewl_attach_mouse_cursor_set(w, cursor)
* Convenience method to set a cursor widget attachment
*/
-#define ewl_attach_mouse_cursor_set(w, data) \
+#define ewl_attach_mouse_cursor_set(w, cursor) \
ewl_attach_other_set(EWL_WIDGET(w), EWL_ATTACH_TYPE_MOUSE_CURSOR, \
- (int *)data)
+ INT_TO_INTPTR(cursor))
+/**
+ * @def ewl_attach_mouse_cursor_get(w)
+ * Convenience method to get the widget's cursor attachment
+ */
+#define ewl_attach_mouse_cursor_get(w) \
+ INTPTR_TO_INT(ewl_attach_get(EWL_WIDGET(w), \
+ EWL_ATTACH_TYPE_MOUSE_CURSOR))
/**
* @def ewl_attach_mouse_argb_cursor_set(w, cursor)
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
