Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto
Dir : e17/proto/exhibit/src/bin Modified Files: exhibit_main.c exhibit_menus.c exhibit_tab.c Log Message: update menus =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit_main.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -3 -r1.42 -r1.43 --- exhibit_main.c 3 Mar 2006 11:54:22 -0000 1.42 +++ exhibit_main.c 5 Mar 2006 01:02:50 -0000 1.43 @@ -732,7 +732,7 @@ Ex_Tab *tab; char *file; char *homedir; - char **dnd_types; + const char **dnd_types; int dnd_types_num; e = calloc(1, sizeof(Exhibit)); =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit_menus.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- exhibit_menus.c 3 Mar 2006 00:44:37 -0000 1.16 +++ exhibit_menus.c 5 Mar 2006 01:02:50 -0000 1.17 @@ -26,10 +26,10 @@ switch (item_type) { case EX_MENU_ITEM_NORMAL: - menu_item = etk_menu_item_new_with_label(label); + menu_item = etk_menu_item_image_new_with_label(label); break; case EX_MENU_ITEM_SEPERATOR: - menu_item = etk_menu_separator_new(); + menu_item = etk_menu_item_separator_new(); break; default: return NULL; @@ -40,7 +40,7 @@ Etk_Widget *image; image = etk_image_new_from_stock(stock_id, ETK_STOCK_SMALL); - etk_menu_item_image_set(ETK_MENU_ITEM(menu_item), ETK_IMAGE(image)); + etk_menu_item_image_set(ETK_MENU_ITEM_IMAGE(menu_item), ETK_IMAGE(image)); } else if (stock_id < ETK_STOCK_NO_STOCK) { @@ -52,7 +52,7 @@ image = etk_image_new_from_edje(PACKAGE_DATA_DIR "/images/images.edj", ex_images[stock_id]); - etk_menu_item_image_set(ETK_MENU_ITEM(menu_item), ETK_IMAGE(image)); + etk_menu_item_image_set(ETK_MENU_ITEM_IMAGE(menu_item), ETK_IMAGE(image)); } } etk_menu_shell_append(menu_shell, ETK_MENU_ITEM(menu_item)); =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit_tab.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- exhibit_tab.c 23 Feb 2006 13:20:44 -0000 1.9 +++ exhibit_tab.c 5 Mar 2006 01:02:50 -0000 1.10 @@ -103,7 +103,7 @@ Ex_Tab *tab; Etk_Tree *tree; Etk_Tree_Row *row; - Etk_Drag *drag; + Etk_Widget *drag; Etk_Widget *image; Evas_List *rows; char *icol1_string; @@ -137,7 +137,7 @@ drag_data = calloc(PATH_MAX * evas_list_count(rows), sizeof(char)); for(ll = rows; ll; ll = ll->next) { - char *tmp[PATH_MAX]; + char tmp[PATH_MAX]; row = ll->data; etk_tree_row_fields_get(row, etk_tree_nth_col_get(tree, 0), &icol1_string, &icol2_string, etk_tree_nth_col_get(tree, 1),NULL); @@ -176,6 +176,6 @@ etk_container_add(ETK_CONTAINER(drag), image); } - etk_drag_types_set(drag, types, num_types); - etk_drag_data_set(drag, drag_data, strlen(drag_data) + 1); + etk_drag_types_set(ETK_DRAG(drag), types, num_types); + etk_drag_data_set(ETK_DRAG(drag), drag_data, strlen(drag_data) + 1); } ------------------------------------------------------- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs