Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : libs/ewl

Dir     : e17/libs/ewl/src/lib


Modified Files:
        ewl_attach.c ewl_box.c ewl_dnd.c ewl_iconbox.c ewl_paned.c 
        ewl_scrollpane.c ewl_seeker.c ewl_spectrum.c ewl_text.c 
        ewl_tree.c ewl_widget.c ewl_widget.h ewl_window.c 


Log Message:
- fix warnings and errors

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_attach.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- ewl_attach.c        2 Dec 2005 19:53:44 -0000       1.20
+++ ewl_attach.c        29 Dec 2005 17:12:09 -0000      1.21
@@ -603,7 +603,7 @@
 
 static void
 ewl_attach_cb_tooltip_mouse_out(Ewl_Widget *w __UNUSED__, 
-                               void *ev __UNUSED__, void *data)
+                               void *ev __UNUSED__, void *data __UNUSED__)
 {
        Ewl_Attach *attach;
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_box.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ewl_box.c   17 Dec 2005 21:55:55 -0000      1.17
+++ ewl_box.c   29 Dec 2005 17:12:09 -0000      1.18
@@ -746,7 +746,7 @@
        DCHECK_TYPE("c", c, "container");
        DCHECK_TYPE("w", w, "widget");
 
-       if (ecore_list_nodes(c->children) > 1);
+       if (ecore_list_nodes(c->children) > 1)
                space = EWL_BOX(c)->spacing;
 
        /*
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_dnd.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ewl_dnd.c   22 Dec 2005 20:18:47 -0000      1.5
+++ ewl_dnd.c   29 Dec 2005 17:12:09 -0000      1.6
@@ -10,7 +10,6 @@
 static int ewl_dnd_move_count = 0;
 static Ecore_Evas* _ewl_dnd_drag_canvas;
 static Evas* _ewl_dnd_drag_evas;
-static Evas_Object* _ewl_dnd_evas_object;
 static Evas_Object* _ewl_dnd_drag_image;
 static Ecore_X_Window _ewl_dnd_evas_win;
 static Ecore_X_Window _ewl_dnd_drag_win = 0;
@@ -68,7 +67,8 @@
 
 
 static int
-_ewl_dnd_event_dnd_move(void *data, int type, void *event)
+_ewl_dnd_event_dnd_move(void *data __UNUSED__, int type __UNUSED__, 
+                                                       void *event)
 {
        Ecore_X_Event_Mouse_Move *ev;
        ev = event;
@@ -90,7 +90,8 @@
 
 
 static int
-_ewl_dnd_event_mouse_up(void *data, int type, void *event)
+_ewl_dnd_event_mouse_up(void *data __UNUSED__, int type __UNUSED__, 
+                                               void *event __UNUSED__)
 {
        if (_ewl_dnd_drag_canvas && ewl_dragging_current) {
                Ecore_List* pos;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_iconbox.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -3 -r1.98 -r1.99
--- ewl_iconbox.c       22 Dec 2005 12:17:44 -0000      1.98
+++ ewl_iconbox.c       29 Dec 2005 17:12:09 -0000      1.99
@@ -11,7 +11,7 @@
 #define ICONBOX_REPEAT 10000
 
 
-void* ewl_iconbox_drag_data_get() {
+void* ewl_iconbox_drag_data_get(void) {
        printf("Request for drag data!\n");
        return NULL;
 }
@@ -75,7 +75,8 @@
 }
 
 void
-ewl_iconbox_icon_floater_resize(Ewl_Widget *w __UNUSED__, void *ev_data, void* 
user_data)
+ewl_iconbox_icon_floater_resize(Ewl_Widget *w __UNUSED__, void *ev_data 
__UNUSED__, 
+                                                                       void* 
user_data)
 {
        Ewl_IconBox_Icon* icon = EWL_ICONBOX_ICON(user_data);
        int height = ewl_iconbox_icon_label_height_calculate(icon) + 10;
@@ -989,7 +990,8 @@
 
 
 /*Callbacks*/
-void ewl_iconbox_dnd_drop_cb(Ewl_Widget *item, void *ev_data, void *user_data) 
{
+void ewl_iconbox_dnd_drop_cb(Ewl_Widget *item __UNUSED__, 
+                               void *ev_data, void *user_data) {
        int ibx,iby,px,py,fw,fh;
        Ewl_IconBox* ib = EWL_ICONBOX(user_data);
        Ewl_IconBox_Icon* list_item = ib->select_icon;
@@ -1008,7 +1010,8 @@
 
 }
 
-void ewl_iconbox_dnd_position_cb(Ewl_Widget *item, void *ev_data, void 
*user_data) {
+void ewl_iconbox_dnd_position_cb(Ewl_Widget *item __UNUSED__, 
+                       void *ev_data __UNUSED__, void *user_data) {
        int ibx,iby,px,py,fw,fh;
        Ewl_IconBox* ib = EWL_ICONBOX(user_data);
        Ewl_IconBox_Icon* list_item = ib->select_icon;
@@ -1259,7 +1262,7 @@
        /*ewl_callback_call_with_event_data(EWL_WIDGET(ib), 
EWL_CALLBACK_MOUSE_DOWN, ev_data);*/
 }
 
-void ewl_iconbox_icon_mouse_up(Ewl_Widget *w , void *ev_data , void *user_data)
+void ewl_iconbox_icon_mouse_up(Ewl_Widget *w __UNUSED__, void *ev_data , void 
*user_data)
 {
        Ewl_Event_Mouse_Down *ev = ev_data;
        Ewl_IconBox_Icon* ib = user_data;
@@ -1345,7 +1348,7 @@
 }
 
 
-void ewl_iconbox_key_press_cb (Ewl_Widget *w, void *ev_data __UNUSED__, void 
*user_data) {
+void ewl_iconbox_key_press_cb (Ewl_Widget *w __UNUSED__, void *ev_data 
__UNUSED__, void *user_data) {
        Ewl_Event_Key_Down* event = ev_data;
        Ewl_IconBox* ib = user_data;
        struct timeval tim;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_paned.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ewl_paned.c 29 Dec 2005 06:03:05 -0000      1.13
+++ ewl_paned.c 29 Dec 2005 17:12:09 -0000      1.14
@@ -396,7 +396,8 @@
 /* this will size widgets as needed depending on where their grabber is. The
  * widget can not be smaller then it's minimum size */
 void
-ewl_paned_cb_configure(Ewl_Widget *w, void *ev, void *data)
+ewl_paned_cb_configure(Ewl_Widget *w, void *ev __UNUSED__, 
+                                       void *data __UNUSED__)
 {
        Ewl_Paned *p;
        Ewl_Widget *cur;
@@ -701,7 +702,7 @@
 
 static void
 ewl_paned_grabber_cb_mouse_up(Ewl_Widget *w, void *ev __UNUSED__, 
-                                               void *data)
+                                               void *data __UNUSED__)
 {
        DENTER_FUNCTION(DLEVEL_STABLE);
        DCHECK_PARAM_PTR("w", w);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_scrollpane.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ewl_scrollpane.c    27 Dec 2005 23:09:48 -0000      1.11
+++ ewl_scrollpane.c    29 Dec 2005 17:12:09 -0000      1.12
@@ -479,7 +479,7 @@
         * Get the focused widget and stop if its an internal one.
         */
        focus = ewl_embed_focused_widget_get(emb);
-       if (!focus || !ewl_container_parent_of(EWL_CONTAINER(s->box), focus) ||
+       if (!focus || !ewl_container_parent_of(s->box, focus) ||
                        ewl_widget_onscreen_is(focus))
                DRETURN(DLEVEL_STABLE);
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_seeker.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ewl_seeker.c        23 Dec 2005 07:08:11 -0000      1.9
+++ ewl_seeker.c        29 Dec 2005 17:12:09 -0000      1.10
@@ -654,7 +654,7 @@
 }
 
 void
-ewl_seeker_mouse_up_cb(Ewl_Widget *w, void *ev_data,
+ewl_seeker_mouse_up_cb(Ewl_Widget *w, void *ev_data __UNUSED__,
                                void *user_data __UNUSED__)
 {
        Ewl_Seeker *s = EWL_SEEKER(w);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_spectrum.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ewl_spectrum.c      7 Dec 2005 04:03:59 -0000       1.16
+++ ewl_spectrum.c      29 Dec 2005 17:12:09 -0000      1.17
@@ -305,7 +305,7 @@
 }
 
 void
-ewl_spectrum_cb_mouse_down(Ewl_Widget *w, void *ev, void *data)
+ewl_spectrum_cb_mouse_down(Ewl_Widget *w, void *ev, void *data __UNUSED__)
 {
        Ewl_Spectrum *sp;
        Ewl_Event_Mouse_Down *e;
@@ -335,7 +335,7 @@
 }
 
 void
-ewl_spectrum_cb_mouse_move(Ewl_Widget *w, void *ev, void *data)
+ewl_spectrum_cb_mouse_move(Ewl_Widget *w, void *ev, void *data __UNUSED__)
 {
        Ewl_Spectrum *sp;
        Ewl_Event_Mouse_Move *e;
@@ -363,7 +363,7 @@
 
 void
 ewl_spectrum_cb_mouse_up(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__,
-                                                       void *data)
+                                               void *data __UNUSED__)
 {
        Ewl_Spectrum *sp;
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_text.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- ewl_text.c  16 Dec 2005 06:08:06 -0000      1.82
+++ ewl_text.c  29 Dec 2005 17:12:09 -0000      1.83
@@ -2832,7 +2832,8 @@
 }
 
 void
-ewl_text_trigger_cb_destroy(Ewl_Widget *w, void *ev_data, void *user_data)
+ewl_text_trigger_cb_destroy(Ewl_Widget *w, void *ev_data __UNUSED__, 
+                                               void *user_data __UNUSED__)
 {
        Ewl_Text_Trigger *t;
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_tree.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ewl_tree.c  23 Dec 2005 15:57:31 -0000      1.21
+++ ewl_tree.c  29 Dec 2005 17:12:09 -0000      1.22
@@ -629,7 +629,7 @@
 }
 
 static void
-ewl_tree_row_signal(Ewl_Tree *tree, Ewl_Widget *row)
+ewl_tree_row_signal(Ewl_Tree *tree __UNUSED__, Ewl_Widget *row)
 {
        if (ewl_tree_row_pos & 1) {
                ewl_widget_state_set(row, "odd");
@@ -866,7 +866,7 @@
         * avoids duplicate or long list walks for queueing child widgets.
         */
        if (node->tree)
-               ewl_widget_configure(node->tree);
+               ewl_widget_configure(EWL_WIDGET(node->tree));
 
        tmp = ecore_list_new();
 
@@ -918,7 +918,7 @@
         * avoids duplicate or long list walks for queueing child widgets.
         */
        if (node->tree)
-               ewl_widget_configure(node->tree);
+               ewl_widget_configure(EWL_WIDGET(node->tree));
 
        tmp = ecore_list_new();
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_widget.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- ewl_widget.c        22 Dec 2005 20:18:47 -0000      1.54
+++ ewl_widget.c        29 Dec 2005 17:12:09 -0000      1.55
@@ -2459,7 +2459,7 @@
 }
 
 void
-ewl_widget_drag_move_cb (Ewl_Widget * w, void *ev_data __UNUSED__,
+ewl_widget_drag_move_cb (Ewl_Widget *w __UNUSED__, void *ev_data __UNUSED__,
                                void *user_data __UNUSED__) {
 
        if (!ewl_dnd_status_get()) return;
@@ -2482,7 +2482,7 @@
 }
 
 void
-ewl_widget_drag_up_cb (Ewl_Widget * w, void *ev_data __UNUSED__,
+ewl_widget_drag_up_cb (Ewl_Widget * w __UNUSED__, void *ev_data __UNUSED__,
                                void *user_data __UNUSED__) {
 
        if (ewl_object_flags_has(EWL_OBJECT(_ewl_drag_widget), 
EWL_FLAG_STATE_DND_WAIT, EWL_FLAGS_STATE_MASK)) {
@@ -2499,10 +2499,9 @@
  * @param val: the true/false state of draggable
  * @return Returns no value.
  * @brief Set the draggable state, and setup any callbacks
- *
  */
 void
-ewl_widget_draggable_set(Ewl_Widget *w, unsigned int val, void* (*cb) )
+ewl_widget_draggable_set(Ewl_Widget *w, unsigned int val, Ewl_Widget_Drag cb)
 {
        DENTER_FUNCTION(DLEVEL_STABLE);
        DCHECK_PARAM_PTR("w", w);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_widget.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- ewl_widget.h        22 Dec 2005 20:18:47 -0000      1.30
+++ ewl_widget.h        29 Dec 2005 17:12:09 -0000      1.31
@@ -58,6 +58,8 @@
        int r, g, b, a;
 };
 
+typedef void *(*Ewl_Widget_Drag)(void);
+
 /**
  * The class that all widgets should inherit. Provides reference to a parent
  * widget/container, callbacks, and appearance information.
@@ -172,8 +174,8 @@
 void            ewl_widget_color_get(Ewl_Widget *w, int *r, int *g, int *b, 
int *a);
 
 
-void           ewl_widget_draggable_set(Ewl_Widget* w, unsigned int val, void* 
(*cb) );
-Ewl_Widget*    ewl_widget_drag_candidate_get(void);
+void           ewl_widget_draggable_set(Ewl_Widget* w, unsigned int val, 
Ewl_Widget_Drag cb);
+Ewl_Widget     *ewl_widget_drag_candidate_get(void);
 void           ewl_widget_dnd_reset(void);
 
 /**
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_window.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- ewl_window.c        22 Dec 2005 04:29:44 -0000      1.25
+++ ewl_window.c        29 Dec 2005 17:12:09 -0000      1.26
@@ -336,7 +336,6 @@
 
        if (REALIZED(win)) {
                int fx=0,fy=0,cx,cy;
-               Ecore_X_Window_Attributes att;
                Ecore_X_Window window = (Ecore_X_Window)win->window;
                
                while (ecore_x_window_parent_get(window) > 0) {




-------------------------------------------------------
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://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to