Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin
Modified Files:
ewl_combo_test.c ewl_imenu_test.c ewl_menu_bar_test.c
ewl_menu_test.c ewl_theme_test.c
Log Message:
Convert the menu API to the new constructor style.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/bin/ewl_combo_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ewl_combo_test.c 21 Jun 2005 02:15:51 -0000 1.3
+++ ewl_combo_test.c 10 Oct 2005 18:43:31 -0000 1.4
@@ -80,7 +80,10 @@
/*
* Append some test items
*/
- item = ewl_menu_item_new("/usr/share/pixmaps/dia-diagram.png", "dia");
+ item = ewl_menu_item_new();
+ ewl_menu_item_text_set(EWL_MENU_ITEM(item), "dia");
+ ewl_menu_item_image_set(EWL_MENU_ITEM(item),
+ "/usr/share/pixmaps/dia-diagram.png");
ewl_container_child_append(EWL_CONTAINER(combo1), item);
ewl_widget_show(item);
@@ -88,11 +91,15 @@
ewl_container_child_append(EWL_CONTAINER(combo1), item);
ewl_widget_show(item);
- item = ewl_menu_item_new("/usr/share/pixmaps/wilber.png", "gimp");
+ item = ewl_menu_item_new();
+ ewl_menu_item_text_set(EWL_MENU_ITEM(item), "gimp");
+ ewl_menu_item_image_set(EWL_MENU_ITEM(item),
+ "/usr/share/pixmaps/wilber.png");
ewl_container_child_append(EWL_CONTAINER(combo1), item);
ewl_widget_show(item);
- item = ewl_menu_item_new(NULL, "button");
+ item = ewl_menu_item_new();
+ ewl_menu_item_text_set(EWL_MENU_ITEM(item), "button");
ewl_widget_data_set(item, "dummy", "data");
ewl_container_child_append(EWL_CONTAINER(combo1), item);
ewl_widget_show(item);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/bin/ewl_imenu_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_imenu_test.c 28 May 2005 20:32:49 -0000 1.2
+++ ewl_imenu_test.c 10 Oct 2005 18:43:31 -0000 1.3
@@ -66,7 +66,8 @@
/*
* Create the menu
*/
- imenu1 = ewl_imenu_new(NULL, "test menu");
+ imenu1 = ewl_imenu_new();
+ ewl_menu_item_text_set(EWL_MENU_ITEM(imenu1), "test menu");
ewl_object_fill_policy_set(EWL_OBJECT(imenu1), EWL_FLAG_FILL_NONE);
ewl_container_child_append(EWL_CONTAINER(imenu_box), imenu1);
ewl_widget_show(imenu1);
@@ -74,7 +75,9 @@
/*
* Append some test items
*/
- item = ewl_menu_item_new("/usr/share/pixmaps/dia-diagram.png", "dia");
+ item = ewl_menu_item_new();
+ 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_CONFIGURE,
@@ -85,12 +88,15 @@
ewl_container_child_append(EWL_CONTAINER(imenu1), item);
ewl_widget_show(item);
- item = ewl_menu_item_new("/usr/share/pixmaps/wilber.png", "gimp");
+ item = ewl_menu_item_new();
+ 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_widget_show(item);
- item = ewl_menu_item_new(NULL, "button");
+ 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_widget_show(item);
@@ -98,16 +104,19 @@
/*
* Create a sub-menu
*/
- imenu2 = ewl_imenu_new(NULL, "Sub menu");
+ imenu2 = ewl_imenu_new();
+ ewl_menu_item_text_set(EWL_MENU_ITEM(imenu2), "Sub menu");
ewl_container_child_append(EWL_CONTAINER(imenu1), imenu2);
ewl_widget_show(imenu2);
- item = ewl_menu_item_new(NULL, "button");
+ 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_widget_show(item);
- item = ewl_menu_item_new(NULL, "button");
+ 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_widget_show(item);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/bin/ewl_menu_bar_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ewl_menu_bar_test.c 8 Jun 2005 02:11:12 -0000 1.3
+++ ewl_menu_bar_test.c 10 Oct 2005 18:43:31 -0000 1.4
@@ -52,11 +52,13 @@
for(i = 0; m_items[i] != NULL; i++) {
item = ewl_menubar_menu_add(EWL_MENUBAR(h_menubar),
NULL, m_items[i]);
- foo = ewl_menu_item_new(NULL, "foo");
+ foo = ewl_menu_item_new();
+ ewl_menu_item_text_set(EWL_MENU_ITEM(foo), "foo");
ewl_container_child_append(EWL_CONTAINER(item), foo);
ewl_widget_show(foo);
- foo = ewl_menu_item_new(NULL, "foobar");
+ foo = ewl_menu_item_new();
+ ewl_menu_item_text_set(EWL_MENU_ITEM(foo), "foobar");
ewl_container_child_append(EWL_CONTAINER(item), foo);
ewl_widget_show(foo);
@@ -71,11 +73,13 @@
item = ewl_menubar_menu_add(EWL_MENUBAR(h_menubar), NULL,
"Help");
- foo = ewl_menu_item_new(NULL, "foo");
+ foo = ewl_menu_item_new();
+ ewl_menu_item_text_set(EWL_MENU_ITEM(foo), "foo");
ewl_container_child_append(EWL_CONTAINER(item), foo);
ewl_widget_show(foo);
- foo = ewl_menu_item_new(NULL, "foobar");
+ foo = ewl_menu_item_new();
+ ewl_menu_item_text_set(EWL_MENU_ITEM(foo), "foobar");
ewl_container_child_append(EWL_CONTAINER(item), foo);
ewl_widget_show(foo);
}
@@ -95,11 +99,13 @@
Ewl_Widget *foo;
item = ewl_menubar_menu_add(EWL_MENUBAR(v_menubar),
NULL, m_items[i]);
- foo = ewl_menu_item_new(NULL, "foo");
+ foo = ewl_menu_item_new();
+ ewl_menu_item_text_set(EWL_MENU_ITEM(foo), "foo");
ewl_container_child_append(EWL_CONTAINER(item), foo);
ewl_widget_show(foo);
- foo = ewl_menu_item_new(NULL, "foobar");
+ foo = ewl_menu_item_new();
+ ewl_menu_item_text_set(EWL_MENU_ITEM(foo), "foobar");
ewl_container_child_append(EWL_CONTAINER(item), foo);
ewl_widget_show(foo);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/bin/ewl_menu_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_menu_test.c 28 May 2005 20:32:49 -0000 1.2
+++ ewl_menu_test.c 10 Oct 2005 18:43:31 -0000 1.3
@@ -49,24 +49,31 @@
/*
* Create the menu
*/
- menu1 = ewl_menu_new("/usr/share/pixmaps/wilber.png", "test menu");
+ menu1 = ewl_menu_new();
+ ewl_menu_item_image_set(EWL_MENU_ITEM(menu1),
"/usr/share/pixmaps/wilber.png");
+ ewl_menu_item_text_set(EWL_MENU_ITEM(menu1), "test menu");
ewl_container_child_append(EWL_CONTAINER(menu_win), menu1);
ewl_widget_show(menu1);
/*
* Append some test items
*/
- item = ewl_menu_item_new("/usr/share/pixmaps/mozilla.xpm", "dia");
+ item = ewl_menu_item_new();
+ ewl_menu_item_image_set(EWL_MENU_ITEM(item),
"/usr/share/pixmaps/mozilla.xpm");
+ 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_widget_show(item);
- item = ewl_menu_item_new("/usr/share/pixmaps/wilber.png", "gimp");
+ item = ewl_menu_item_new();
+ 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(menu1), item);
ewl_callback_append(item, EWL_CALLBACK_SELECT, __menu_select, NULL);
ewl_widget_show(item);
- item = ewl_menu_item_new(NULL, "button");
+ 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_widget_show(item);
@@ -74,16 +81,19 @@
/*
* Create a sub-menu
*/
- menu2 = ewl_menu_new(NULL, "Sub menu");
+ menu2 = ewl_menu_new();
+ ewl_menu_item_text_set(EWL_MENU_ITEM(menu2), "Sub menu");
ewl_container_child_append(EWL_CONTAINER(menu1), menu2);
ewl_widget_show(menu2);
- item = ewl_menu_item_new(NULL, "button");
+ 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_widget_show(item);
- item = ewl_menu_item_new(NULL, "button");
+ 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_widget_show(item);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/bin/ewl_theme_test.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ewl_theme_test.c 10 Oct 2005 15:37:07 -0000 1.9
+++ ewl_theme_test.c 10 Oct 2005 18:43:31 -0000 1.10
@@ -162,11 +162,14 @@
vbox = ewl_vbox_new ();
ewl_widget_show (vbox);
- misc = ewl_imenu_new (NULL, "Imenu");
+ misc = ewl_imenu_new ();
+ ewl_menu_item_text_set(EWL_MENU_ITEM(misc), "Imenu");
ewl_container_child_append (EWL_CONTAINER (vbox), misc);
ewl_widget_show (misc);
- item = ewl_menu_item_new ("dia-diagram.png", "image");
+ item = ewl_menu_item_new ();
+ ewl_menu_item_text_set(EWL_MENU_ITEM(item), "dia-diagram.png");
+ ewl_menu_item_image_set(EWL_MENU_ITEM(item), "image");
ewl_container_child_append (EWL_CONTAINER (misc), item);
ewl_widget_show (item);
@@ -174,7 +177,8 @@
ewl_container_child_append (EWL_CONTAINER (misc), item);
ewl_widget_show (item);
- item = ewl_menu_item_new (NULL, "label");
+ item = ewl_menu_item_new ();
+ ewl_menu_item_text_set(EWL_MENU_ITEM(item), "label");
ewl_container_child_append (EWL_CONTAINER (misc), item);
ewl_widget_show (item);
@@ -182,11 +186,14 @@
ewl_container_child_append (EWL_CONTAINER (vbox), misc);
ewl_widget_show (misc);
- misc = ewl_menu_new (NULL, "Menu");
+ misc = ewl_menu_new ();
+ ewl_menu_item_text_set(EWL_MENU_ITEM(misc), "Menu");
ewl_container_child_append (EWL_CONTAINER (vbox), misc);
ewl_widget_show (misc);
- item = ewl_menu_item_new ("dia-diagram.png", "image");
+ item = ewl_menu_item_new ();
+ ewl_menu_item_image_set(EWL_MENU_ITEM(item), "dia-diagram.png");
+ ewl_menu_item_text_set(EWL_MENU_ITEM(item), "image");
ewl_container_child_append (EWL_CONTAINER (misc), item);
ewl_widget_show (item);
@@ -194,7 +201,8 @@
ewl_container_child_append (EWL_CONTAINER (misc), item);
ewl_widget_show (item);
- item = ewl_menu_item_new (NULL, "label");
+ item = ewl_menu_item_new ();
+ ewl_menu_item_text_set(EWL_MENU_ITEM(item), "label");
ewl_container_child_append (EWL_CONTAINER (misc), item);
ewl_widget_show (item);
@@ -206,7 +214,9 @@
ewl_container_child_append (EWL_CONTAINER (vbox), misc);
ewl_widget_show (misc);
- item = ewl_menu_item_new ("dia-diagram.png", "image");
+ item = ewl_menu_item_new ();
+ ewl_menu_item_image_set(EWL_MENU_ITEM(item), "dia-diagram.png");
+ ewl_menu_item_text_set(EWL_MENU_ITEM(item), "image");
ewl_container_child_append (EWL_CONTAINER (misc), item);
ewl_widget_show (item);
@@ -214,7 +224,8 @@
ewl_container_child_append (EWL_CONTAINER (misc), item);
ewl_widget_show (item);
- item = ewl_menu_item_new (NULL, "label");
+ item = ewl_menu_item_new ();
+ ewl_menu_item_text_set(EWL_MENU_ITEM(item), "label");
ewl_container_child_append (EWL_CONTAINER (misc), item);
ewl_widget_show (item);
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
