Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor/src/bin
Modified Files:
edje_editor_canvas.c edje_editor_fill.c edje_editor_gradient.c
edje_editor_group.c edje_editor_position.c
edje_editor_program.c edje_editor_spectra.h
edje_editor_spectra_widget.c edje_editor_state.c
edje_editor_text.c edje_editor_toolbar.c edje_editor_tree.c
edje_editor_window.c main.c
Log Message:
* Fix warnings
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_canvas.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- edje_editor_canvas.c 12 Jul 2008 13:59:15 -0000 1.5
+++ edje_editor_canvas.c 12 Jul 2008 14:45:03 -0000 1.6
@@ -21,7 +21,7 @@
Evas_Coord mouse_x, mouse_y;
// MoveBox
- if ((int)data == DRAG_MOVEBOX)
+ if ((int)(long)data == DRAG_MOVEBOX)
{
evas_pointer_output_xy_get(ecore_evas_get(UI_ecore_MainWin),
&mouse_x, &mouse_y);
@@ -29,7 +29,7 @@
}
// Resize fake win
- if ((int)data == DRAG_MINIARROW)
+ if ((int)(long)data == DRAG_MINIARROW)
{
edje_object_part_geometry_get(EV_fakewin,"miniarrow", &x, &y, NULL,
NULL);
if (x < 0) x = 0;
@@ -38,7 +38,7 @@
}
// Move Rel1 Point
- if ((int)data == DRAG_REL1)
+ if ((int)(long)data == DRAG_REL1)
{
evas_pointer_output_xy_get(ecore_evas_get(UI_ecore_MainWin),
&mouse_x, &mouse_y);
@@ -58,7 +58,7 @@
position_frame_update();
}
// Move Rel2 Point
- if ((int)data == DRAG_REL2)
+ if ((int)(long)data == DRAG_REL2)
{
evas_pointer_output_xy_get(ecore_evas_get(UI_ecore_MainWin),
&mouse_x, &mouse_y);
@@ -77,7 +77,7 @@
position_frame_update();
}
// Move Move Handler
- if ((int)data == DRAG_MOVE)
+ if ((int)(long)data == DRAG_MOVE)
{
evas_pointer_output_xy_get(ecore_evas_get(UI_ecore_MainWin),
&mouse_x, &mouse_y);
@@ -109,9 +109,9 @@
position_frame_update();
}
// Move First Gradient Point Handler
- if ((int)data == DRAG_GRAD_1 || (int)data == DRAG_GRAD_2 )
+ if ((int)(long)data == DRAG_GRAD_1 || (int)(long)data == DRAG_GRAD_2 )
{
- char *type;
+ const char *type;
evas_pointer_output_xy_get(ecore_evas_get(UI_ecore_MainWin),
&mouse_x, &mouse_y);
evas_object_geometry_get(EV_focus_handler, &parentx, &parenty,
@@ -119,7 +119,7 @@
type = edje_edit_state_gradient_type_get(edje_o, Cur.part->string,
Cur.state->string);
//printf("GELLA %d %d %d %d [%f] [m %d %d]\n", fhx, fhy, fhw, fhh,
(float)(mouse_x - fhx)/(float)fhx, mouse_x, mouse_y);
- if ((int)data == DRAG_GRAD_1)
+ if ((int)(long)data == DRAG_GRAD_1)
{
if (edje_edit_state_gradient_use_fill_get(edje_o, Cur.part->string,
Cur.state->string))
@@ -172,7 +172,7 @@
Evas_Coord x, y, mx, my;
printf("Start Drag\n");
- if ((int)data == DRAG_REL1)
+ if ((int)(long)data == DRAG_REL1)
{
evas_object_event_callback_add(EV_rel1_handler, EVAS_CALLBACK_MOUSE_MOVE,
_canvas_drag_cb,(void*)DRAG_REL1);
@@ -181,7 +181,7 @@
evas_object_show(EV_rel1Y_align_guide);
evas_object_raise(EV_rel1Y_align_guide);
}
- if ((int)data == DRAG_REL2)
+ if ((int)(long)data == DRAG_REL2)
{
evas_object_event_callback_add(EV_rel2_handler, EVAS_CALLBACK_MOUSE_MOVE,
_canvas_drag_cb,(void*)DRAG_REL2);
@@ -190,7 +190,7 @@
evas_object_show(EV_rel2Y_align_guide);
evas_object_raise(EV_rel2Y_align_guide);
}
- if ((int)data == DRAG_MOVE)
+ if ((int)(long)data == DRAG_MOVE)
{
evas_object_event_callback_add(EV_move_handler, EVAS_CALLBACK_MOUSE_MOVE,
_canvas_drag_cb,(void*)DRAG_MOVE);
@@ -211,7 +211,7 @@
evas_object_raise(EV_rel2Y_align_guide);
}
- if ((int)data == DRAG_MOVEBOX)
+ if ((int)(long)data == DRAG_MOVEBOX)
{
evas_object_event_callback_add(EV_movebox, EVAS_CALLBACK_MOUSE_MOVE,
_canvas_drag_cb, (void*)DRAG_MOVEBOX);
@@ -221,7 +221,7 @@
dy = my - y;
}
- if ((int)data == DRAG_GRAD_1)
+ if ((int)(long)data == DRAG_GRAD_1)
{
evas_object_event_callback_add(EV_grad1_handler,
EVAS_CALLBACK_MOUSE_MOVE,
_canvas_drag_cb, (void*)DRAG_GRAD_1);
@@ -230,7 +230,7 @@
dx = mx - x;
dy = my - y;
}
- if ((int)data == DRAG_GRAD_2)
+ if ((int)(long)data == DRAG_GRAD_2)
{
evas_object_event_callback_add(EV_grad2_handler,
EVAS_CALLBACK_MOUSE_MOVE,
_canvas_drag_cb, data);
@@ -246,7 +246,7 @@
_canvas_drag_end_cb(void *data, Evas_Object *o, const char *emission, const
char *source)
{
//printf("End Drag\n");
- if ((int)data == DRAG_REL1)
+ if ((int)(long)data == DRAG_REL1)
{
evas_object_event_callback_del(EV_rel1_handler,EVAS_CALLBACK_MOUSE_MOVE,
_canvas_drag_cb);
@@ -255,7 +255,7 @@
evas_object_line_xy_set(EV_rel1X_align_guide, 0, 0, 0, 0);
evas_object_line_xy_set(EV_rel1Y_align_guide, 0, 0, 0, 0);
}
- if ((int)data == DRAG_REL2)
+ if ((int)(long)data == DRAG_REL2)
{
evas_object_event_callback_del(EV_rel2_handler,EVAS_CALLBACK_MOUSE_MOVE,
_canvas_drag_cb);
@@ -264,7 +264,7 @@
evas_object_line_xy_set(EV_rel2X_align_guide, 0, 0, 0, 0);
evas_object_line_xy_set(EV_rel2Y_align_guide, 0, 0, 0, 0);
}
- if ((int)data == DRAG_MOVE)
+ if ((int)(long)data == DRAG_MOVE)
{
evas_object_event_callback_del(EV_move_handler,EVAS_CALLBACK_MOUSE_MOVE,
_canvas_drag_cb);
@@ -277,16 +277,16 @@
evas_object_line_xy_set(EV_rel2X_align_guide, 0, 0, 0, 0);
evas_object_line_xy_set(EV_rel2Y_align_guide, 0, 0, 0, 0);
}
- if ((int)data == DRAG_MOVEBOX)
+ if ((int)(long)data == DRAG_MOVEBOX)
evas_object_event_callback_del(EV_movebox,EVAS_CALLBACK_MOUSE_MOVE,
_canvas_drag_cb);
- if ((int)data == DRAG_GRAD_1)
+ if ((int)(long)data == DRAG_GRAD_1)
evas_object_event_callback_del(EV_grad1_handler,EVAS_CALLBACK_MOUSE_MOVE,
_canvas_drag_cb);
- if ((int)data == DRAG_GRAD_2)
+ if ((int)(long)data == DRAG_GRAD_2)
evas_object_event_callback_del(EV_grad2_handler,EVAS_CALLBACK_MOUSE_MOVE,
_canvas_drag_cb);
- if ((int)data == DRAG_MINIARROW)
+ if ((int)(long)data == DRAG_MINIARROW)
{
int fw,fh; //Fakewin geometry
evas_object_geometry_get(EV_fakewin,NULL,NULL,&fw,&fh);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_fill.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edje_editor_fill.c 12 Jul 2008 13:59:15 -0000 1.3
+++ edje_editor_fill.c 12 Jul 2008 14:45:03 -0000 1.4
@@ -222,7 +222,7 @@
if (!etk_string_length_get(Cur.state) || !etk_string_length_get(Cur.part))
return ETK_TRUE;
- switch ((int)data)
+ switch ((int)(long)data)
{
case REL1X_SPINNER:
edje_edit_state_fill_size_relative_x_set(edje_o,
@@ -258,7 +258,7 @@
if (!etk_string_length_get(Cur.state) || !etk_string_length_get(Cur.part))
return ETK_TRUE;
- switch ((int)data)
+ switch ((int)(long)data)
{
case REL1X_SPINNER:
edje_edit_state_fill_origin_relative_x_set(edje_o,
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_gradient.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edje_editor_gradient.c 12 Jul 2008 13:59:15 -0000 1.3
+++ edje_editor_gradient.c 12 Jul 2008 14:45:03 -0000 1.4
@@ -13,7 +13,7 @@
if (!etk_string_length_get(Cur.state) || !etk_string_length_get(Cur.part))
return ETK_TRUE;
- switch ((int)data)
+ switch ((int)(long)data)
{
case REL1X_SPINNER:
edje_edit_state_gradient_rel1_relative_x_set(edje_o,
@@ -235,7 +235,8 @@
void
gradient_frame_update(void)
{
- char *type, *p;
+ const char *type;
+ char *p;
int i;
Etk_Combobox_Item *item;
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_group.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- edje_editor_group.c 12 Jul 2008 13:59:15 -0000 1.7
+++ edje_editor_group.c 12 Jul 2008 14:45:03 -0000 1.8
@@ -164,7 +164,7 @@
{
printf("Group Spinners value changed signal EMIT\n");
if (!etk_string_length_get(Cur.part)) return ETK_TRUE;
- switch ((int)data)
+ switch ((int)(long)data)
{
case MINW_SPINNER:
edje_edit_group_min_w_set(edje_o,
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_position.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- edje_editor_position.c 12 Jul 2008 13:59:15 -0000 1.9
+++ edje_editor_position.c 12 Jul 2008 14:45:03 -0000 1.10
@@ -524,7 +524,7 @@
if (etk_string_length_get(Cur.state) && etk_string_length_get(Cur.part))
{
- switch ((int)data)
+ switch ((int)(long)data)
{
case REL1X_SPINNER:
edje_edit_state_rel1_offset_x_set(edje_o,
@@ -559,7 +559,7 @@
if (etk_string_length_get(Cur.state) && etk_string_length_get(Cur.part))
{
- switch ((int)data)
+ switch ((int)(long)data)
{
case REL1X_SPINNER:
edje_edit_state_rel1_relative_x_set(edje_o,
@@ -602,7 +602,7 @@
return ETK_TRUE;
}
- switch ((int)data)
+ switch ((int)(long)data)
{
case REL1X_SPINNER:
edje_edit_state_rel1_to_x_set(edje_o, Cur.part->string,
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_program.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- edje_editor_program.c 12 Jul 2008 13:59:15 -0000 1.7
+++ edje_editor_program.c 12 Jul 2008 14:45:03 -0000 1.8
@@ -478,7 +478,7 @@
if (!etk_string_length_get(Cur.prog)) return ETK_TRUE;
//Get the new action from the combo data
- action = (int)etk_combobox_item_data_get(
+ action = (int)(long)etk_combobox_item_data_get(
etk_combobox_active_item_get(combobox));
edje_edit_program_action_set(edje_o, Cur.prog->string, action);
@@ -755,7 +755,7 @@
printf("Changed Signal on TransitionComboBox Emitted\n");
//get the transition from the combo data
- trans =
(int)etk_combobox_item_data_get(etk_combobox_active_item_get(combobox));
+ trans =
(int)(long)etk_combobox_item_data_get(etk_combobox_active_item_get(combobox));
edje_edit_program_transition_set(edje_o, Cur.prog->string, trans);
return ETK_TRUE;
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_spectra.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_editor_spectra.h 12 Jul 2008 13:05:17 -0000 1.1
+++ edje_editor_spectra.h 12 Jul 2008 14:45:03 -0000 1.2
@@ -11,6 +11,10 @@
void spectra_window_show (void);
void spectra_window_populate (void);
+void //TODO this should be done as a new Etk_Event with a callback
+spectra_window_gradient_changed(Etk_Widget *spectra);
+void //TODO this should be done as a new Etk_Event with a callback
+spectra_window_gradient_name_changed(Etk_Widget *spectra);
Etk_Bool _spectra_list_row_selected_cb(Etk_Tree *tree, Etk_Tree_Row *row, void
*data);
Etk_Bool _spectra_add_button_click_cb(Etk_Button *button, void *data);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_spectra_widget.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edje_editor_spectra_widget.c 12 Jul 2008 13:59:15 -0000 1.3
+++ edje_editor_spectra_widget.c 12 Jul 2008 14:45:03 -0000 1.4
@@ -159,11 +159,11 @@
image = etk_image_new_from_edje(EdjeFile, "COLOR.PNG");
etk_widget_color_set(image, r, g, b, 255);
etk_object_data_set(ETK_OBJECT(image), "spectra", spectra);
- etk_object_data_set(ETK_OBJECT(image), "color_r", (void*)r);
- etk_object_data_set(ETK_OBJECT(image), "color_g", (void*)g);
- etk_object_data_set(ETK_OBJECT(image), "color_b", (void*)b);
- etk_object_data_set(ETK_OBJECT(image), "color_a", (void*)a);
- etk_object_data_set(ETK_OBJECT(image), "color_d", (void*)d);
+ etk_object_data_set(ETK_OBJECT(image), "color_r", (void*)(long)r);
+ etk_object_data_set(ETK_OBJECT(image), "color_g", (void*)(long)g);
+ etk_object_data_set(ETK_OBJECT(image), "color_b", (void*)(long)b);
+ etk_object_data_set(ETK_OBJECT(image), "color_a", (void*)(long)a);
+ etk_object_data_set(ETK_OBJECT(image), "color_d", (void*)(long)d);
etk_object_data_set(ETK_OBJECT(image), "arrow_o", arrow);
etk_signal_connect("mouse-down", ETK_OBJECT(image),
ETK_CALLBACK(_spectra_widget_color_mouse_down_cb),
canvas);
@@ -237,11 +237,11 @@
image = evas_list_nth(images, color_num);
if (!image) return;
- *r = (int)etk_object_data_get(ETK_OBJECT(image), "color_r");
- *g = (int)etk_object_data_get(ETK_OBJECT(image), "color_g");
- *b = (int)etk_object_data_get(ETK_OBJECT(image), "color_b");
- *a = (int)etk_object_data_get(ETK_OBJECT(image), "color_a");
- *d = (int)etk_object_data_get(ETK_OBJECT(image), "color_d");
+ *r = (int)(long)etk_object_data_get(ETK_OBJECT(image), "color_r");
+ *g = (int)(long)etk_object_data_get(ETK_OBJECT(image), "color_g");
+ *b = (int)(long)etk_object_data_get(ETK_OBJECT(image), "color_b");
+ *a = (int)(long)etk_object_data_get(ETK_OBJECT(image), "color_a");
+ *d = (int)(long)etk_object_data_get(ETK_OBJECT(image), "color_d");
}
/* internals */
@@ -266,7 +266,7 @@
{
Etk_Widget *image;
image = l->data;
- total += (int)etk_object_data_get(ETK_OBJECT(image), "color_d");
+ total += (int)(long)etk_object_data_get(ETK_OBJECT(image), "color_d");
}
rapporto = (float)canvas_w / (float)total;
@@ -281,11 +281,11 @@
image = l->data;
- r = (int)etk_object_data_get(ETK_OBJECT(image), "color_r");
- g = (int)etk_object_data_get(ETK_OBJECT(image), "color_g");
- b = (int)etk_object_data_get(ETK_OBJECT(image), "color_b");
- a = (int)etk_object_data_get(ETK_OBJECT(image), "color_a");
- d = (int)etk_object_data_get(ETK_OBJECT(image), "color_d");
+ r = (int)(long)etk_object_data_get(ETK_OBJECT(image), "color_r");
+ g = (int)(long)etk_object_data_get(ETK_OBJECT(image), "color_g");
+ b = (int)(long)etk_object_data_get(ETK_OBJECT(image), "color_b");
+ a = (int)(long)etk_object_data_get(ETK_OBJECT(image), "color_a");
+ d = (int)(long)etk_object_data_get(ETK_OBJECT(image), "color_d");
arrow = etk_object_data_get(ETK_OBJECT(image), "arrow_o");
evas_object_gradient_color_stop_add(gradient, r, g, b, a, d);
@@ -359,10 +359,10 @@
etk_object_data_set(ETK_OBJECT(colorp), "current_image_o", widget);
- r = (int)etk_object_data_get(ETK_OBJECT(widget), "color_r");
- g = (int)etk_object_data_get(ETK_OBJECT(widget), "color_g");
- b = (int)etk_object_data_get(ETK_OBJECT(widget), "color_b");
- a = (int)etk_object_data_get(ETK_OBJECT(widget), "color_a");
+ r = (int)(long)etk_object_data_get(ETK_OBJECT(widget), "color_r");
+ g = (int)(long)etk_object_data_get(ETK_OBJECT(widget), "color_g");
+ b = (int)(long)etk_object_data_get(ETK_OBJECT(widget), "color_b");
+ a = (int)(long)etk_object_data_get(ETK_OBJECT(widget), "color_a");
_spectra_widget_colorpicker_color_set(spectra, r, g, b, a);
//etk_widget_disabled_set(colorp, ETK_FALSE);
@@ -428,9 +428,9 @@
etk_canvas_child_position_get(ETK_CANVAS(canvas), point, &px, &py);
if (images->next)
- etk_object_data_set(ETK_OBJECT(image), "color_d", (void*)px - total);
+ etk_object_data_set(ETK_OBJECT(image), "color_d", ((void*)(long)(px -
total)));
else
- etk_object_data_set(ETK_OBJECT(image), "color_d", (void*)canvas_w -
total);
+ etk_object_data_set(ETK_OBJECT(image), "color_d",
((void*)(long)(canvas_w - total)));
total = px;
images = images->next;
@@ -451,10 +451,10 @@
if (!image) return ETK_TRUE;
col = etk_colorpicker_current_color_get(colorpicker);
- etk_object_data_set(ETK_OBJECT(image), "color_r", (void*)col.r);
- etk_object_data_set(ETK_OBJECT(image), "color_g", (void*)col.g);
- etk_object_data_set(ETK_OBJECT(image), "color_b", (void*)col.b);
- etk_object_data_set(ETK_OBJECT(image), "color_a", (void*)col.a);
+ etk_object_data_set(ETK_OBJECT(image), "color_r", (void*)(long)col.r);
+ etk_object_data_set(ETK_OBJECT(image), "color_g", (void*)(long)col.g);
+ etk_object_data_set(ETK_OBJECT(image), "color_b", (void*)(long)col.b);
+ etk_object_data_set(ETK_OBJECT(image), "color_a", (void*)(long)col.a);
etk_widget_color_set(image, col.r, col.g, col.b, 255);
@@ -483,10 +483,10 @@
images = evas_list_last(images);
image = images->data;
- r = (int)etk_object_data_get(ETK_OBJECT(image), "color_r");
- g = (int)etk_object_data_get(ETK_OBJECT(image), "color_g");
- b = (int)etk_object_data_get(ETK_OBJECT(image), "color_b");
- d = (int)etk_object_data_get(ETK_OBJECT(image), "color_d");
+ r = (int)(long)etk_object_data_get(ETK_OBJECT(image), "color_r");
+ g = (int)(long)etk_object_data_get(ETK_OBJECT(image), "color_g");
+ b = (int)(long)etk_object_data_get(ETK_OBJECT(image), "color_b");
+ d = (int)(long)etk_object_data_get(ETK_OBJECT(image), "color_d");
spectra_widget_color_add(data, g, b, r, 255, d);
}
else
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_state.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- edje_editor_state.c 12 Jul 2008 13:59:15 -0000 1.9
+++ edje_editor_state.c 12 Jul 2008 14:45:03 -0000 1.10
@@ -342,7 +342,7 @@
{
printf("Active Item Changed Signal on AspectComboBox EMITTED\n");
int pref;
- pref = (int)etk_combobox_item_data_get(etk_combobox_active_item_get
(combobox));
+ pref = (int)(long)etk_combobox_item_data_get(etk_combobox_active_item_get
(combobox));
edje_edit_state_aspect_pref_set(edje_o, Cur.part->string,
Cur.state->string, pref);
return ETK_TRUE;
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_text.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- edje_editor_text.c 12 Jul 2008 13:59:15 -0000 1.6
+++ edje_editor_text.c 12 Jul 2008 14:45:03 -0000 1.7
@@ -313,7 +313,7 @@
if (!etk_string_length_get(Cur.part)) return ETK_TRUE;
edje_edit_part_effect_set(edje_o, Cur.part->string,
- (int)etk_combobox_item_data_get(etk_combobox_active_item_get(combobox)));
+
(int)(long)etk_combobox_item_data_get(etk_combobox_active_item_get(combobox)));
canvas_redraw();
@@ -352,16 +352,16 @@
if (!etk_string_length_get(Cur.part)) return ETK_TRUE;
if (!etk_string_length_get(Cur.state)) return ETK_TRUE;
- if ((int)data == TEXT_ALIGNH_SPINNER)
+ if ((int)(long)data == TEXT_ALIGNH_SPINNER)
edje_edit_state_text_align_x_set(edje_o, Cur.part->string,
Cur.state->string,
(double)etk_range_value_get(range));
- if ((int)data == TEXT_ALIGNV_SPINNER)
+ if ((int)(long)data == TEXT_ALIGNV_SPINNER)
edje_edit_state_text_align_y_set(edje_o, Cur.part->string,
Cur.state->string,
(double)etk_range_value_get(range));
- if ((int)data == STATE_ALIGNH_SPINNER)
+ if ((int)(long)data == STATE_ALIGNH_SPINNER)
edje_edit_state_align_x_set(edje_o, Cur.part->string, Cur.state->string,
(double)etk_range_value_get(range));
- if ((int)data == STATE_ALIGNV_SPINNER)
+ if ((int)(long)data == STATE_ALIGNV_SPINNER)
edje_edit_state_align_y_set(edje_o, Cur.part->string, Cur.state->string,
(double)etk_range_value_get(range));
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_toolbar.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- edje_editor_toolbar.c 12 Jul 2008 13:59:15 -0000 1.11
+++ edje_editor_toolbar.c 12 Jul 2008 14:45:03 -0000 1.12
@@ -385,7 +385,7 @@
char name[32];
char name2[32];
- switch ((int)data)
+ switch ((int)(long)data)
{
case NEW_RECT:
if (!etk_string_length_get(Cur.group))
@@ -636,7 +636,7 @@
Etk_Tree_Row *row, *next;
printf("Item Activated Signal on RemoveMenu EMITTED\n");
- switch ((int)data)
+ switch ((int)(long)data)
{
case REMOVE_DESCRIPTION:
if (!etk_string_length_get(Cur.state))
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_tree.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- edje_editor_tree.c 12 Jul 2008 13:59:15 -0000 1.15
+++ edje_editor_tree.c 12 Jul 2008 14:45:03 -0000 1.16
@@ -162,14 +162,14 @@
/* Add the row in the right position */
buf = part_type_image_get(edje_edit_part_type_get(edje_o, part_name));
- if ((int)after > 1)
+ if ((int)(long)after > 1)
row = etk_tree_row_insert(ETK_TREE(UI_PartsTree),
NULL,
after,
COL_NAME, EdjeFile, buf, part_name,
COL_TYPE, ROW_PART,
NULL);
- else if ((int)after == 1)
+ else if ((int)(long)after == 1)
row = etk_tree_row_prepend(ETK_TREE(UI_PartsTree),
NULL,
COL_NAME, EdjeFile, buf, part_name,
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_window.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- edje_editor_window.c 12 Jul 2008 13:59:15 -0000 1.19
+++ edje_editor_window.c 12 Jul 2008 14:45:03 -0000 1.20
@@ -227,7 +227,7 @@
etk_widget_show_all(etk_evas_object);
evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN,
_window_color_canvas_click,
- (void*)color_button_enum);
+ (void*)(long)color_button_enum);
etk_container_add(ETK_CONTAINER(shadow), etk_evas_object);
etk_widget_size_request_set(etk_evas_object, w, h);
switch (color_button_enum)
@@ -324,7 +324,7 @@
Etk_Tree_Row *row, *next, *prev;
Evas_List *icons, *l;
- switch ((int)data)
+ switch ((int)(long)data)
{
case TOOLBAR_NEW:
system("edje_editor &");
@@ -574,7 +574,7 @@
Etk_Color c;
printf("Clik Signal on ColorCanvas Emitted\n");
if (UI_ColorWin) etk_widget_show_all(UI_ColorWin);
- current_color_object = (int)data;
+ current_color_object = (int)(long)data;
etk_signal_block("color-changed", ETK_OBJECT(UI_ColorPicker),
ETK_CALLBACK(_dialog_colorpicker_change_cb), NULL);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- main.c 12 Jul 2008 13:59:15 -0000 1.56
+++ main.c 12 Jul 2008 14:45:03 -0000 1.57
@@ -71,9 +71,9 @@
/*** Debug Info ***/
Evas_Bool
-_debug_info_helper(Evas_Hash *hash, const char *key, void *data, void *fdata)
+_debug_info_helper(const Evas_Hash *hash, const char *key, void *data, void
*fdata)
{
- printf("Key: '%s' [%d]\n", key, (int)data);
+ printf("Key: '%s' [%d]\n", key, (int)(long)data);
return TRUE;
}
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
