Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/test
Modified Files:
ewl_box_test.c ewl_button_test.c ewl_entry_test.c
ewl_filedialog_test.c ewl_fileselector_test.c
ewl_floater_test.c ewl_image_test.c ewl_imenu_test.c
ewl_menu_test.c ewl_notebook_test.c ewl_selectionbar_test.c
ewl_selectionbook_test.c ewl_table_test.c ewl_test.c
ewl_textarea_test.c
Log Message:
Consolidated flags from object and widget into the object, added an API for
interacting with those flags. Moved the default theme to Winter by rephorm.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_box_test.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ewl_box_test.c 5 Sep 2003 03:07:04 -0000 1.23
+++ ewl_box_test.c 29 Sep 2003 21:46:51 -0000 1.24
@@ -21,15 +21,15 @@
void
__toggle_child_fill(Ewl_Widget * w, void *ev_data, void *user_data)
{
- Ewl_Fill_Policy f;
+ unsigned int f;
f = ewl_object_get_fill_policy(EWL_OBJECT(w));
- if (f == EWL_FILL_POLICY_NONE) {
- ewl_object_set_fill_policy(EWL_OBJECT(w), EWL_FILL_POLICY_FILL);
+ if (f == EWL_FLAG_FILL_NONE) {
+ ewl_object_set_fill_policy(EWL_OBJECT(w), EWL_FLAG_FILL_FILL);
ewl_button_set_label(EWL_BUTTON(w), "Fill");
} else {
- ewl_object_set_fill_policy(EWL_OBJECT(w), EWL_FILL_POLICY_NONE);
+ ewl_object_set_fill_policy(EWL_OBJECT(w), EWL_FLAG_FILL_NONE);
ewl_button_set_label(EWL_BUTTON(w), "None");
}
@@ -41,19 +41,19 @@
void
__toggle_child_shrink(Ewl_Widget * w, void *ev_data, void *user_data)
{
- Ewl_Fill_Policy f;
+ unsigned int f;
f = ewl_object_get_fill_policy(EWL_OBJECT(w));
- if (f == EWL_FILL_POLICY_NONE) {
+ if (f == EWL_FLAG_FILL_NONE) {
ewl_button_set_label(EWL_BUTTON(w),
"Shrink This Box To Fit It's Parent");
ewl_object_set_fill_policy(EWL_OBJECT(w),
- EWL_FILL_POLICY_HSHRINK);
+ EWL_FLAG_FILL_HSHRINK);
} else {
ewl_button_set_label(EWL_BUTTON(w),
"Don't shrink this box");
- ewl_object_set_fill_policy(EWL_OBJECT(w), EWL_FILL_POLICY_NONE);
+ ewl_object_set_fill_policy(EWL_OBJECT(w), EWL_FLAG_FILL_NONE);
}
return;
@@ -64,19 +64,19 @@
void
__toggle_child_horizontal_align(Ewl_Widget * w, void *ev_data, void *user_data)
{
- Ewl_Alignment a;
+ unsigned int a;
char l[10];
a = ewl_object_get_alignment(EWL_OBJECT(w));
- if (a == EWL_ALIGNMENT_LEFT) {
- a = EWL_ALIGNMENT_CENTER;
+ if (a == EWL_FLAG_ALIGN_LEFT) {
+ a = EWL_FLAG_ALIGN_CENTER;
snprintf(l, 10, "Center");
- } else if (a == EWL_ALIGNMENT_CENTER) {
- a = EWL_ALIGNMENT_RIGHT;
+ } else if (a == EWL_FLAG_ALIGN_CENTER) {
+ a = EWL_FLAG_ALIGN_RIGHT;
snprintf(l, 10, "Right");
- } else if (a == EWL_ALIGNMENT_RIGHT) {
- a = EWL_ALIGNMENT_LEFT;
+ } else if (a == EWL_FLAG_ALIGN_RIGHT) {
+ a = EWL_FLAG_ALIGN_LEFT;
snprintf(l, 10, "Left");
}
@@ -92,19 +92,19 @@
void
__toggle_child_vertical_align(Ewl_Widget * w, void *ev_data, void *user_data)
{
- Ewl_Alignment a;
+ unsigned int a;
char l[10];
a = ewl_object_get_alignment(EWL_OBJECT(w));
- if (a == EWL_ALIGNMENT_TOP) {
- a = EWL_ALIGNMENT_CENTER;
+ if (a == EWL_FLAG_ALIGN_TOP) {
+ a = EWL_FLAG_ALIGN_CENTER;
snprintf(l, 10, "Center");
- } else if (a == EWL_ALIGNMENT_CENTER) {
- a = EWL_ALIGNMENT_BOTTOM;
+ } else if (a == EWL_FLAG_ALIGN_CENTER) {
+ a = EWL_FLAG_ALIGN_BOTTOM;
snprintf(l, 10, "Bottom");
- } else if (a == EWL_ALIGNMENT_BOTTOM) {
- a = EWL_ALIGNMENT_TOP;
+ } else if (a == EWL_FLAG_ALIGN_BOTTOM) {
+ a = EWL_FLAG_ALIGN_TOP;
snprintf(l, 10, "Top");
}
@@ -166,9 +166,9 @@
vbox_button[0][0] = ewl_button_new("Left");
ewl_container_append_child(EWL_CONTAINER(vbox[0]), vbox_button[0][0]);
ewl_object_set_fill_policy(EWL_OBJECT(vbox_button[0][0]),
- EWL_FILL_POLICY_NONE);
+ EWL_FLAG_FILL_NONE);
ewl_object_set_alignment(EWL_OBJECT(vbox_button[0][0]),
- EWL_ALIGNMENT_LEFT);
+ EWL_FLAG_ALIGN_LEFT);
ewl_callback_append(vbox_button[0][0], EWL_CALLBACK_CLICKED,
__toggle_child_horizontal_align, NULL);
ewl_widget_show(vbox_button[0][0]);
@@ -179,9 +179,9 @@
vbox_button[0][1] = ewl_button_new("Center");
ewl_container_append_child(EWL_CONTAINER(vbox[0]), vbox_button[0][1]);
ewl_object_set_fill_policy(EWL_OBJECT(vbox_button[0][1]),
- EWL_FILL_POLICY_NONE);
+ EWL_FLAG_FILL_NONE);
ewl_object_set_alignment(EWL_OBJECT(vbox_button[0][1]),
- EWL_ALIGNMENT_CENTER);
+ EWL_FLAG_ALIGN_CENTER);
ewl_callback_append(vbox_button[0][1], EWL_CALLBACK_CLICKED,
__toggle_child_horizontal_align, NULL);
ewl_widget_show(vbox_button[0][1]);
@@ -192,9 +192,9 @@
vbox_button[0][2] = ewl_button_new("Right");
ewl_container_append_child(EWL_CONTAINER(vbox[0]), vbox_button[0][2]);
ewl_object_set_fill_policy(EWL_OBJECT(vbox_button[0][2]),
- EWL_FILL_POLICY_NONE);
+ EWL_FLAG_FILL_NONE);
ewl_object_set_alignment(EWL_OBJECT(vbox_button[0][2]),
- EWL_ALIGNMENT_RIGHT);
+ EWL_FLAG_ALIGN_RIGHT);
ewl_callback_append(vbox_button[0][2], EWL_CALLBACK_CLICKED,
__toggle_child_horizontal_align, NULL);
ewl_widget_show(vbox_button[0][2]);
@@ -213,11 +213,11 @@
vbox_button[1][0] = ewl_button_new("None");
ewl_container_append_child(EWL_CONTAINER(vbox[1]), vbox_button[1][0]);
ewl_object_set_fill_policy(EWL_OBJECT(vbox_button[1][0]),
- EWL_FILL_POLICY_NONE);
+ EWL_FLAG_FILL_NONE);
ewl_box_set_orientation(EWL_BOX(vbox_button[1][0]),
EWL_ORIENTATION_VERTICAL);
ewl_object_set_alignment(EWL_OBJECT(EWL_BUTTON(vbox_button[1][0])->label_object),
- EWL_ALIGNMENT_CENTER);
+ EWL_FLAG_ALIGN_CENTER);
ewl_callback_append(vbox_button[1][0], EWL_CALLBACK_CLICKED,
__toggle_child_fill, NULL);
ewl_widget_show(vbox_button[1][0]);
@@ -230,9 +230,9 @@
ewl_box_set_orientation(EWL_BOX(vbox_button[1][1]),
EWL_ORIENTATION_VERTICAL);
ewl_object_set_fill_policy(EWL_OBJECT(vbox_button[1][1]),
- EWL_FILL_POLICY_FILL);
+ EWL_FLAG_FILL_FILL);
ewl_object_set_alignment(EWL_OBJECT(EWL_BUTTON(vbox_button[1][1])->label_object),
- EWL_ALIGNMENT_CENTER);
+ EWL_FLAG_ALIGN_CENTER);
ewl_callback_append(vbox_button[1][1], EWL_CALLBACK_CLICKED,
__toggle_child_fill, NULL);
ewl_widget_show(vbox_button[1][1]);
@@ -245,9 +245,9 @@
ewl_box_set_orientation(EWL_BOX(vbox_button[1][2]),
EWL_ORIENTATION_VERTICAL);
ewl_object_set_fill_policy(EWL_OBJECT(vbox_button[1][2]),
- EWL_FILL_POLICY_NONE);
+ EWL_FLAG_FILL_NONE);
ewl_object_set_alignment(EWL_OBJECT(EWL_BUTTON(vbox_button[1][2])->label_object),
- EWL_ALIGNMENT_CENTER);
+ EWL_FLAG_ALIGN_CENTER);
ewl_callback_append(vbox_button[1][2], EWL_CALLBACK_CLICKED,
__toggle_child_fill, NULL);
ewl_widget_show(vbox_button[1][2]);
@@ -266,9 +266,9 @@
hbox_button[0][0] = ewl_button_new("Top");
ewl_container_append_child(EWL_CONTAINER(hbox[1]), hbox_button[0][0]);
ewl_object_set_fill_policy(EWL_OBJECT(hbox_button[0][0]),
- EWL_FILL_POLICY_NONE);
+ EWL_FLAG_FILL_NONE);
ewl_object_set_alignment(EWL_OBJECT(hbox_button[0][0]),
- EWL_ALIGNMENT_TOP);
+ EWL_FLAG_ALIGN_TOP);
ewl_callback_append(hbox_button[0][0], EWL_CALLBACK_CLICKED,
__toggle_child_vertical_align, NULL);
ewl_widget_show(hbox_button[0][0]);
@@ -279,9 +279,9 @@
hbox_button[0][1] = ewl_button_new("Center");
ewl_container_append_child(EWL_CONTAINER(hbox[1]), hbox_button[0][1]);
ewl_object_set_fill_policy(EWL_OBJECT(hbox_button[0][1]),
- EWL_FILL_POLICY_NONE);
+ EWL_FLAG_FILL_NONE);
ewl_object_set_alignment(EWL_OBJECT(hbox_button[0][1]),
- EWL_ALIGNMENT_CENTER);
+ EWL_FLAG_ALIGN_CENTER);
ewl_callback_append(hbox_button[0][1], EWL_CALLBACK_CLICKED,
__toggle_child_vertical_align, NULL);
ewl_widget_show(hbox_button[0][1]);
@@ -292,9 +292,9 @@
hbox_button[0][2] = ewl_button_new("Bottom");
ewl_container_append_child(EWL_CONTAINER(hbox[1]), hbox_button[0][2]);
ewl_object_set_fill_policy(EWL_OBJECT(hbox_button[0][2]),
- EWL_FILL_POLICY_NONE);
+ EWL_FLAG_FILL_NONE);
ewl_object_set_alignment(EWL_OBJECT(hbox_button[0][2]),
- EWL_ALIGNMENT_BOTTOM);
+ EWL_FLAG_ALIGN_BOTTOM);
ewl_callback_append(hbox_button[0][2], EWL_CALLBACK_CLICKED,
__toggle_child_vertical_align, NULL);
ewl_widget_show(hbox_button[0][2]);
@@ -305,7 +305,7 @@
hbox[2] = ewl_hbox_new();
ewl_container_append_child(EWL_CONTAINER(box_box), hbox[2]);
- ewl_object_set_fill_policy(EWL_OBJECT(hbox[2]), EWL_FILL_POLICY_HFILL);
+ ewl_object_set_fill_policy(EWL_OBJECT(hbox[2]), EWL_FLAG_FILL_HFILL);
ewl_widget_show(hbox[2]);
/*
@@ -314,7 +314,7 @@
hbox_button[1][0] =
ewl_button_new("Shrink This Box To Fit It's Parent");
ewl_object_set_fill_policy(EWL_OBJECT(hbox_button[1][0]),
- EWL_FILL_POLICY_HSHRINK);
+ EWL_FLAG_FILL_HSHRINK);
ewl_container_append_child(EWL_CONTAINER(hbox[2]), hbox_button[1][0]);
ewl_callback_append(hbox_button[1][0], EWL_CALLBACK_CLICKED,
__toggle_child_shrink, NULL);
@@ -326,7 +326,7 @@
hbox_button[1][1] =
ewl_button_new("Shrink This Box To Fit It's Parent");
ewl_object_set_fill_policy(EWL_OBJECT(hbox_button[1][1]),
- EWL_FILL_POLICY_HSHRINK);
+ EWL_FLAG_FILL_HSHRINK);
ewl_container_append_child(EWL_CONTAINER(hbox[2]), hbox_button[1][1]);
ewl_callback_append(hbox_button[1][1], EWL_CALLBACK_CLICKED,
__toggle_child_shrink, NULL);
@@ -337,7 +337,7 @@
*/
hbox_button[1][2] = ewl_button_new("Don't shrink this box at all");
ewl_object_set_fill_policy(EWL_OBJECT(hbox_button[1][2]),
- EWL_FILL_POLICY_NONE);
+ EWL_FLAG_FILL_NONE);
ewl_container_append_child(EWL_CONTAINER(hbox[2]), hbox_button[1][2]);
ewl_callback_append(hbox_button[1][2], EWL_CALLBACK_CLICKED,
__toggle_child_shrink, NULL);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_button_test.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ewl_button_test.c 24 Sep 2003 07:12:25 -0000 1.19
+++ ewl_button_test.c 29 Sep 2003 21:46:51 -0000 1.20
@@ -6,6 +6,14 @@
void *user_data);
void
+__break_here(Ewl_Widget * w, void *ev_data, void *user_data)
+{
+ static n = 0;
+
+ printf("Configuring pass %d\n", n++);
+}
+
+void
__delete_button_test_window(Ewl_Widget * w, void *ev_data, void *user_data)
{
ewl_widget_destroy(w);
@@ -43,6 +51,8 @@
button_box = ewl_vbox_new();
ewl_container_append_child(EWL_CONTAINER(button_win), button_box);
ewl_box_set_spacing(EWL_BOX(button_box), 10);
+ ewl_callback_prepend(button_box, EWL_CALLBACK_CONFIGURE, __break_here,
+ NULL);
ewl_widget_show(button_box);
/*
@@ -50,7 +60,7 @@
*/
button[0] = ewl_button_new("With Label");
ewl_container_append_child(EWL_CONTAINER(button_box), button[0]);
- ewl_object_set_alignment(EWL_OBJECT(button[0]), EWL_ALIGNMENT_LEFT);
+ ewl_object_set_alignment(EWL_OBJECT(button[0]), EWL_FLAG_ALIGN_LEFT);
ewl_widget_show(button[0]);
/*
@@ -58,7 +68,7 @@
*/
button[1] = ewl_button_new(NULL);
ewl_container_append_child(EWL_CONTAINER(button_box), button[1]);
- ewl_object_set_alignment(EWL_OBJECT(button[1]), EWL_ALIGNMENT_LEFT);
+ ewl_object_set_alignment(EWL_OBJECT(button[1]), EWL_FLAG_ALIGN_LEFT);
ewl_widget_show(button[1]);
/*
@@ -74,7 +84,7 @@
check_button[0] = ewl_checkbutton_new("With Label");
ewl_container_append_child(EWL_CONTAINER(button_box), check_button[0]);
ewl_object_set_alignment(EWL_OBJECT(check_button[0]),
- EWL_ALIGNMENT_LEFT);
+ EWL_FLAG_ALIGN_LEFT);
ewl_widget_show(check_button[0]);
/*
@@ -83,7 +93,7 @@
check_button[1] = ewl_checkbutton_new(NULL);
ewl_container_append_child(EWL_CONTAINER(button_box), check_button[1]);
ewl_object_set_alignment(EWL_OBJECT(check_button[1]),
- EWL_ALIGNMENT_LEFT);
+ EWL_FLAG_ALIGN_LEFT);
ewl_widget_show(check_button[1]);
/*
@@ -99,14 +109,14 @@
radio_button[0] = ewl_radiobutton_new("With Label");
ewl_container_append_child(EWL_CONTAINER(button_box), radio_button[0]);
ewl_object_set_alignment(EWL_OBJECT(radio_button[0]),
- EWL_ALIGNMENT_LEFT);
+ EWL_FLAG_ALIGN_LEFT);
ewl_widget_show(radio_button[0]);
radio_button[1] = ewl_radiobutton_new(NULL);
ewl_radiobutton_set_chain(radio_button[1], radio_button[0]);
ewl_container_append_child(EWL_CONTAINER(button_box), radio_button[1]);
ewl_object_set_alignment(EWL_OBJECT(radio_button[1]),
- EWL_ALIGNMENT_LEFT);
+ EWL_FLAG_ALIGN_LEFT);
ewl_widget_show(radio_button[1]);
return;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_entry_test.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ewl_entry_test.c 3 Sep 2003 21:33:35 -0000 1.16
+++ ewl_entry_test.c 29 Sep 2003 21:46:51 -0000 1.17
@@ -91,7 +91,7 @@
ewl_widget_show(entry[1]);
button_hbox = ewl_hbox_new();
- ewl_object_set_alignment(EWL_OBJECT(button_hbox), EWL_ALIGNMENT_CENTER);
+ ewl_object_set_alignment(EWL_OBJECT(button_hbox), EWL_FLAG_ALIGN_CENTER);
ewl_container_append_child(EWL_CONTAINER(entry_box), button_hbox);
ewl_box_set_spacing(EWL_BOX(button_hbox), 5);
ewl_widget_show(button_hbox);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_filedialog_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ewl_filedialog_test.c 4 Jun 2003 01:46:44 -0000 1.3
+++ ewl_filedialog_test.c 29 Sep 2003 21:46:51 -0000 1.4
@@ -42,8 +42,8 @@
button = ewl_button_new("Filedialog");
- ewl_object_set_fill_policy(EWL_OBJECT(button), EWL_FILL_POLICY_SHRINK);
- ewl_object_set_alignment(EWL_OBJECT(button), EWL_ALIGNMENT_CENTER);
+ ewl_object_set_fill_policy(EWL_OBJECT(button), EWL_FLAG_FILL_SHRINK);
+ ewl_object_set_alignment(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER);
ewl_container_append_child(EWL_CONTAINER(fd_win), button);
ewl_widget_show(button);
ewl_callback_append(button, EWL_CALLBACK_CLICKED, __start_fd, NULL);
@@ -63,7 +63,7 @@
fd = ewl_filedialog_new(w->parent, EWL_FILEDIALOG_TYPE_OPEN,
__open_file);
- ewl_object_set_fill_policy(EWL_OBJECT(fd), EWL_FILL_POLICY_FILL);
+ ewl_object_set_fill_policy(EWL_OBJECT(fd), EWL_FLAG_FILL_FILL);
// ewl_container_append_child(EWL_CONTAINER(fd_win), fd);
ewl_widget_show(fd);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_fileselector_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ewl_fileselector_test.c 4 Jun 2003 01:46:44 -0000 1.3
+++ ewl_fileselector_test.c 29 Sep 2003 21:46:51 -0000 1.4
@@ -41,7 +41,7 @@
fs = ewl_fileselector_new(__file_clicked);
- ewl_object_set_fill_policy(EWL_OBJECT(fs), EWL_FILL_POLICY_FILL);
+ ewl_object_set_fill_policy(EWL_OBJECT(fs), EWL_FLAG_FILL_FILL);
ewl_container_append_child(EWL_CONTAINER(fs_win), fs);
ewl_widget_show(fs);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_floater_test.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ewl_floater_test.c 4 Jun 2003 01:46:44 -0000 1.5
+++ ewl_floater_test.c 29 Sep 2003 21:46:51 -0000 1.6
@@ -45,14 +45,14 @@
radio_button[0] = ewl_radiobutton_new("With Label");
ewl_container_append_child(EWL_CONTAINER(floater_box), radio_button[0]);
ewl_object_set_alignment(EWL_OBJECT(radio_button[0]),
- EWL_ALIGNMENT_LEFT);
+ EWL_FLAG_ALIGN_LEFT);
ewl_widget_show(radio_button[0]);
radio_button[1] = ewl_radiobutton_new(NULL);
ewl_radiobutton_set_chain(radio_button[1], radio_button[0]);
ewl_container_append_child(EWL_CONTAINER(floater_box), radio_button[1]);
ewl_object_set_alignment(EWL_OBJECT(radio_button[1]),
- EWL_ALIGNMENT_LEFT);
+ EWL_FLAG_ALIGN_LEFT);
ewl_widget_show(radio_button[1]);
floater = ewl_floater_new(radio_button[1]);
@@ -62,13 +62,13 @@
button[0] = ewl_button_new("With Label");
ewl_container_append_child(EWL_CONTAINER(floater), button[0]);
- ewl_object_set_alignment(EWL_OBJECT(button[0]), EWL_ALIGNMENT_LEFT);
+ ewl_object_set_alignment(EWL_OBJECT(button[0]), EWL_FLAG_ALIGN_LEFT);
ewl_object_set_custom_size(EWL_OBJECT(button[0]), 100, 17);
ewl_widget_show(button[0]);
button[1] = ewl_button_new(NULL);
ewl_container_append_child(EWL_CONTAINER(floater), button[1]);
- ewl_object_set_alignment(EWL_OBJECT(button[1]), EWL_ALIGNMENT_LEFT);
+ ewl_object_set_alignment(EWL_OBJECT(button[1]), EWL_FLAG_ALIGN_LEFT);
ewl_object_set_custom_size(EWL_OBJECT(button[1]), 100, 17);
ewl_widget_show(button[1]);
@@ -81,13 +81,13 @@
check_button[0] = ewl_checkbutton_new("With Label");
ewl_container_append_child(EWL_CONTAINER(floater), check_button[0]);
ewl_object_set_alignment(EWL_OBJECT(check_button[0]),
- EWL_ALIGNMENT_LEFT);
+ EWL_FLAG_ALIGN_LEFT);
ewl_widget_show(check_button[0]);
check_button[1] = ewl_checkbutton_new(NULL);
ewl_container_append_child(EWL_CONTAINER(floater), check_button[1]);
ewl_object_set_alignment(EWL_OBJECT(check_button[1]),
- EWL_ALIGNMENT_LEFT);
+ EWL_FLAG_ALIGN_LEFT);
ewl_widget_show(check_button[1]);
return;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_image_test.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ewl_image_test.c 4 Jun 2003 01:46:44 -0000 1.12
+++ ewl_image_test.c 29 Sep 2003 21:46:51 -0000 1.13
@@ -158,7 +158,7 @@
image = ewl_image_new(image_file);
ewl_object_set_padding(EWL_OBJECT(image), 0, 0, 5, 0);
- ewl_object_set_alignment(EWL_OBJECT(image), EWL_ALIGNMENT_CENTER);
+ ewl_object_set_alignment(EWL_OBJECT(image), EWL_FLAG_ALIGN_CENTER);
ewl_container_append_child(EWL_CONTAINER(scrollpane), image);
ewl_widget_show(image);
@@ -171,7 +171,7 @@
button_hbox = ewl_hbox_new();
ewl_box_set_spacing(EWL_BOX(button_hbox), 5);
- ewl_object_set_alignment(EWL_OBJECT(button_hbox), EWL_ALIGNMENT_CENTER);
+ ewl_object_set_alignment(EWL_OBJECT(button_hbox), EWL_FLAG_ALIGN_CENTER);
ewl_object_set_custom_size(EWL_OBJECT(button_hbox), 300, 26);
ewl_container_append_child(EWL_CONTAINER(image_box), button_hbox);
ewl_widget_show(button_hbox);
@@ -248,7 +248,7 @@
note_box = ewl_hbox_new();
ewl_container_append_child(EWL_CONTAINER(image_box), note_box);
- ewl_object_set_alignment(EWL_OBJECT(note_box), EWL_ALIGNMENT_CENTER);
+ ewl_object_set_alignment(EWL_OBJECT(note_box), EWL_FLAG_ALIGN_CENTER);
ewl_object_set_maximum_h(EWL_OBJECT(note_box), 20);
ewl_widget_show(note_box);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_imenu_test.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ewl_imenu_test.c 23 Jun 2003 05:59:19 -0000 1.8
+++ ewl_imenu_test.c 29 Sep 2003 21:46:51 -0000 1.9
@@ -63,7 +63,7 @@
* Create the main box for holding the widgets
*/
imenu_box = ewl_vbox_new();
- ewl_object_set_fill_policy(EWL_OBJECT(imenu_box), EWL_FILL_POLICY_FILL);
+ ewl_object_set_fill_policy(EWL_OBJECT(imenu_box), EWL_FLAG_FILL_FILL);
ewl_container_append_child(EWL_CONTAINER(imenu_win), imenu_box);
ewl_widget_show(imenu_box);
@@ -116,10 +116,6 @@
ewl_container_append_child(EWL_CONTAINER(imenu2), item);
ewl_callback_append(item, EWL_CALLBACK_SELECT, __imenu_select, NULL);
ewl_widget_show(item);
-
- /*
- * ewl_imenu_set_title_expandable(EWL_IMENU(imenu));
- */
return;
w = NULL;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_menu_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_menu_test.c 4 Jun 2003 01:46:44 -0000 1.4
+++ ewl_menu_test.c 29 Sep 2003 21:46:51 -0000 1.5
@@ -57,7 +57,7 @@
* Create the main box for holding the widgets
*/
menu_box = ewl_vbox_new();
- ewl_object_set_fill_policy(EWL_OBJECT(menu_box), EWL_FILL_POLICY_FILL);
+ ewl_object_set_fill_policy(EWL_OBJECT(menu_box), EWL_FLAG_FILL_FILL);
ewl_container_append_child(EWL_CONTAINER(menu_win), menu_box);
ewl_theme_data_set_str(menu_box,
"/appearance/box/vertical/base/visible", "yes");
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_notebook_test.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ewl_notebook_test.c 25 Jun 2003 00:21:17 -0000 1.13
+++ ewl_notebook_test.c 29 Sep 2003 21:46:51 -0000 1.14
@@ -37,17 +37,17 @@
/*
if (w == button_aleft)
- ewl_notebook_set_tabs_alignment(user_data, EWL_ALIGNMENT_LEFT);
+ ewl_notebook_set_tabs_alignment(user_data, EWL_FLAG_ALIGN_LEFT);
else if (w == button_acenter)
ewl_notebook_set_tabs_alignment(user_data,
- EWL_ALIGNMENT_CENTER);
+ EWL_FLAG_ALIGN_CENTER);
else if (w == button_aright)
- ewl_notebook_set_tabs_alignment(user_data, EWL_ALIGNMENT_RIGHT);
+ ewl_notebook_set_tabs_alignment(user_data, EWL_FLAG_ALIGN_RIGHT);
else if (w == button_atop)
- ewl_notebook_set_tabs_alignment(user_data, EWL_ALIGNMENT_TOP);
+ ewl_notebook_set_tabs_alignment(user_data, EWL_FLAG_ALIGN_TOP);
else if (w == button_abottom)
ewl_notebook_set_tabs_alignment(user_data,
- EWL_ALIGNMENT_BOTTOM);
+ EWL_FLAG_ALIGN_BOTTOM);
*/
return;
@@ -95,12 +95,12 @@
ewl_widget_show(main_vbox);
text = ewl_text_new("Main");
- ewl_object_set_alignment(EWL_OBJECT(text), EWL_ALIGNMENT_CENTER);
+ ewl_object_set_alignment(EWL_OBJECT(text), EWL_FLAG_ALIGN_CENTER);
ewl_container_append_child(EWL_CONTAINER(main_vbox), text);
ewl_widget_show(text);
avbox = ewl_vbox_new();
- ewl_object_set_alignment(EWL_OBJECT(avbox), EWL_ALIGNMENT_CENTER);
+ ewl_object_set_alignment(EWL_OBJECT(avbox), EWL_FLAG_ALIGN_CENTER);
ewl_container_append_child(EWL_CONTAINER(main_vbox), avbox);
ewl_widget_show(avbox);
@@ -144,7 +144,7 @@
ewl_widget_show(button_abottom);
pvbox = ewl_vbox_new();
- ewl_object_set_alignment(EWL_OBJECT(pvbox), EWL_ALIGNMENT_CENTER);
+ ewl_object_set_alignment(EWL_OBJECT(pvbox), EWL_FLAG_ALIGN_CENTER);
ewl_container_append_child(EWL_CONTAINER(main_vbox), pvbox);
ewl_widget_show(pvbox);
@@ -206,14 +206,14 @@
ewl_widget_show(main_vbox);
text = ewl_text_new(label);
- ewl_object_set_alignment(EWL_OBJECT(text), EWL_ALIGNMENT_CENTER);
+ ewl_object_set_alignment(EWL_OBJECT(text), EWL_FLAG_ALIGN_CENTER);
ewl_container_append_child(EWL_CONTAINER(main_vbox), text);
ewl_widget_show(text);
hbox = ewl_hbox_new();
ewl_box_set_spacing(EWL_BOX(hbox), 5);
ewl_object_set_padding(EWL_OBJECT(hbox), 0, 0, 20, 0);
- ewl_object_set_alignment(EWL_OBJECT(hbox), EWL_ALIGNMENT_CENTER);
+ ewl_object_set_alignment(EWL_OBJECT(hbox), EWL_FLAG_ALIGN_CENTER);
ewl_container_append_child(EWL_CONTAINER(main_vbox), hbox);
ewl_widget_show(hbox);
@@ -230,7 +230,7 @@
ewl_widget_show(button[1]);
button[2] = ewl_button_new("Remove This Page");
- ewl_object_set_alignment(EWL_OBJECT(button[2]), EWL_ALIGNMENT_CENTER);
+ ewl_object_set_alignment(EWL_OBJECT(button[2]), EWL_FLAG_ALIGN_CENTER);
ewl_container_append_child(EWL_CONTAINER(main_vbox), button[2]);
ewl_callback_append(button[2], EWL_CALLBACK_CLICKED,
__notebook_remove_visible_page, notebook);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_selectionbar_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_selectionbar_test.c 4 Jun 2003 01:46:44 -0000 1.4
+++ ewl_selectionbar_test.c 29 Sep 2003 21:46:51 -0000 1.5
@@ -43,7 +43,7 @@
ewl_widget_show(sbar_win);
box = ewl_vbox_new();
- ewl_object_set_fill_policy(EWL_OBJECT(box), EWL_FILL_POLICY_FILL);
+ ewl_object_set_fill_policy(EWL_OBJECT(box), EWL_FLAG_FILL_FILL);
ewl_container_append_child(EWL_CONTAINER(sbar_win), box);
ewl_theme_data_set_str(box,
"/appearance/box/vertical/base/visible", "yes");
@@ -51,12 +51,12 @@
box_button = ewl_button_new("test test test");
ewl_object_set_fill_policy(EWL_OBJECT(box_button),
- EWL_FILL_POLICY_SHRINK);
+ EWL_FLAG_FILL_SHRINK);
ewl_container_append_child(EWL_CONTAINER(box), box_button);
ewl_widget_show(box_button);
sbar = ewl_selectionbar_new(box);
- ewl_object_set_fill_policy(EWL_OBJECT(sbar), EWL_FILL_POLICY_FILL);
+ ewl_object_set_fill_policy(EWL_OBJECT(sbar), EWL_FLAG_FILL_FILL);
ewl_container_append_child(EWL_CONTAINER(sbar_win), sbar);
ewl_widget_show(sbar);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_selectionbook_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_selectionbook_test.c 4 Jun 2003 01:46:44 -0000 1.4
+++ ewl_selectionbook_test.c 29 Sep 2003 21:46:51 -0000 1.5
@@ -44,28 +44,28 @@
ewl_widget_show(sbook_win);
sbook = ewl_selectionbook_new();
- ewl_object_set_fill_policy(EWL_OBJECT(sbook), EWL_FILL_POLICY_FILL);
+ ewl_object_set_fill_policy(EWL_OBJECT(sbook), EWL_FLAG_FILL_FILL);
ewl_container_append_child(EWL_CONTAINER(sbook_win), sbook);
ewl_widget_show(sbook);
tab[0] = ewl_button_new("Tab - ONE");
- ewl_object_set_alignment(EWL_OBJECT(tab[0]), EWL_ALIGNMENT_LEFT);
+ ewl_object_set_alignment(EWL_OBJECT(tab[0]), EWL_FLAG_ALIGN_LEFT);
ewl_object_set_custom_size(EWL_OBJECT(tab[0]), 100, 17);
tab[1] = ewl_button_new("Tab - TWO");
- ewl_object_set_alignment(EWL_OBJECT(tab[1]), EWL_ALIGNMENT_LEFT);
+ ewl_object_set_alignment(EWL_OBJECT(tab[1]), EWL_FLAG_ALIGN_LEFT);
ewl_object_set_custom_size(EWL_OBJECT(tab[1]), 100, 17);
panel[0] = ewl_vbox_new();
- ewl_object_set_fill_policy(EWL_OBJECT(panel[0]), EWL_FILL_POLICY_FILL);
- ewl_object_set_alignment(EWL_OBJECT(panel[0]), EWL_ALIGNMENT_LEFT);
+ ewl_object_set_fill_policy(EWL_OBJECT(panel[0]), EWL_FLAG_FILL_FILL);
+ ewl_object_set_alignment(EWL_OBJECT(panel[0]), EWL_FLAG_ALIGN_LEFT);
ewl_theme_data_set_str(panel[0],
"/appearance/box/vertical/base/visible", "yes");
panel[1] = ewl_vbox_new();
- ewl_object_set_fill_policy(EWL_OBJECT(panel[1]), EWL_FILL_POLICY_FILL);
- ewl_object_set_alignment(EWL_OBJECT(panel[1]), EWL_ALIGNMENT_LEFT);
+ ewl_object_set_fill_policy(EWL_OBJECT(panel[1]), EWL_FLAG_FILL_FILL);
+ ewl_object_set_alignment(EWL_OBJECT(panel[1]), EWL_FLAG_ALIGN_LEFT);
ewl_theme_data_set_str(panel[1],
"/appearance/box/vertical/base/visible", "yes");
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_table_test.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ewl_table_test.c 4 Jun 2003 01:46:44 -0000 1.16
+++ ewl_table_test.c 29 Sep 2003 21:46:51 -0000 1.17
@@ -45,7 +45,7 @@
* Create the main box for holding the widgets
*/
table_box = ewl_vbox_new();
- ewl_object_set_fill_policy(EWL_OBJECT(table_box), EWL_FILL_POLICY_FILL);
+ ewl_object_set_fill_policy(EWL_OBJECT(table_box), EWL_FLAG_FILL_FILL);
ewl_container_append_child(EWL_CONTAINER(table_win), table_box);
ewl_theme_data_set_str(table_box,
"/appearance/box/vertical/base/visible", "no");
@@ -63,7 +63,7 @@
- cell = (Ewl_Cell *) ewl_cell_new();
+ cell = ewl_cell_new();
button[0] = ewl_button_new("FIRST");
ewl_container_append_child(EWL_CONTAINER(cell), button[0]);
ewl_table_add(EWL_TABLE(table), cell, 3, 4, 2, 3);
@@ -75,14 +75,14 @@
ewl_table_attach(EWL_TABLE(table), button[1], 1, 1, 2, 2);
ewl_object_set_custom_size(EWL_OBJECT(button[1]), 100, 20);
ewl_object_set_fill_policy(EWL_OBJECT(button[1]),
- EWL_FILL_POLICY_NORMAL);
+ EWL_FLAG_FILL_NORMAL);
ewl_widget_realize(button[1]);
button[2] = ewl_button_new(NULL);
ewl_table_attach(EWL_TABLE(table), button[2], 1, 1, 3, 3);
ewl_object_set_custom_size(EWL_OBJECT(button[2]), 100, 20);
ewl_object_set_fill_policy(EWL_OBJECT(button[2]),
- EWL_FILL_POLICY_NORMAL);
+ EWL_FLAG_FILL_NORMAL);
ewl_widget_show(button[2]);
@@ -105,14 +105,14 @@
ewl_table_attach(EWL_TABLE(table), button[6], 2, 2, 4, 4);
ewl_object_set_custom_size(EWL_OBJECT(button[6]), 100, 20);
ewl_object_set_fill_policy(EWL_OBJECT(button[6]),
- EWL_FILL_POLICY_NORMAL);
+ EWL_FLAG_FILL_NORMAL);
ewl_widget_realize(button[6]);
button[7] = ewl_button_new(NULL);
ewl_table_attach(EWL_TABLE(table), button[7], 3, 3, 4, 4);
ewl_object_set_custom_size(EWL_OBJECT(button[7]), 100, 20);
ewl_object_set_fill_policy(EWL_OBJECT(button[7]),
- EWL_FILL_POLICY_NORMAL);
+ EWL_FLAG_FILL_NORMAL);
ewl_widget_realize(button[7]);
button[8] = ewl_button_new(NULL);
@@ -128,14 +128,14 @@
button[10] = ewl_button_new(NULL);
ewl_object_set_custom_size(EWL_OBJECT(button[10]), 100, 20);
ewl_object_set_fill_policy(EWL_OBJECT(button[10]),
- EWL_FILL_POLICY_NORMAL);
+ EWL_FLAG_FILL_NORMAL);
ewl_table_attach(EWL_TABLE(table), button[10], 4, 4, 4, 4);
ewl_widget_realize(button[10]);
button[11] = ewl_button_new(NULL);
ewl_object_set_custom_size(EWL_OBJECT(button[11]), 100, 20);
ewl_object_set_fill_policy(EWL_OBJECT(button[11]),
- EWL_FILL_POLICY_NORMAL);
+ EWL_FLAG_FILL_NORMAL);
ewl_table_attach(EWL_TABLE(table), button[11], 4, 4, 5, 5);
ewl_widget_realize(button[11]);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_test.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- ewl_test.c 22 Sep 2003 06:09:25 -0000 1.46
+++ ewl_test.c 29 Sep 2003 21:46:51 -0000 1.47
@@ -252,9 +252,9 @@
for (i = 0; i < BUTTONS; i++) {
ewl_container_append_child(EWL_CONTAINER(main_box), button[i]);
ewl_object_set_fill_policy(EWL_OBJECT(button[i]),
- EWL_FILL_POLICY_NONE);
+ EWL_FLAG_FILL_NONE);
ewl_object_set_alignment(EWL_OBJECT(button[i]),
- EWL_ALIGNMENT_CENTER);
+ EWL_FLAG_ALIGN_CENTER);
ewl_widget_show(button[i]);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_textarea_test.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ewl_textarea_test.c 5 Sep 2003 22:20:27 -0000 1.8
+++ ewl_textarea_test.c 29 Sep 2003 21:46:51 -0000 1.9
@@ -82,7 +82,7 @@
textarea_win = ewl_window_new();
ewl_object_set_fill_policy(EWL_OBJECT(textarea_win),
- EWL_FILL_POLICY_FILL);
+ EWL_FLAG_FILL_FILL);
ewl_object_set_minimum_size(EWL_OBJECT(textarea_win), 200, 200);
ewl_object_set_maximum_size(EWL_OBJECT(textarea_win), 400, 400);
ewl_callback_append(textarea_win, EWL_CALLBACK_DELETE_WINDOW,
@@ -96,7 +96,7 @@
ewl_box_set_spacing(EWL_BOX(textarea_box), 10);
ewl_container_append_child(EWL_CONTAINER(textarea_win), textarea_box);
ewl_object_set_fill_policy(EWL_OBJECT(textarea_box),
- EWL_FILL_POLICY_FILL | EWL_FILL_POLICY_SHRINK);
+ EWL_FLAG_FILL_FILL | EWL_FLAG_FILL_SHRINK);
ewl_widget_show(textarea_box);
/*
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
