Enlightenment CVS committal Author : essiene Project : e17 Module : proto
Dir : e17/proto/entrance_edit_gui/src/widgets Modified Files: _ew_list.c ew_dialog.c ew_entry.c ew_entry.h ew_group.c ew_messagebox.c ew_notice.c Log Message: - Once more modify to work with new etk_box api in new etk. bad rhapsodhy :(, you should check commit logs for anything you see with a CVS update. This was clearly stated there. - Fix warnings in ew_messagebox, messagebox_ok callback was still in the wrong format. Allways strive to compile without warnings, or at least understand them. bad rhapsodhy. ok... that's two counts... no cookie for you today ;) =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/_ew_list.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- _ew_list.c 16 Aug 2006 09:18:41 -0000 1.6 +++ _ew_list.c 16 Aug 2006 12:52:01 -0000 1.7 @@ -57,7 +57,7 @@ ew->box = etk_vbox_new(0,10); /*etk_box_append(ETK_BOX(ew->box), hbox, ETK_BOX_START, ETK_BOX_EXPAND, 0);*/ - etk_box_pack_start(ETK_BOX(ew->box), ew->owner, ETK_TRUE, ETK_TRUE, 0); + etk_box_append(ETK_BOX(ew->box), ew->owner, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); return ew; } =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_dialog.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- ew_dialog.c 16 Aug 2006 09:18:41 -0000 1.8 +++ ew_dialog.c 16 Aug 2006 12:52:01 -0000 1.9 @@ -60,7 +60,7 @@ return; } - etk_box_pack_start(ETK_BOX(d->box), ew->owner, ETK_TRUE, ETK_TRUE, 0); + etk_box_append(ETK_BOX(d->box), ew->owner, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); return ew; } =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_entry.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- ew_entry.c 16 Aug 2006 09:18:41 -0000 1.6 +++ ew_entry.c 16 Aug 2006 12:52:01 -0000 1.7 @@ -36,10 +36,10 @@ if(label) { ew->label = etk_label_new(label); - etk_box_pack_start(ETK_BOX(ew->owner), ew->label, ETK_TRUE, ETK_TRUE, 0); + etk_box_append(ETK_BOX(ew->owner), ew->label, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); } - etk_box_pack_start(ETK_BOX(ew->owner), ew->control, ETK_TRUE, ETK_TRUE, 0); + etk_box_append(ETK_BOX(ew->owner), ew->control, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); if(text) { ew_entry_set(ew, text); @@ -47,7 +47,7 @@ return ew; } -char* +const char* ew_entry_get(Entrance_Entry ew) { return etk_entry_text_get(ETK_ENTRY(ew->control)); =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_entry.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- ew_entry.h 16 Aug 2006 04:18:03 -0000 1.4 +++ ew_entry.h 16 Aug 2006 12:52:01 -0000 1.5 @@ -34,7 +34,7 @@ else \ Entrance_Entry ew_entry_new(const char *label, const char *text, int ispassword); -char* ew_entry_get(Entrance_Entry); +const char* ew_entry_get(Entrance_Entry); void ew_entry_set(Entrance_Entry ew, const char *text); void ew_entry_password_set(Entrance_Entry ew); void ew_entry_password_clear(Entrance_Entry ew); =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_group.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- ew_group.c 16 Aug 2006 09:18:41 -0000 1.5 +++ ew_group.c 16 Aug 2006 12:52:01 -0000 1.6 @@ -33,6 +33,6 @@ } Entrance_Widget ew = w; - etk_box_pack_start(ETK_BOX(g->box), ew->owner, ETK_TRUE, ETK_TRUE, 0); + etk_box_append(ETK_BOX(g->box), ew->owner, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); } =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_messagebox.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- ew_messagebox.c 16 Aug 2006 09:18:41 -0000 1.7 +++ ew_messagebox.c 16 Aug 2006 12:52:01 -0000 1.8 @@ -4,7 +4,7 @@ #include <stdlib.h> #include "config.h" -static void _ew_messagebox_cb_ok(void *, void *); +static void _ew_messagebox_cb_ok(void *, int, void *); Entrance_Dialog _ew_messagebox_new(const char *title, const char *message, const char *icon) @@ -83,7 +83,7 @@ } static void -_ew_messagebox_cb_ok(void *win, void *data) { +_ew_messagebox_cb_ok(void *win, int response_type, void *data) { Entrance_Dialog ew = data; ew_dialog_destroy(ew); } =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_notice.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- ew_notice.c 16 Aug 2006 09:18:41 -0000 1.6 +++ ew_notice.c 16 Aug 2006 12:52:01 -0000 1.7 @@ -32,7 +32,7 @@ return; } - etk_box_pack_start(ETK_BOX(d->box), ew->owner, ETK_TRUE, ETK_TRUE, 0); + etk_box_append(ETK_BOX(d->box), ew->owner, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); return ew; } ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs