Enlightenment CVS committal
Author : dj2
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_theme_test.c
Log Message:
- fix up the menu bar. Use the container funcs to add stuff to the bar now
instead of special calls
- get rid of the ewl_menu_separator completly. Just use the ewl_separator
- formatting/type checking
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/bin/ewl_combo_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_combo_test.c 10 Oct 2005 18:43:31 -0000 1.4
+++ ewl_combo_test.c 24 Oct 2005 04:39:57 -0000 1.5
@@ -87,7 +87,7 @@
ewl_container_child_append(EWL_CONTAINER(combo1), item);
ewl_widget_show(item);
- item = EWL_WIDGET(ewl_menu_separator_new());
+ item = EWL_WIDGET(ewl_separator_new());
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.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ewl_imenu_test.c 10 Oct 2005 18:43:31 -0000 1.3
+++ ewl_imenu_test.c 24 Oct 2005 04:39:57 -0000 1.4
@@ -84,7 +84,7 @@
__imenu_configure, NULL);
ewl_widget_show(item);
- item = ewl_menu_separator_new();
+ item = ewl_separator_new();
ewl_container_child_append(EWL_CONTAINER(imenu1), item);
ewl_widget_show(item);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/bin/ewl_menu_bar_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_menu_bar_test.c 10 Oct 2005 18:43:31 -0000 1.4
+++ ewl_menu_bar_test.c 24 Oct 2005 04:39:57 -0000 1.5
@@ -50,7 +50,10 @@
"About",
NULL};
for(i = 0; m_items[i] != NULL; i++) {
- item = ewl_menubar_menu_add(EWL_MENUBAR(h_menubar),
NULL, m_items[i]);
+ item = ewl_menu_new();
+ ewl_menu_item_text_set(EWL_MENU_ITEM(item), m_items[i]);
+ ewl_container_child_append(EWL_CONTAINER(h_menubar),
item);
+ ewl_widget_show(item);
foo = ewl_menu_item_new();
ewl_menu_item_text_set(EWL_MENU_ITEM(foo), "foo");
@@ -62,8 +65,13 @@
ewl_container_child_append(EWL_CONTAINER(item), foo);
ewl_widget_show(foo);
- if (i != 0 && (i % 1) == 0)
-
ewl_menubar_seperator_add(EWL_MENUBAR(h_menubar));
+ if (i != 0 && (i % 1) == 0) {
+ Ewl_Widget *sep;
+
+ sep = ewl_vseparator_new();
+
ewl_container_child_append(EWL_CONTAINER(h_menubar), sep);
+ ewl_widget_show(sep);
+ }
}
item = ewl_spacer_new();
@@ -71,7 +79,10 @@
ewl_container_child_append(EWL_CONTAINER(h_menubar), item);
ewl_widget_show(item);
- item = ewl_menubar_menu_add(EWL_MENUBAR(h_menubar), NULL,
"Help");
+ item = ewl_menu_new();
+ ewl_menu_item_text_set(EWL_MENU_ITEM(item), "Help");
+ ewl_container_child_append(EWL_CONTAINER(h_menubar), item);
+ ewl_widget_show(item);
foo = ewl_menu_item_new();
ewl_menu_item_text_set(EWL_MENU_ITEM(foo), "foo");
@@ -97,7 +108,11 @@
NULL};
for(i = 0; m_items[i] != NULL; i++) {
Ewl_Widget *foo;
- item = ewl_menubar_menu_add(EWL_MENUBAR(v_menubar),
NULL, m_items[i]);
+
+ item = ewl_menu_new();
+ ewl_menu_item_text_set(EWL_MENU_ITEM(item), m_items[i]);
+ ewl_container_child_append(EWL_CONTAINER(v_menubar),
item);
+ ewl_widget_show(item);
foo = ewl_menu_item_new();
ewl_menu_item_text_set(EWL_MENU_ITEM(foo), "foo");
@@ -110,7 +125,13 @@
ewl_widget_show(foo);
if (i != 0 && (i % 2) == 0)
-
ewl_menubar_seperator_add(EWL_MENUBAR(v_menubar));
+ {
+ Ewl_Widget *sep;
+
+ sep = ewl_hseparator_new();
+
ewl_container_child_append(EWL_CONTAINER(v_menubar), sep);
+ ewl_widget_show(sep);
+ }
}
}
ewl_container_child_append(EWL_CONTAINER(box), v_menubar);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/bin/ewl_theme_test.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ewl_theme_test.c 10 Oct 2005 18:43:31 -0000 1.10
+++ ewl_theme_test.c 24 Oct 2005 04:39:57 -0000 1.11
@@ -173,7 +173,7 @@
ewl_container_child_append (EWL_CONTAINER (misc), item);
ewl_widget_show (item);
- item = ewl_menu_separator_new ();
+ item = ewl_separator_new ();
ewl_container_child_append (EWL_CONTAINER (misc), item);
ewl_widget_show (item);
@@ -197,7 +197,7 @@
ewl_container_child_append (EWL_CONTAINER (misc), item);
ewl_widget_show (item);
- item = ewl_menu_separator_new ();
+ item = ewl_separator_new ();
ewl_container_child_append (EWL_CONTAINER (misc), item);
ewl_widget_show (item);
@@ -220,7 +220,7 @@
ewl_container_child_append (EWL_CONTAINER (misc), item);
ewl_widget_show (item);
- item = ewl_menu_separator_new ();
+ item = ewl_separator_new ();
ewl_container_child_append (EWL_CONTAINER (misc), item);
ewl_widget_show (item);
-------------------------------------------------------
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
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
