Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_menu_item.c ewl_menu_item.h
Log Message:
- constify a few things
- force a min size onto the item in the menu so that if there is no image
the spacer will have the correct size to move the text over
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_menu_item.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_menu_item.c 2 Dec 2005 20:09:57 -0000 1.4
+++ ewl_menu_item.c 7 Jan 2006 21:42:57 -0000 1.5
@@ -72,7 +72,7 @@
* @return Returns the text of the item, or NULL otherwise
* @brief Get the text of a menu item
*/
-char *
+const char *
ewl_menu_item_text_get(Ewl_Menu_Item *item)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -92,7 +92,7 @@
* @brief Sets the text of a menu item
*/
void
-ewl_menu_item_text_set(Ewl_Menu_Item *item, char *text)
+ewl_menu_item_text_set(Ewl_Menu_Item *item, const char *text)
{
Ewl_Container *redirect;
@@ -141,7 +141,7 @@
* @param item: the menu item
* @brief Get the image of a menu item
*/
-char *
+const char *
ewl_menu_item_image_get(Ewl_Menu_Item *item)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -161,7 +161,7 @@
* @brief Set the image of a menu item
*/
void
-ewl_menu_item_image_set(Ewl_Menu_Item *item, char *image)
+ewl_menu_item_image_set(Ewl_Menu_Item *item, const char *image)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("item", item);
@@ -171,7 +171,9 @@
* Destroy the icon if it's the wrong type.
*/
if (item->icon && ((image && !ewl_widget_type_is(item->icon, "image"))
- || (!image && !ewl_widget_type_is(item->icon,
"spacer")))) {
+ || (!image &&
+ !ewl_widget_type_is(item->icon, "spacer"))))
+ {
ewl_widget_destroy(item->icon);
item->icon = NULL;
}
@@ -206,6 +208,8 @@
EWL_FLAG_ALIGN_CENTER);
ewl_object_maximum_size_set(EWL_OBJECT(item->icon),
20, 20);
+ ewl_object_minimum_size_set(EWL_OBJECT(item->icon),
+ 20, 20);
ewl_container_child_prepend(EWL_CONTAINER(item),
item->icon);
ewl_widget_show(item->icon);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_menu_item.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_menu_item.h 21 Nov 2005 05:45:50 -0000 1.2
+++ ewl_menu_item.h 7 Jan 2006 21:42:57 -0000 1.3
@@ -38,12 +38,13 @@
Ewl_Widget *inmenu; /**< Set if inside a menu */
};
-Ewl_Widget *ewl_menu_item_new(void);
-int ewl_menu_item_init(Ewl_Menu_Item *menu);
-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_item_new(void);
+int ewl_menu_item_init(Ewl_Menu_Item *menu);
+const char *ewl_menu_item_text_get(Ewl_Menu_Item *item);
+void ewl_menu_item_text_set(Ewl_Menu_Item *item, const char *text);
+const char *ewl_menu_item_image_get(Ewl_Menu_Item *item);
+void ewl_menu_item_image_set(Ewl_Menu_Item *item,
+ const char *image);
/*
* internally used callbacks, override at your risk
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
