Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin
Modified Files:
ewl_imenu_test.c ewl_menu_test.c
Log Message:
- the EWL_CALLBACK_SELECT/DESELECT are the events sent of focus in/out,
change it to be EWL_CALLBACK_FOCUS_IN/OUT
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/bin/ewl_imenu_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_imenu_test.c 24 Oct 2005 04:39:57 -0000 1.4
+++ ewl_imenu_test.c 2 Dec 2005 20:09:57 -0000 1.5
@@ -12,7 +12,7 @@
}
static void
-__imenu_select(Ewl_Widget * w, void *ev_data __UNUSED__,
+__imenu_focus_in(Ewl_Widget * w, void *ev_data __UNUSED__,
void *user_data __UNUSED__)
{
char *text;
@@ -79,7 +79,7 @@
ewl_menu_item_image_set(EWL_MENU_ITEM(item),
"/usr/share/pixmaps/dia-diagram.png");
ewl_menu_item_text_set(EWL_MENU_ITEM(item), "dia");
ewl_container_child_append(EWL_CONTAINER(imenu1), item);
- ewl_callback_append(item, EWL_CALLBACK_SELECT, __imenu_select, NULL);
+ ewl_callback_append(item, EWL_CALLBACK_FOCUS_IN, __imenu_focus_in,
NULL);
ewl_callback_append(item, EWL_CALLBACK_CONFIGURE,
__imenu_configure, NULL);
ewl_widget_show(item);
@@ -92,13 +92,13 @@
ewl_menu_item_image_set(EWL_MENU_ITEM(item),
"/usr/share/pixmaps/wilber.png");
ewl_menu_item_text_set(EWL_MENU_ITEM(item), "gimp");
ewl_container_child_append(EWL_CONTAINER(imenu1), item);
- ewl_callback_append(item, EWL_CALLBACK_SELECT, __imenu_select, NULL);
+ ewl_callback_append(item, EWL_CALLBACK_FOCUS_IN, __imenu_focus_in,
NULL);
ewl_widget_show(item);
item = ewl_menu_item_new();
ewl_menu_item_text_set(EWL_MENU_ITEM(item), "button");
ewl_container_child_append(EWL_CONTAINER(imenu1), item);
- ewl_callback_append(item, EWL_CALLBACK_SELECT, __imenu_select, NULL);
+ ewl_callback_append(item, EWL_CALLBACK_FOCUS_IN, __imenu_focus_in,
NULL);
ewl_widget_show(item);
/*
@@ -112,13 +112,13 @@
item = ewl_menu_item_new();
ewl_menu_item_text_set(EWL_MENU_ITEM(item), "button");
ewl_container_child_append(EWL_CONTAINER(imenu2), item);
- ewl_callback_append(item, EWL_CALLBACK_SELECT, __imenu_select, NULL);
+ ewl_callback_append(item, EWL_CALLBACK_FOCUS_IN, __imenu_focus_in,
NULL);
ewl_widget_show(item);
item = ewl_menu_item_new();
ewl_menu_item_text_set(EWL_MENU_ITEM(item), "button");
ewl_container_child_append(EWL_CONTAINER(imenu2), item);
- ewl_callback_append(item, EWL_CALLBACK_SELECT, __imenu_select, NULL);
+ ewl_callback_append(item, EWL_CALLBACK_FOCUS_IN, __imenu_focus_in,
NULL);
ewl_widget_show(item);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/bin/ewl_menu_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_menu_test.c 27 Oct 2005 03:45:24 -0000 1.4
+++ ewl_menu_test.c 2 Dec 2005 20:09:57 -0000 1.5
@@ -12,7 +12,7 @@
}
static void
-__menu_select(Ewl_Widget * w, void *ev_data __UNUSED__,
+__menu_focus_in(Ewl_Widget * w, void *ev_data __UNUSED__,
void *user_data __UNUSED__)
{
char *text;
@@ -62,20 +62,20 @@
ewl_menu_item_image_set(EWL_MENU_ITEM(item), PACKAGE_DATA_DIR
"/images/Open.png");
ewl_menu_item_text_set(EWL_MENU_ITEM(item), "dia");
ewl_container_child_append(EWL_CONTAINER(menu1), item);
- ewl_callback_append(item, EWL_CALLBACK_SELECT, __menu_select, NULL);
+ ewl_callback_append(item, EWL_CALLBACK_FOCUS_IN, __menu_focus_in, NULL);
ewl_widget_show(item);
item = ewl_menu_item_new();
ewl_menu_item_image_set(EWL_MENU_ITEM(item), PACKAGE_DATA_DIR
"/images/Package.png");
ewl_menu_item_text_set(EWL_MENU_ITEM(item), "gimp");
ewl_container_child_append(EWL_CONTAINER(menu1), item);
- ewl_callback_append(item, EWL_CALLBACK_SELECT, __menu_select, NULL);
+ ewl_callback_append(item, EWL_CALLBACK_FOCUS_IN, __menu_focus_in, NULL);
ewl_widget_show(item);
item = ewl_menu_item_new();
ewl_menu_item_text_set(EWL_MENU_ITEM(item), "button");
ewl_container_child_append(EWL_CONTAINER(menu1), item);
- ewl_callback_append(item, EWL_CALLBACK_SELECT, __menu_select, NULL);
+ ewl_callback_append(item, EWL_CALLBACK_FOCUS_IN, __menu_focus_in, NULL);
ewl_widget_show(item);
/*
@@ -89,13 +89,13 @@
item = ewl_menu_item_new();
ewl_menu_item_text_set(EWL_MENU_ITEM(item), "button 1");
ewl_container_child_append(EWL_CONTAINER(menu2), item);
- ewl_callback_append(item, EWL_CALLBACK_SELECT, __menu_select, NULL);
+ ewl_callback_append(item, EWL_CALLBACK_FOCUS_IN, __menu_focus_in, NULL);
ewl_widget_show(item);
item = ewl_menu_item_new();
ewl_menu_item_text_set(EWL_MENU_ITEM(item), "button 2");
ewl_container_child_append(EWL_CONTAINER(menu2), item);
- ewl_callback_append(item, EWL_CALLBACK_SELECT, __menu_select, NULL);
+ ewl_callback_append(item, EWL_CALLBACK_FOCUS_IN, __menu_focus_in, NULL);
ewl_widget_show(item);
}
-------------------------------------------------------
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
