Enlightenment CVS committal
Author : leviathan
Project : e17
Module : proto
Dir : e17/proto/edje_editor/src/bin
Modified Files:
callbacks.c evas.c interface.c
Log Message:
Remove compiler warnings
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- callbacks.c 19 Jan 2007 08:49:00 -0000 1.11
+++ callbacks.c 19 Jan 2007 14:40:07 -0000 1.12
@@ -6,6 +6,10 @@
#include "main.h"
#include "evas.h"
+extern void PROTO_engrave_part_state_remove(Engrave_Part *ep,
Engrave_Part_State *eps);
+extern void PROTO_engrave_group_part_remove(Engrave_Group *eg, Engrave_Part
*ep);
+extern void PROTO_engrave_file_group_remove(Engrave_File *ef, Engrave_Group
*eg);
+
int current_color_object;
/* Called when the window is destroyed */
@@ -336,7 +340,7 @@
{
Etk_Tree_Col *col1=NULL;
char buf[4096];
- char *nn; //new name
+ const char *nn; //new name
printf("Text Changed Signal on StateEntry EMITTED\n");
if (Cur.eps)
@@ -391,8 +395,8 @@
{
printf("Value Changed Signal on AspectMinSpinner EMITTED\n");
engrave_part_state_aspect_set(Cur.eps,
- etk_range_value_get(UI_AspectMinSpinner),
- etk_range_value_get(UI_AspectMaxSpinner));
+ etk_range_value_get(ETK_RANGE(UI_AspectMinSpinner)),
+ etk_range_value_get(ETK_RANGE(UI_AspectMaxSpinner)));
}
void
@@ -412,12 +416,12 @@
printf("Active Item Changed Signal on MinMaxSpinners EMITTED\n");
engrave_part_state_min_size_set(Cur.eps,
- etk_range_value_get(UI_StateMinWSpinner),
- etk_range_value_get(UI_StateMinHSpinner));
+ etk_range_value_get(ETK_RANGE(UI_StateMinWSpinner)),
+ etk_range_value_get(ETK_RANGE(UI_StateMinHSpinner)));
engrave_part_state_max_size_set(Cur.eps,
- etk_range_value_get(UI_StateMaxWSpinner),
- etk_range_value_get(UI_StateMaxHSpinner));
+ etk_range_value_get(ETK_RANGE(UI_StateMaxWSpinner)),
+ etk_range_value_get(ETK_RANGE(UI_StateMaxHSpinner)));
ev_redraw();
}
@@ -669,22 +673,22 @@
case COLOR_OBJECT_RECT:
etk_window_title_set(ETK_WINDOW(UI_ColorWin), "Rectangle color");
engrave_part_state_color_get(Cur.eps,&c.r,&c.g,&c.b,&c.a);
- etk_colorpicker_current_color_set(UI_ColorPicker, c);
+ etk_colorpicker_current_color_set(ETK_COLORPICKER(UI_ColorPicker), c);
break;
case COLOR_OBJECT_TEXT:
etk_window_title_set(ETK_WINDOW(UI_ColorWin), "Text color");
engrave_part_state_color_get(Cur.eps,&c.r,&c.g,&c.b,&c.a);
- etk_colorpicker_current_color_set(UI_ColorPicker, c);
+ etk_colorpicker_current_color_set(ETK_COLORPICKER(UI_ColorPicker), c);
break;
case COLOR_OBJECT_SHADOW:
etk_window_title_set(ETK_WINDOW(UI_ColorWin), "Shadow color");
engrave_part_state_color2_get(Cur.eps,&c.r,&c.g,&c.b,&c.a);
- etk_colorpicker_current_color_set(UI_ColorPicker, c);
+ etk_colorpicker_current_color_set(ETK_COLORPICKER(UI_ColorPicker), c);
break;
case COLOR_OBJECT_OUTLINE:
etk_window_title_set(ETK_WINDOW(UI_ColorWin), "Outline color");
engrave_part_state_color3_get(Cur.eps,&c.r,&c.g,&c.b,&c.a);
- etk_colorpicker_current_color_set(UI_ColorPicker, c);
+ etk_colorpicker_current_color_set(ETK_COLORPICKER(UI_ColorPicker), c);
break;
}
etk_signal_unblock("color_changed", ETK_OBJECT(UI_ColorPicker),
ETK_CALLBACK(on_ColorDialog_change));
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/evas.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- evas.c 19 Jan 2007 08:49:00 -0000 1.6
+++ evas.c 19 Jan 2007 14:40:07 -0000 1.7
@@ -159,7 +159,7 @@
// Create Fake win
EV_fakewin = edje_object_add(etk_widget_toplevel_evas_get(ETK_canvas));
edje_object_file_set(EV_fakewin, EdjeFile, "FakeWin");
- etk_canvas_object_add(ETK_canvas,EV_fakewin);
+ etk_canvas_object_add(ETK_CANVAS(ETK_canvas),EV_fakewin);
edje_object_signal_callback_add(EV_fakewin,"DRAG","miniarrow",on_Drag,(void*)DRAG_MINIARROW);
@@ -293,7 +293,7 @@
state->image.border.r,state->image.border.t,state->image.border.b);
break;
- /*case PART_TYPE_TEXT:
+ / *case PART_TYPE_TEXT:
if (!part->ev_obj){ //Create TEXT
part->ev_obj = evas_object_text_add
(etk_widget_toplevel_evas_get(ETK_canvas));
etk_canvas_object_add (ETK_CANVAS(ETK_canvas), part->ev_obj);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- interface.c 19 Jan 2007 08:49:00 -0000 1.13
+++ interface.c 19 Jan 2007 14:40:07 -0000 1.14
@@ -314,7 +314,7 @@
{
if (Cur.eps)
{
- char *name;
+ const char *name;
double index;
double aspect_min;
double aspect_max;
@@ -344,8 +344,8 @@
etk_range_value_set(ETK_RANGE(UI_AspectMaxSpinner), aspect_max);
//Set aspect pref Combo
- etk_combobox_active_item_set(UI_AspectComboBox,
- etk_combobox_nth_item_get (UI_AspectComboBox,
+ etk_combobox_active_item_set(ETK_COMBOBOX(UI_AspectComboBox),
+ etk_combobox_nth_item_get (ETK_COMBOBOX(UI_AspectComboBox),
engrave_part_state_aspect_preference_get(Cur.eps)));
//Set min e max size
@@ -448,11 +448,11 @@
UpdateTextFrame(void)
{
int eff_num = 0;
- int i;
- int alpha;
+ //int i;
+ //int alpha;
int r, g, b;
- Etk_Combobox_Item *item = NULL;
- char* font;
+ //Etk_Combobox_Item *item = NULL;
+ //char* font;
if (Cur.eps){
printf("Update Text Frame: %s\n",Cur.eps->name);
@@ -495,6 +495,7 @@
case ENGRAVE_TEXT_EFFECT_SOFT_SHADOW: eff_num = 4; break;
case ENGRAVE_TEXT_EFFECT_OUTLINE_SHADOW: eff_num = 5; break;
case ENGRAVE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW: eff_num = 6; break;
+ default: break; // remove warning
}
etk_combobox_active_item_set (ETK_COMBOBOX(UI_EffectComboBox),
etk_combobox_nth_item_get (ETK_COMBOBOX(UI_EffectComboBox), eff_num));
@@ -1714,7 +1715,7 @@
create_main_window(void)
{
Etk_Widget *vbox,*hbox;
- Etk_Widget *frame;
+ //Etk_Widget *frame;
UI_FileChooserDialog = create_filechooser_dialog();
-------------------------------------------------------------------------
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
