Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_menu_base.c ewl_menu_item.c ewl_menu_item.h
Log Message:
- make menuitem menu_item to be consistent with menu_base
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_menu_base.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ewl_menu_base.c 24 Oct 2005 03:35:29 -0000 1.12
+++ ewl_menu_base.c 21 Nov 2005 05:45:50 -0000 1.13
@@ -97,7 +97,7 @@
*/
ecore_list_goto_first(pb->children);
while ((child = ecore_list_next(pb->children))) {
- if (ewl_widget_type_is(child, "menuitem")) {
+ if (ewl_widget_type_is(child, "menu_item")) {
item = EWL_MENU_ITEM(child);
item->inmenu = menu->popup;
}
@@ -193,7 +193,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- DCHECK_TYPE("w", w, "widget");
+ DCHECK_TYPE("w", w, "menu_base");
menu = EWL_MENU_BASE(w);
if (menu->popup)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_menu_item.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ewl_menu_item.c 24 Oct 2005 03:35:29 -0000 1.1
+++ ewl_menu_item.c 21 Nov 2005 05:45:50 -0000 1.2
@@ -44,8 +44,8 @@
DRETURN_INT(FALSE, DLEVEL_STABLE);
ewl_box_orientation_set(EWL_BOX(item), EWL_ORIENTATION_HORIZONTAL);
- ewl_widget_appearance_set(EWL_WIDGET(item), "menuitem");
- ewl_widget_inherit(EWL_WIDGET(item), "menuitem");
+ ewl_widget_appearance_set(EWL_WIDGET(item), "menu_item");
+ ewl_widget_inherit(EWL_WIDGET(item), "menu_item");
ewl_object_fill_policy_set(EWL_OBJECT(item), EWL_FLAG_FILL_HFILL);
@@ -77,7 +77,7 @@
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("item", item, NULL);
- DCHECK_TYPE_RET("item", item, "menuitem", NULL);
+ DCHECK_TYPE_RET("item", item, "menu_item", NULL);
if (item->text)
DRETURN_PTR(ewl_text_text_get(EWL_TEXT(item->text)),
@@ -98,7 +98,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("item", item);
- DCHECK_TYPE("item", item, "menuitem");
+ DCHECK_TYPE("item", item, "menu_item");
/*
* Save and restore after we've made our changes.
@@ -146,7 +146,7 @@
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("item", item, NULL);
- DCHECK_TYPE_RET("item", item, "menuitem", NULL);
+ DCHECK_TYPE_RET("item", item, "menu_item", NULL);
if (item->icon && ewl_widget_type_is(item->icon, "image"))
DRETURN_PTR(ewl_image_file_get(EWL_IMAGE(item->icon)),
@@ -165,7 +165,7 @@
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("item", item);
- DCHECK_TYPE("item", item, "menuitem");
+ DCHECK_TYPE("item", item, "menu_item");
/*
* Destroy the icon if it's the wrong type.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_menu_item.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ewl_menu_item.h 24 Oct 2005 03:35:29 -0000 1.1
+++ ewl_menu_item.h 21 Nov 2005 05:45:50 -0000 1.2
@@ -9,8 +9,8 @@
*/
/**
- * @themekey /menuitem/file
- * @themekey /menuitem/group
+ * @themekey /menu_item/file
+ * @themekey /menu_item/group
*/
/**
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc. Get Certified Today
Register for a JBoss Training Course. Free Certification Exam
for All Training Attendees Through End of 2005. For more info visit:
http://ads.osdn.com/?ad_id=7628&alloc_id=16845&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
