Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
ewl_menu_base.c ewl_menu_base.h
Log Message:
api breakage, ewl_menu_base
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_menu_base.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- ewl_menu_base.c 22 Aug 2004 04:50:28 -0000 1.37
+++ ewl_menu_base.c 23 Aug 2004 00:50:19 -0000 1.38
@@ -1,7 +1,7 @@
#include <Ewl.h>
-static int ewl_menu_item_create_image( Ewl_Menu_Item *item,
-
char *image, char
*text );
+static int ewl_menu_item_image_create( Ewl_Menu_Item *item,
+ char *image, char *text );
/**
* @param menu: the menu item to initialize
@@ -123,7 +123,7 @@
EWL_CALLBACK_DESELECT);
item->icon = NULL;
- if (!ewl_menu_item_create_image(item, image, text))
+ if (!ewl_menu_item_image_create(item, image, text))
DRETURN_INT(FALSE, DLEVEL_STABLE);
/*
@@ -144,8 +144,8 @@
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
-static int ewl_menu_item_create_image( Ewl_Menu_Item *item,
-
char *image,
char *text ) {
+static int ewl_menu_item_image_create( Ewl_Menu_Item *item,
+ char *image, char *text ) {
Ewl_Container *redirect;
if (item->icon)
@@ -188,7 +188,7 @@
* @brief Get the text of a menu item
*/
char *
-ewl_menu_item_get_text( Ewl_Menu_Item *item )
+ewl_menu_item_text_get( Ewl_Menu_Item *item )
{
if (item->text)
DRETURN_PTR(ewl_text_text_get(EWL_TEXT(item->text)), DLEVEL_STABLE);
@@ -201,7 +201,7 @@
* @brief Sets the text of a menu item
*/
void
-ewl_menu_item_set_text( Ewl_Menu_Item *item, char *text )
+ewl_menu_item_text_set( Ewl_Menu_Item *item, char *text )
{
if (item->text)
ewl_text_text_set(EWL_TEXT(item->text), text);
@@ -213,7 +213,7 @@
* @brief Get the image of a menu item
*/
char *
-ewl_menu_item_get_image( Ewl_Menu_Item *item )
+ewl_menu_item_image_get( Ewl_Menu_Item *item )
{
if (item->icon && ewl_widget_type_is(item->icon, "image"))
DRETURN_PTR(ewl_image_get_file(EWL_IMAGE(item->icon)), DLEVEL_STABLE);
@@ -226,13 +226,13 @@
* @brief Set the image of a menu item
*/
void
-ewl_menu_item_set_image( Ewl_Menu_Item *item, char *image )
+ewl_menu_item_image_set( Ewl_Menu_Item *item, char *image )
{
if (item->icon && ewl_widget_type_is(item->icon, "image"))
ewl_image_set_file(EWL_IMAGE(item->icon), image, NULL);
else {
- ewl_menu_item_create_image( item, image,
-
ewl_text_text_get(EWL_TEXT(item->text)) );
+ ewl_menu_item_image_create( item, image,
+ ewl_text_text_get(EWL_TEXT(item->text)) );
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_menu_base.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ewl_menu_base.h 12 Aug 2004 16:20:44 -0000 1.17
+++ ewl_menu_base.h 23 Aug 2004 00:50:19 -0000 1.18
@@ -78,18 +78,18 @@
Ewl_Widget *ewl_menu_item_new(char *image, char *title);
int ewl_menu_item_init(Ewl_Menu_Item * menu, char *image,
- char *title);
-char *ewl_menu_item_get_text(Ewl_Menu_Item * item);
-void ewl_menu_item_set_text(Ewl_Menu_Item * item, char *text);
-char *ewl_menu_item_get_image(Ewl_Menu_Item * item);
-void ewl_menu_item_set_image(Ewl_Menu_Item * item, char *image);
+ char *title);
+char *ewl_menu_item_text_get(Ewl_Menu_Item * item);
+void ewl_menu_item_text_set(Ewl_Menu_Item * item, char *text);
+char *ewl_menu_item_image_get(Ewl_Menu_Item * item);
+void ewl_menu_item_image_set(Ewl_Menu_Item * item, char *image);
Ewl_Widget *ewl_menu_separator_new(void);
void ewl_menu_separator_init(Ewl_Menu_Separator *sep);
void ewl_menu_base_init(Ewl_Menu_Base * menu, char *image,
- char *title);
+ char *title);
/*
* Internally used callbacks, override at your own risk.
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs