Enlightenment CVS committal
Author : handyande
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_menu_item.c etk_menu_item.h
Log Message:
Only set stock on menu_item_image, cast check does not work
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_menu_item.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- etk_menu_item.c 18 May 2006 18:51:17 -0000 1.12
+++ etk_menu_item.c 18 May 2006 19:08:42 -0000 1.13
@@ -238,7 +238,7 @@
* @param menu_item a menu item
* @param stock_id the stock id to use
*/
-void etk_menu_item_set_from_stock(Etk_Menu_Item *menu_item, Etk_Stock_Id
stock_id)
+void etk_menu_item_set_from_stock(Etk_Menu_Item_Image *menu_item, Etk_Stock_Id
stock_id)
{
Etk_Widget *image;
char *label;
@@ -246,13 +246,10 @@
if (!menu_item)
return;
- if (ETK_IS_MENU_ITEM_IMAGE(menu_item))
- {
- image = etk_image_new_from_stock(stock_id, ETK_STOCK_SMALL);
- etk_widget_show(image);
- etk_widget_visibility_locked_set(image, ETK_TRUE);
- etk_menu_item_image_set(ETK_MENU_ITEM_IMAGE(menu_item),
ETK_IMAGE(image));
- }
+ image = etk_image_new_from_stock(stock_id, ETK_STOCK_SMALL);
+ etk_widget_show(image);
+ etk_widget_visibility_locked_set(image, ETK_TRUE);
+ etk_menu_item_image_set(ETK_MENU_ITEM_IMAGE(menu_item), ETK_IMAGE(image));
label = etk_stock_label_get(stock_id);
etk_menu_item_label_set(menu_item, label);
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_menu_item.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- etk_menu_item.h 18 May 2006 18:51:17 -0000 1.8
+++ etk_menu_item.h 18 May 2006 19:08:42 -0000 1.9
@@ -134,7 +134,7 @@
void etk_menu_item_deselect(Etk_Menu_Item *menu_item);
void etk_menu_item_activate(Etk_Menu_Item *menu_item);
-void etk_menu_item_set_from_stock(Etk_Menu_Item *menu_item, Etk_Stock_Id
stock_id);
+void etk_menu_item_set_from_stock(Etk_Menu_Item_Image *menu_item, Etk_Stock_Id
stock_id);
/* Etk_Menu_Item_Separator */
Etk_Type *etk_menu_item_separator_type_get();
-------------------------------------------------------
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
