Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
etk_button_test.c etk_canvas_test.c etk_combobox_test.c
etk_menu_test.c etk_notebook_test.c etk_paned_test.c
etk_progress_bar_test.c etk_scrolled_view_test.c
etk_slider_test.c etk_table_test.c etk_test.c
etk_text_view_test.c etk_tree_test.c etk_xdnd_test.c
Log Message:
** BIG API BREAK **
The API of Etk_Box has been changed, etk_box_pack_start() and
etk_box_pack_end() doesn't exist anymore and have been replaced by a
bunch of other functions.
Most (probably all) of the apps are broken, you need to fix them! :)
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_button_test.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- etk_button_test.c 24 Jun 2006 17:54:06 -0000 1.11
+++ etk_button_test.c 15 Aug 2006 15:59:01 -0000 1.12
@@ -28,41 +28,41 @@
button_normal = etk_button_new_with_label("Normal button");
etk_tooltips_tip_set(button_normal, "This is a normal button");
- etk_box_pack_start(ETK_BOX(vbox), button_normal, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), button_normal, ETK_BOX_START, ETK_BOX_NONE,
0);
image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/e_icon.png");
button_normal = etk_button_new_with_label("Button with an image");
etk_tooltips_tip_set(button_normal, "This is a normal button with an
image");
etk_button_image_set(ETK_BUTTON(button_normal), ETK_IMAGE(image));
- etk_box_pack_start(ETK_BOX(vbox), button_normal, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), button_normal, ETK_BOX_START, ETK_BOX_NONE,
0);
button_normal = etk_button_new();
etk_tooltips_tip_set(button_normal, "This is a normal button with nothing");
- etk_box_pack_start(ETK_BOX(vbox), button_normal, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), button_normal, ETK_BOX_START, ETK_BOX_NONE,
0);
button_check = etk_check_button_new_with_label("Check button");
etk_tooltips_tip_set(button_check, "This is a check button");
- etk_box_pack_start(ETK_BOX(vbox), button_check, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), button_check, ETK_BOX_START, ETK_BOX_NONE, 0);
button_check = etk_check_button_new();
etk_tooltips_tip_set(button_check, "This is another check button");
- etk_box_pack_start(ETK_BOX(vbox), button_check, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), button_check, ETK_BOX_START, ETK_BOX_NONE, 0);
button_radio = etk_radio_button_new_with_label("Radio button", NULL);
etk_tooltips_tip_set(button_radio, "This is a radio button");
- etk_box_pack_start(ETK_BOX(vbox), button_radio, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), button_radio, ETK_BOX_START, ETK_BOX_NONE, 0);
button_radio =
etk_radio_button_new_from_widget(ETK_RADIO_BUTTON(button_radio));
etk_tooltips_tip_set(button_radio, "This is another radio button");
- etk_box_pack_start(ETK_BOX(vbox), button_radio, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), button_radio, ETK_BOX_START, ETK_BOX_NONE, 0);
button_toggle = etk_toggle_button_new_with_label("Toggle button");
etk_tooltips_tip_set(button_toggle, "This is a toggle button");
- etk_box_pack_start(ETK_BOX(vbox), button_toggle, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), button_toggle, ETK_BOX_START, ETK_BOX_NONE,
0);
button_toggle = etk_toggle_button_new();
etk_tooltips_tip_set(button_toggle, "This is another toggle button");
- etk_box_pack_start(ETK_BOX(vbox), button_toggle, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), button_toggle, ETK_BOX_START, ETK_BOX_NONE,
0);
etk_widget_show_all(win);
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_canvas_test.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- etk_canvas_test.c 24 Jun 2006 17:54:06 -0000 1.8
+++ etk_canvas_test.c 15 Aug 2006 15:59:01 -0000 1.9
@@ -27,11 +27,11 @@
canvas = etk_canvas_new();
etk_widget_size_request_set(canvas, 300, 200);
- etk_box_pack_start(ETK_BOX(vbox), canvas, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(vbox), canvas, ETK_BOX_START, ETK_BOX_EXPAND_FILL,
0);
button = etk_button_new_with_label("Add object");
etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_canvas_object_add), canvas);
- etk_box_pack_start(ETK_BOX(vbox), button, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), button, ETK_BOX_START, ETK_BOX_NONE, 0);
etk_widget_show_all(win);
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_combobox_test.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- etk_combobox_test.c 14 Aug 2006 13:14:25 -0000 1.6
+++ etk_combobox_test.c 15 Aug 2006 15:59:01 -0000 1.7
@@ -34,7 +34,7 @@
/* Simple combobox */
frame = etk_frame_new("Simple combobox");
- etk_box_pack_start(ETK_BOX(vbox), frame, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), frame, ETK_BOX_START, ETK_BOX_NONE, 0);
combobox = etk_combobox_new_default();
etk_container_add(ETK_CONTAINER(frame), combobox);
@@ -44,19 +44,19 @@
/* More complex combobox */
frame = etk_frame_new("Some stock icons");
- etk_box_pack_start(ETK_BOX(vbox), frame, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), frame, ETK_BOX_START, ETK_BOX_NONE, 0);
vbox = etk_vbox_new(ETK_FALSE, 3);
etk_container_add(ETK_CONTAINER(frame), vbox);
image = etk_image_new_from_stock(STARTING_STOCK_ID, ETK_STOCK_BIG);
- etk_box_pack_start(ETK_BOX(vbox), image, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), image, ETK_BOX_START, ETK_BOX_NONE, 0);
combobox = etk_combobox_new();
- etk_combobox_column_add(ETK_COMBOBOX(combobox), ETK_COMBOBOX_IMAGE, 24,
ETK_FALSE, ETK_FALSE, ETK_FALSE, 0.0, 0.5);
- etk_combobox_column_add(ETK_COMBOBOX(combobox), ETK_COMBOBOX_LABEL, 75,
ETK_TRUE, ETK_FALSE, ETK_FALSE, 0.0, 0.5);
+ etk_combobox_column_add(ETK_COMBOBOX(combobox), ETK_COMBOBOX_IMAGE, 24,
ETK_FALSE, ETK_BOX_START, ETK_BOX_NONE, 0.0, 0.5);
+ etk_combobox_column_add(ETK_COMBOBOX(combobox), ETK_COMBOBOX_LABEL, 75,
ETK_TRUE, ETK_BOX_START, ETK_BOX_NONE, 0.0, 0.5);
etk_combobox_build(ETK_COMBOBOX(combobox));
- etk_box_pack_start(ETK_BOX(vbox), combobox, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), combobox, ETK_BOX_START, ETK_BOX_NONE, 0);
etk_signal_connect("active_item_changed", ETK_OBJECT(combobox),
ETK_CALLBACK(_etk_test_combobox_active_item_changed_cb), image);
for (i = STARTING_STOCK_ID; i <= ENDING_STOCK_ID; i++)
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_menu_test.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- etk_menu_test.c 13 Aug 2006 15:33:17 -0000 1.14
+++ etk_menu_test.c 15 Aug 2006 15:59:01 -0000 1.15
@@ -42,15 +42,16 @@
vbox = etk_vbox_new(ETK_FALSE, 0);
etk_container_add(ETK_CONTAINER(win), vbox);
+ /* Menubar */
menu_bar = etk_menu_bar_new();
- etk_box_pack_start(ETK_BOX(vbox), menu_bar, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), menu_bar, ETK_BOX_START, ETK_BOX_NONE, 0);
+ /* Toolbar */
toolbar = etk_toolbar_new();
- etk_box_pack_start(ETK_BOX(vbox), toolbar, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), toolbar, ETK_BOX_START, ETK_BOX_NONE, 0);
button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_COPY);
etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
-
button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_CUT);
etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
@@ -65,14 +66,17 @@
button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_REDO);
etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
-
+
+ /* Window body */
label = etk_label_new("Click me! :)");
etk_label_alignment_set(ETK_LABEL(label), 0.5, 0.5);
etk_widget_pass_mouse_events_set(label, ETK_TRUE);
- etk_box_pack_start(ETK_BOX(vbox), label, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(vbox), label, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
+ /* Statusbar */
_etk_test_menu_statusbar = etk_statusbar_new();
- etk_box_pack_end(ETK_BOX(vbox), _etk_test_menu_statusbar, ETK_FALSE,
ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), _etk_test_menu_statusbar, ETK_BOX_END,
ETK_BOX_NONE, 0);
+
/****************
* Menu Bar
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_notebook_test.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- etk_notebook_test.c 8 Aug 2006 16:33:00 -0000 1.9
+++ etk_notebook_test.c 15 Aug 2006 15:59:01 -0000 1.10
@@ -29,8 +29,9 @@
vbox = etk_vbox_new(ETK_FALSE, 0);
etk_container_add(ETK_CONTAINER(win), vbox);
+ /* Create the notebook */
notebook = etk_notebook_new();
- etk_box_pack_start(ETK_BOX(vbox), notebook, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(vbox), notebook, ETK_BOX_START, ETK_BOX_EXPAND_FILL,
0);
/* Add the page */
page_widget = _etk_test_notebook_page1_widget_create();
@@ -38,28 +39,28 @@
page_widget = _etk_test_notebook_page2_widget_create();
etk_notebook_page_append(ETK_NOTEBOOK(notebook), "Tab 2 - Button test",
page_widget);
- etk_box_pack_start(ETK_BOX(vbox), etk_hseparator_new(), ETK_FALSE,
ETK_FALSE, 5);
+ etk_box_append(ETK_BOX(vbox), etk_hseparator_new(), ETK_BOX_START,
ETK_BOX_NONE, 5);
/* Create the prev/next buttons */
alignment = etk_alignment_new(0.5, 0.5, 0.0, 1.0);
- etk_box_pack_start(ETK_BOX(vbox), alignment, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), alignment, ETK_BOX_START, ETK_BOX_NONE, 0);
hbox = etk_hbox_new(ETK_TRUE, 0);
etk_container_add(ETK_CONTAINER(alignment), hbox);
button = etk_button_new_from_stock(ETK_STOCK_GO_PREVIOUS);
etk_button_label_set(ETK_BUTTON(button), "Previous");
etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
ETK_CALLBACK(etk_notebook_page_prev), notebook);
- etk_box_pack_start(ETK_BOX(hbox), button, ETK_FALSE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_FILL, 0);
button = etk_button_new_from_stock(ETK_STOCK_GO_NEXT);
etk_button_label_set(ETK_BUTTON(button), "Next");
etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
ETK_CALLBACK(etk_notebook_page_next), notebook);
- etk_box_pack_start(ETK_BOX(hbox), button, ETK_FALSE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_FILL, 0);
- /* Create the hide tabs toggle button */
+ /* Create the "Hide tabs" toggle button */
button = etk_toggle_button_new_with_label("Hide tabs");
etk_signal_connect("toggled", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_notebook_hide_tabs_toggled_cb), notebook);
- etk_box_pack_start(ETK_BOX(hbox), button, ETK_FALSE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_FILL, 0);
etk_widget_show_all(win);
}
@@ -128,22 +129,22 @@
etk_container_add(ETK_CONTAINER(alignment), vbox);
button_normal = etk_button_new_with_label("Normal button");
- etk_box_pack_start(ETK_BOX(vbox), button_normal, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), button_normal, ETK_BOX_START, ETK_BOX_NONE,
0);
button_toggle = etk_toggle_button_new_with_label("Toggle button");
- etk_box_pack_start(ETK_BOX(vbox), button_toggle, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), button_toggle, ETK_BOX_START, ETK_BOX_NONE,
0);
button_check = etk_check_button_new_with_label("Check button");
- etk_box_pack_start(ETK_BOX(vbox), button_check, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), button_check, ETK_BOX_START, ETK_BOX_NONE, 0);
button_check = etk_check_button_new();
- etk_box_pack_start(ETK_BOX(vbox), button_check, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), button_check, ETK_BOX_START, ETK_BOX_NONE, 0);
button_radio = etk_radio_button_new_with_label("Radio button", NULL);
- etk_box_pack_start(ETK_BOX(vbox), button_radio, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), button_radio, ETK_BOX_START, ETK_BOX_NONE, 0);
button_radio =
etk_radio_button_new_from_widget(ETK_RADIO_BUTTON(button_radio));
- etk_box_pack_start(ETK_BOX(vbox), button_radio, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), button_radio, ETK_BOX_START, ETK_BOX_NONE, 0);
return alignment;
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_paned_test.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- etk_paned_test.c 24 Jun 2006 17:54:06 -0000 1.6
+++ etk_paned_test.c 15 Aug 2006 15:59:01 -0000 1.7
@@ -27,7 +27,7 @@
/* Paned Area */
vpaned = etk_vpaned_new();
- etk_box_pack_start(ETK_BOX(vbox), vpaned, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(vbox), vpaned, ETK_BOX_START, ETK_BOX_EXPAND_FILL,
0);
hpaned = etk_hpaned_new();
etk_paned_child1_set(ETK_PANED(vpaned), hpaned, ETK_FALSE);
@@ -45,31 +45,31 @@
etk_paned_child2_set(ETK_PANED(vpaned), label, ETK_TRUE);
hseparator = etk_hseparator_new();
- etk_box_pack_start(ETK_BOX(vbox), hseparator, ETK_FALSE, ETK_FALSE, 6);
+ etk_box_append(ETK_BOX(vbox), hseparator, ETK_BOX_START, ETK_BOX_NONE, 6);
/* Properties Area */
hbox = etk_hbox_new(ETK_TRUE, 0);
- etk_box_pack_start(ETK_BOX(vbox), hbox, ETK_FALSE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START, ETK_BOX_NONE, 0);
frame = etk_frame_new("HPaned Properties");
- etk_box_pack_start(ETK_BOX(hbox), frame, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(hbox), frame, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
vbox = etk_vbox_new(ETK_TRUE, 0);
etk_container_add(ETK_CONTAINER(frame), vbox);
check_button = etk_check_button_new_with_label("Child 1 Expand");
etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(check_button), ETK_TRUE);
- etk_box_pack_start(ETK_BOX(vbox), check_button, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(vbox), check_button, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
check_button = etk_check_button_new_with_label("Child 2 Expand");
- etk_box_pack_start(ETK_BOX(vbox), check_button, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(vbox), check_button, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
frame = etk_frame_new("VPaned Properties");
- etk_box_pack_start(ETK_BOX(hbox), frame, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(hbox), frame, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
vbox = etk_vbox_new(ETK_TRUE, 0);
etk_container_add(ETK_CONTAINER(frame), vbox);
check_button = etk_check_button_new_with_label("Child 1 Expand");
- etk_box_pack_start(ETK_BOX(vbox), check_button, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(vbox), check_button, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
check_button = etk_check_button_new_with_label("Child 2 Expand");
etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(check_button), ETK_TRUE);
- etk_box_pack_start(ETK_BOX(vbox), check_button, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(vbox), check_button, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
etk_widget_show_all(win);
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_progress_bar_test.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- etk_progress_bar_test.c 27 Jul 2006 00:57:10 -0000 1.6
+++ etk_progress_bar_test.c 15 Aug 2006 15:59:01 -0000 1.7
@@ -15,7 +15,7 @@
Etk_Widget *vbox;
Etk_Widget *pbar;
Etk_Widget *pbar2;
-
+
if (win)
{
etk_widget_show_all(ETK_WIDGET(win));
@@ -30,11 +30,11 @@
etk_container_add(ETK_CONTAINER(win), vbox);
pbar = etk_progress_bar_new_with_text("0% done");
- etk_box_pack_start(ETK_BOX(vbox), pbar, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(vbox), pbar, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
pbar2 = etk_progress_bar_new_with_text("Loading...");
etk_progress_bar_pulse_step_set(ETK_PROGRESS_BAR(pbar2), 0.015);
- etk_box_pack_start(ETK_BOX(vbox), pbar2, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(vbox), pbar2, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
etk_widget_show_all(win);
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_scrolled_view_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_scrolled_view_test.c 24 Jun 2006 17:54:06 -0000 1.3
+++ etk_scrolled_view_test.c 15 Aug 2006 15:59:01 -0000 1.4
@@ -17,7 +17,7 @@
etk_window_title_set(ETK_WINDOW(win), "Etk Scrolled View Test");
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
etk_widget_size_request_set(win, 180, 180);
-
+
scrolled_view = etk_scrolled_view_new();
etk_container_add(ETK_CONTAINER(win), scrolled_view);
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_slider_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_slider_test.c 24 Jun 2006 17:54:06 -0000 1.4
+++ etk_slider_test.c 15 Aug 2006 15:59:01 -0000 1.5
@@ -20,7 +20,7 @@
etk_window_title_set(ETK_WINDOW(win), "Etk Slider Test");
etk_container_border_width_set(ETK_CONTAINER(win), 5);
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
-
+
table = etk_table_new(2, 2, ETK_FALSE);
etk_container_add(ETK_CONTAINER(win), table);
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_table_test.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- etk_table_test.c 2 Jul 2006 04:01:19 -0000 1.9
+++ etk_table_test.c 15 Aug 2006 15:59:01 -0000 1.10
@@ -66,10 +66,10 @@
hbox = etk_hbox_new(ETK_FALSE, 0);
etk_container_add(ETK_CONTAINER(win), vbox);
- etk_box_pack_start(ETK_BOX(vbox), table, ETK_FALSE, ETK_FALSE, 0);
- etk_box_pack_end(ETK_BOX(vbox), hbox, ETK_FALSE, ETK_FALSE, 0);
- etk_box_pack_end(ETK_BOX(hbox), buttons[3], ETK_FALSE, ETK_FALSE, 0);
- etk_box_pack_end(ETK_BOX(hbox), buttons[4], ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), table, ETK_BOX_START, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_END, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(hbox), buttons[3], ETK_BOX_END, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(hbox), buttons[4], ETK_BOX_END, ETK_BOX_NONE, 0);
etk_widget_show_all(win);
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_test.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- etk_test.c 2 Aug 2006 05:53:59 -0000 1.26
+++ etk_test.c 15 Aug 2006 15:59:01 -0000 1.27
@@ -169,7 +169,7 @@
}
frame = etk_frame_new(_etk_test_categories[i]);
- etk_box_pack_start(ETK_BOX(vbox), frame, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(vbox), frame, ETK_BOX_START, ETK_BOX_EXPAND_FILL,
0);
tables[i] = etk_table_new(ETK_TEST_NUM_COLS, (num_examples +
ETK_TEST_NUM_COLS - 1) / ETK_TEST_NUM_COLS, ETK_TRUE);
etk_container_add(ETK_CONTAINER(frame), tables[i]);
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_text_view_test.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- etk_text_view_test.c 26 Jul 2006 14:57:18 -0000 1.13
+++ etk_text_view_test.c 15 Aug 2006 15:59:01 -0000 1.14
@@ -51,11 +51,11 @@
button = etk_button_new_with_label("Tag Presentation");
etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_text_view_tag_window_create), NULL);
- etk_box_pack_start(ETK_BOX(vbox), button, ETK_TRUE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), button, ETK_BOX_START, ETK_BOX_EXPAND, 0);
button = etk_button_new_with_label("Instant Messenger");
etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_text_view_im_window_create), NULL);
- etk_box_pack_start(ETK_BOX(vbox), button, ETK_TRUE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), button, ETK_BOX_START, ETK_BOX_EXPAND, 0);
etk_widget_show_all(win);
}
@@ -135,7 +135,7 @@
"</p>",
ETK_TRUE);
- etk_box_pack_start(ETK_BOX(vbox), text_view, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(vbox), text_view, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
etk_widget_show_all(win);
}
@@ -188,17 +188,17 @@
/* TODO: We must use a toolbar here instead */
hbox = etk_hbox_new(ETK_FALSE, 0);
- etk_box_pack_start(ETK_BOX(vbox), hbox, ETK_FALSE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START, ETK_BOX_NONE, 0);
for (i = 0; i < _num_im_buttons; i++)
{
button = etk_button_new_from_stock(_im_buttons[i].stock_id);
- etk_box_pack_start(ETK_BOX(hbox), button, ETK_FALSE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_NONE, 0);
}
editor_view = etk_text_view_new();
etk_widget_size_request_set(editor_view, 200, 80);
- etk_box_pack_start(ETK_BOX(vbox), editor_view, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(vbox), editor_view, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
etk_signal_connect("key_down", ETK_OBJECT(editor_view),
ETK_CALLBACK(_etk_test_im_editor_key_down_cb), message_view);
etk_widget_show_all(win);
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_tree_test.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- etk_tree_test.c 24 Jun 2006 17:54:06 -0000 1.31
+++ etk_tree_test.c 15 Aug 2006 15:59:01 -0000 1.32
@@ -111,27 +111,27 @@
button = etk_button_new_with_label("Clear");
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_tree_clear_list_cb), tree);
- etk_box_pack_start(ETK_BOX(hbox), button, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_EXPAND_FILL,
0);
button = etk_button_new_with_label("Add 5 rows");
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_tree_add_5_cb), tree);
- etk_box_pack_start(ETK_BOX(hbox), button, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_EXPAND_FILL,
0);
button = etk_button_new_with_label("Add 50 rows");
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_tree_add_50_cb), tree);
- etk_box_pack_start(ETK_BOX(hbox), button, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_EXPAND_FILL,
0);
button = etk_button_new_with_label("Add 500 rows");
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_tree_add_500_cb), tree);
- etk_box_pack_start(ETK_BOX(hbox), button, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_EXPAND_FILL,
0);
button = etk_button_new_with_label("Add 5000 rows");
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_tree_add_5000_cb), tree);
- etk_box_pack_start(ETK_BOX(hbox), button, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_EXPAND_FILL,
0);
button = etk_button_new_with_label("Sort");
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_tree_sort_cb), tree);
- etk_box_pack_start(ETK_BOX(hbox), button, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_EXPAND_FILL,
0);
etk_widget_show_all(win);
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_xdnd_test.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- etk_xdnd_test.c 24 Jun 2006 17:54:06 -0000 1.12
+++ etk_xdnd_test.c 15 Aug 2006 15:59:01 -0000 1.13
@@ -63,11 +63,11 @@
etk_signal_connect("drag_drop", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_xdnd_drag_drop_cb), label);
etk_signal_connect("drag_motion", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_xdnd_drag_motion_cb), NULL);
etk_signal_connect("drag_leave", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_xdnd_drag_leave_cb), NULL);
- etk_box_pack_start(ETK_BOX(vbox2), button, ETK_FALSE, ETK_FALSE, 0);
- etk_box_pack_start(ETK_BOX(vbox2), label, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox2), button, ETK_BOX_START, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(vbox2), label, ETK_BOX_START, ETK_BOX_NONE, 0);
sep = etk_hseparator_new();
- etk_box_pack_start(ETK_BOX(vbox2), sep, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox2), sep, ETK_BOX_START, ETK_BOX_NONE, 0);
image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/e_icon.png");
button = etk_button_new_with_label("Drop an image here");
@@ -77,11 +77,11 @@
dnd_types[0] = strdup("text/uri-list");
etk_widget_dnd_types_set(button, dnd_types, dnd_types_num);
etk_signal_connect("drag_drop", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_xdnd_drag_drop_cb2), image);
- etk_box_pack_start(ETK_BOX(vbox2), button, ETK_FALSE, ETK_FALSE, 0);
- etk_box_pack_start(ETK_BOX(vbox2), image, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox2), button, ETK_BOX_START, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(vbox2), image, ETK_BOX_START, ETK_BOX_NONE, 0);
sep = etk_hseparator_new();
- etk_box_pack_start(ETK_BOX(vbox2), sep, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox2), sep, ETK_BOX_START, ETK_BOX_NONE, 0);
label = etk_label_new("Drop some text below");
entry = etk_entry_new();
@@ -91,17 +91,17 @@
etk_widget_dnd_types_set(entry, dnd_types, dnd_types_num);
etk_widget_dnd_dest_set(entry, ETK_TRUE);
etk_signal_connect("drag_drop", ETK_OBJECT(entry),
ETK_CALLBACK(_etk_test_xdnd_drag_drop_cb3), NULL);
- etk_box_pack_start(ETK_BOX(vbox2), label, ETK_FALSE, ETK_FALSE, 0);
- etk_box_pack_start(ETK_BOX(vbox2), entry, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox2), label, ETK_BOX_START, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(vbox2), entry, ETK_BOX_START, ETK_BOX_NONE, 0);
sep = etk_hseparator_new();
- etk_box_pack_start(ETK_BOX(vbox2), sep, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox2), sep, ETK_BOX_START, ETK_BOX_NONE, 0);
button = etk_button_new_with_label("Drag Me!");
etk_widget_dnd_source_set(button, ETK_TRUE);
etk_widget_dnd_drag_widget_set(button, etk_button_new_with_label("This is a
test!"));
etk_widget_dnd_drag_data_set(button, dnd_types, dnd_types_num, "This is the
drag data!", strlen("This is the drag data!") + 1);
- etk_box_pack_start(ETK_BOX(vbox2), button, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox2), button, ETK_BOX_START, ETK_BOX_NONE, 0);
/* frame for clipboard tests */
@@ -114,17 +114,17 @@
etk_signal_connect("clipboard_received", ETK_OBJECT(label),
ETK_CALLBACK(_etk_test_xdnd_clipboard_text_request_cb), NULL);
button = etk_button_new_with_label("Press me to paste text");
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_xdnd_button_paste_cb), label);
- etk_box_pack_start(ETK_BOX(vbox2), button, ETK_FALSE, ETK_FALSE, 0);
- etk_box_pack_start(ETK_BOX(vbox2), label, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox2), button, ETK_BOX_START, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(vbox2), label, ETK_BOX_START, ETK_BOX_NONE, 0);
sep = etk_hseparator_new();
- etk_box_pack_start(ETK_BOX(vbox2), sep, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox2), sep, ETK_BOX_START, ETK_BOX_NONE, 0);
entry = etk_entry_new();
button = etk_button_new_with_label("Click me to copy text below");
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_xdnd_button_copy_cb), entry);
- etk_box_pack_start(ETK_BOX(vbox2), button, ETK_FALSE, ETK_FALSE, 0);
- etk_box_pack_start(ETK_BOX(vbox2), entry, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox2), button, ETK_BOX_START, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(vbox2), entry, ETK_BOX_START, ETK_BOX_NONE, 0);
/* frame for selection test */
frame = etk_frame_new("Selections");
@@ -136,17 +136,17 @@
etk_signal_connect("selection_received", ETK_OBJECT(label),
ETK_CALLBACK(_etk_test_xdnd_selection_text_request_cb), NULL);
button = etk_button_new_with_label("Press me to get selection text");
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_xdnd_button_selection_get_cb), label);
- etk_box_pack_start(ETK_BOX(vbox2), button, ETK_FALSE, ETK_FALSE, 0);
- etk_box_pack_start(ETK_BOX(vbox2), label, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox2), button, ETK_BOX_START, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(vbox2), label, ETK_BOX_START, ETK_BOX_NONE, 0);
sep = etk_hseparator_new();
- etk_box_pack_start(ETK_BOX(vbox2), sep, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox2), sep, ETK_BOX_START, ETK_BOX_NONE, 0);
entry = etk_entry_new();
button = etk_button_new_with_label("Click me to set selection text");
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_xdnd_button_selection_set_cb), entry);
- etk_box_pack_start(ETK_BOX(vbox2), button, ETK_FALSE, ETK_FALSE, 0);
- etk_box_pack_start(ETK_BOX(vbox2), entry, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox2), button, ETK_BOX_START, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(vbox2), entry, ETK_BOX_START, ETK_BOX_NONE, 0);
etk_widget_show_all(win);
}
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
