Enlightenment CVS committal
Author : moom
Project : e17
Module : libs/etk
Dir : e17/libs/etk/src/bin
Modified Files:
etk_button_test.c etk_embed_test.c etk_entry_test.c
etk_image_test.c etk_notebook_test.c etk_shadow_test.c
etk_slider_test.c etk_table_test.c etk_test.c
Log Message:
* [Table] API break: etk_table_attach() and etk_table_new(). This API
break is paricularly vicious since the code will still
compile, with no warnings. So be careful.
* [Table] A table can now be homogeneous horizontally, vertically or in
both directions
* [Container] API break: etk_container_remove() no longer need the
container, just the child to remove
* [Widget] Fix widget reparenting! (the notebook might have some
problems, I haven't ported it yet)
Clean up++
Doc++
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_button_test.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- etk_button_test.c 24 Mar 2007 09:53:39 -0000 1.17
+++ etk_button_test.c 25 Mar 2007 18:22:00 -0000 1.18
@@ -28,7 +28,7 @@
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);
+ table = etk_table_new(2, 2, ETK_TABLE_HHOMOGENEOUS);
etk_container_add(ETK_CONTAINER(win), table);
@@ -36,7 +36,7 @@
* Normal buttons
*******************/
frame = etk_frame_new("Buttons");
- etk_table_attach(ETK_TABLE(table), frame, 0, 0, 0, 0, 0, 0,
ETK_TABLE_EXPAND_FILL);
+ etk_table_attach_default(ETK_TABLE(table), frame, 0, 0, 0, 0);
vbox = etk_vbox_new(ETK_FALSE, 3);
etk_container_add(ETK_CONTAINER(frame), vbox);
@@ -60,7 +60,7 @@
* Toggle buttons
*******************/
frame = etk_frame_new("Toggle Buttons");
- etk_table_attach(ETK_TABLE(table), frame, 1, 1, 0, 0, 0, 0,
ETK_TABLE_EXPAND_FILL);
+ etk_table_attach_default(ETK_TABLE(table), frame, 1, 1, 0, 0);
vbox = etk_vbox_new(ETK_FALSE, 3);
etk_container_add(ETK_CONTAINER(frame), vbox);
@@ -84,12 +84,12 @@
* Check buttons
*******************/
frame = etk_frame_new("Check Buttons");
- etk_table_attach(ETK_TABLE(table), frame, 0, 0, 1, 1, 0, 0,
ETK_TABLE_EXPAND_FILL);
+ etk_table_attach_default(ETK_TABLE(table), frame, 0, 0, 1, 1);
vbox = etk_vbox_new(ETK_FALSE, 3);
etk_container_add(ETK_CONTAINER(frame), vbox);
button = etk_check_button_new_with_label("Check button");
- etk_toggle_button_toggle(ETK_TOGGLE_BUTTON(button));
+ etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(button), ETK_TRUE);
etk_box_append(ETK_BOX(vbox), button, ETK_BOX_START, ETK_BOX_NONE, 0);
button = etk_check_button_new();
@@ -109,7 +109,7 @@
* Radio buttons
*******************/
frame = etk_frame_new("Radio Buttons");
- etk_table_attach(ETK_TABLE(table), frame, 1, 1, 1, 1, 0, 0,
ETK_TABLE_EXPAND_FILL);
+ etk_table_attach_default(ETK_TABLE(table), frame, 1, 1, 1, 1);
vbox = etk_vbox_new(ETK_FALSE, 3);
etk_container_add(ETK_CONTAINER(frame), vbox);
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_embed_test.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- etk_embed_test.c 10 Mar 2007 23:09:32 -0000 1.11
+++ etk_embed_test.c 25 Mar 2007 18:22:00 -0000 1.12
@@ -162,19 +162,19 @@
for (i = 0; i < 6; i++)
entries[i] = etk_entry_new();
- table = etk_table_new(2, 10, ETK_FALSE);
- etk_table_attach(ETK_TABLE(table), image, 0, 0, 0, 0, 0, 0, ETK_TABLE_NONE);
- etk_table_attach(ETK_TABLE(table), combobox, 1, 1, 0, 0, 0, 0,
ETK_TABLE_HEXPAND);
+ table = etk_table_new(2, 10, ETK_TABLE_NOT_HOMOGENEOUS);
+ etk_table_attach(ETK_TABLE(table), image, 0, 0, 0, 0, ETK_TABLE_NONE, 0, 0);
+ etk_table_attach(ETK_TABLE(table), combobox, 1, 1, 0, 0, ETK_TABLE_HEXPAND,
0, 0);
for (i = 0; i < 6; i++)
{
- etk_table_attach(ETK_TABLE(table), labels[i], 0, 0, 2 + i, 2 + i, 0, 0,
ETK_TABLE_HFILL);
+ etk_table_attach(ETK_TABLE(table), labels[i], 0, 0, 2 + i, 2 + i,
ETK_TABLE_HFILL, 0, 0);
etk_table_attach_default(ETK_TABLE(table), entries[i], 1, 1, 2 + i, 2 +
i);
}
- etk_table_attach(ETK_TABLE(table), labels[6], 0, 0, 8, 8, 0, 0,
ETK_TABLE_HFILL);
+ etk_table_attach(ETK_TABLE(table), labels[6], 0, 0, 8, 8, ETK_TABLE_HFILL,
0, 0);
etk_table_attach_default(ETK_TABLE(table), buttons[0], 1, 1, 8, 8);
- etk_table_attach(ETK_TABLE(table), labels[7], 0, 0, 9, 9, 0, 0,
ETK_TABLE_HFILL);
+ etk_table_attach(ETK_TABLE(table), labels[7], 0, 0, 9, 9, ETK_TABLE_HFILL,
0, 0);
etk_table_attach_default(ETK_TABLE(table), buttons[1], 1, 1, 9, 9);
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_entry_test.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- etk_entry_test.c 22 Mar 2007 19:36:50 -0000 1.15
+++ etk_entry_test.c 25 Mar 2007 18:22:00 -0000 1.16
@@ -17,9 +17,9 @@
{
static Etk_Widget *win = NULL;
Etk_Widget *vbox;
+ Etk_Widget *vbox2;
Etk_Widget *frame;
Etk_Widget *separator;
- Etk_Widget *table;
Etk_Widget *button;
Etk_Widget *entry;
Etk_Widget *image;
@@ -43,12 +43,12 @@
*******************/
frame = etk_frame_new("Normal Entry");
etk_box_append(ETK_BOX(vbox), frame, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
- table = etk_table_new(1, 2, ETK_FALSE);
- etk_container_add(ETK_CONTAINER(frame), table);
+ vbox2 = etk_vbox_new(ETK_FALSE, 0);
+ etk_container_add(ETK_CONTAINER(frame), vbox2);
_entry_normal = etk_entry_new();
etk_entry_text_set(ETK_ENTRY(_entry_normal), "Here is some text");
- etk_table_attach(ETK_TABLE(table), _entry_normal, 0, 0, 0, 0, 0, 0,
ETK_TABLE_HEXPAND | ETK_TABLE_HFILL);
+ etk_box_append(ETK_BOX(vbox2), _entry_normal, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
etk_widget_size_request_set(_entry_normal, 140, -1);
image = etk_image_new_from_stock(ETK_STOCK_DOCUMENT_PRINT, ETK_STOCK_SMALL);
@@ -57,7 +57,7 @@
etk_entry_clear_button_add(ETK_ENTRY(_entry_normal));
_label_normal = etk_label_new(NULL);
- etk_table_attach(ETK_TABLE(table), _label_normal, 0, 1, 1, 0, 0, 0,
ETK_TABLE_HEXPAND | ETK_TABLE_HFILL);
+ etk_box_append(ETK_BOX(vbox2), _label_normal, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
separator = etk_hseparator_new();
etk_box_append(ETK_BOX(vbox), separator, ETK_BOX_START, ETK_BOX_NONE, 6);
@@ -84,20 +84,26 @@
*******************/
frame = etk_frame_new("Password Entry");
etk_box_append(ETK_BOX(vbox), frame, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
- vbox = etk_vbox_new(ETK_FALSE, 0);
- etk_container_add(ETK_CONTAINER(frame), vbox);
+ vbox2 = etk_vbox_new(ETK_FALSE, 0);
+ etk_container_add(ETK_CONTAINER(frame), vbox2);
entry = etk_entry_new();
etk_entry_text_set(ETK_ENTRY(entry), "Password");
etk_entry_password_mode_set(ETK_ENTRY(entry), ETK_TRUE);
- etk_box_append(ETK_BOX(vbox), entry, ETK_BOX_START, ETK_BOX_FILL, 0);
+ etk_box_append(ETK_BOX(vbox2), entry, ETK_BOX_START, ETK_BOX_FILL, 0);
button = etk_check_button_new_with_label("Password Visible");
- etk_box_append(ETK_BOX(vbox), button, ETK_BOX_START, ETK_BOX_FILL, 0);
+ etk_box_append(ETK_BOX(vbox2), button, ETK_BOX_START, ETK_BOX_FILL, 0);
etk_signal_connect("toggled", ETK_OBJECT(button),
ETK_CALLBACK(_password_show_cb), entry);
etk_widget_show_all(win);
}
+
+/**************************
+ *
+ * Callbacks
+ *
+ **************************/
/* Prints the text of the normal entry in the label when the "print" icon is
clicked */
static void _normal_print_cb(Etk_Object *object, void *data)
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_image_test.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- etk_image_test.c 22 Mar 2007 19:36:50 -0000 1.9
+++ etk_image_test.c 25 Mar 2007 18:22:00 -0000 1.10
@@ -1,6 +1,12 @@
#include "etk_test.h"
#include "config.h"
+/**************************
+ *
+ * Creation of the test-app window
+ *
+ **************************/
+
/* Creates the window for the image test */
void etk_test_image_window_create(void *data)
{
@@ -19,6 +25,8 @@
etk_window_title_set(ETK_WINDOW(win), "Etk Image Test");
etk_signal_connect("delete-event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ /* TODO: we need a more complete test-app for Etk_Image */
+ /* Create two images with different "keep-aspect" property and pack theme
into a table */
images[0] = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png",
NULL);
etk_image_keep_aspect_set(ETK_IMAGE(images[0]), ETK_TRUE);
images[1] = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png",
NULL);
@@ -26,12 +34,12 @@
labels[0] = etk_label_new("Keep aspect");
labels[1] = etk_label_new("Don't keep aspect");
- table = etk_table_new(2, 2, ETK_FALSE);
+ table = etk_table_new(2, 2, ETK_TABLE_HHOMOGENEOUS);
etk_table_attach_default(ETK_TABLE(table), images[0], 0, 0, 0, 0);
etk_table_attach_default(ETK_TABLE(table), images[1], 1, 1, 0, 0);
- etk_table_attach(ETK_TABLE(table), labels[0], 0, 0, 1, 1, 2, 0,
ETK_TABLE_HEXPAND);
- etk_table_attach(ETK_TABLE(table), labels[1], 1, 1, 1, 1, 2, 0,
ETK_TABLE_HEXPAND);
+ etk_table_attach(ETK_TABLE(table), labels[0], 0, 0, 1, 1,
ETK_TABLE_HEXPAND, 2, 0);
+ etk_table_attach(ETK_TABLE(table), labels[1], 1, 1, 1, 1,
ETK_TABLE_HEXPAND, 2, 0);
etk_container_add(ETK_CONTAINER(win), table);
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_notebook_test.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- etk_notebook_test.c 22 Mar 2007 19:36:50 -0000 1.13
+++ etk_notebook_test.c 25 Mar 2007 18:22:00 -0000 1.14
@@ -1,17 +1,23 @@
#include "etk_test.h"
#include "config.h"
-static Etk_Widget *_etk_test_notebook_page1_widget_create();
-static Etk_Widget *_etk_test_notebook_page2_widget_create();
-static void _etk_test_notebook_hide_tabs_toggled_cb(Etk_Object *object, void
*data);
+static void _hide_tabs_toggled_cb(Etk_Object *object, void *data);
+static Etk_Widget *_page1_widget_create(void);
+static Etk_Widget *_page2_widget_create(void);
+
+/**************************
+ *
+ * Creation of the test-app window
+ *
+ **************************/
+
/* Creates the window for the notebook test */
void etk_test_notebook_window_create(void *data)
{
static Etk_Widget *win = NULL;
Etk_Widget *notebook;
Etk_Widget *page_widget;
- Etk_Widget *alignment;
Etk_Widget *hbox;
Etk_Widget *vbox;
Etk_Widget *button;
@@ -21,10 +27,11 @@
etk_widget_show_all(ETK_WIDGET(win));
return;
}
+
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), "Etk Notebook 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);
+ etk_signal_connect("delete-event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
vbox = etk_vbox_new(ETK_FALSE, 0);
etk_container_add(ETK_CONTAINER(win), vbox);
@@ -33,19 +40,18 @@
notebook = etk_notebook_new();
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();
- etk_notebook_page_append(ETK_NOTEBOOK(notebook), "Tab 1 - Table test",
page_widget);
- page_widget = _etk_test_notebook_page2_widget_create();
- etk_notebook_page_append(ETK_NOTEBOOK(notebook), "Tab 2 - Button test",
page_widget);
+ /* Add the pages */
+ page_widget = _page1_widget_create();
+ etk_notebook_page_append(ETK_NOTEBOOK(notebook), "Table test", page_widget);
+ page_widget = _page2_widget_create();
+ etk_notebook_page_append(ETK_NOTEBOOK(notebook), "Button test",
page_widget);
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_append(ETK_BOX(vbox), alignment, ETK_BOX_START, ETK_BOX_NONE, 0);
+
+ /* Create the prev/next buttons and the "Hide tabs" toggle button*/
hbox = etk_hbox_new(ETK_TRUE, 0);
- etk_container_add(ETK_CONTAINER(alignment), hbox);
+ etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START, ETK_BOX_SHRINK_OPPOSITE,
0);
button = etk_button_new_from_stock(ETK_STOCK_GO_PREVIOUS);
etk_button_label_set(ETK_BUTTON(button), "Previous");
@@ -57,16 +63,37 @@
etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
ETK_CALLBACK(etk_notebook_page_next), notebook);
etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_FILL, 0);
- /* 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_signal_connect("toggled", ETK_OBJECT(button),
ETK_CALLBACK(_hide_tabs_toggled_cb), notebook);
etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_FILL, 0);
+
etk_widget_show_all(win);
}
-/* Creates the widget for the first page */
-static Etk_Widget *_etk_test_notebook_page1_widget_create()
+/**************************
+ *
+ * Callbacks
+ *
+ **************************/
+
+/* Shows/hides the tab bar when the "hide tabs" button is toggled */
+static void _hide_tabs_toggled_cb(Etk_Object *object, void *data)
+{
+ Etk_Bool state;
+
+ state = etk_toggle_button_active_get(ETK_TOGGLE_BUTTON(object));
+ etk_notebook_tabs_visible_set(ETK_NOTEBOOK(data), !state);
+}
+
+/**************************
+ *
+ * Private functions
+ *
+ **************************/
+
+/* Creates the widgets for the first page */
+static Etk_Widget *_page1_widget_create(void)
{
Etk_Widget *table;
Etk_Widget *image;
@@ -94,27 +121,27 @@
entries[i] = etk_entry_new();
- table = etk_table_new(2, 10, ETK_FALSE);
- etk_table_attach(ETK_TABLE(table), image, 0, 0, 0, 0, 0, 0, ETK_TABLE_NONE);
- etk_table_attach(ETK_TABLE(table), buttons[0], 1, 1, 0, 0, 0, 0,
ETK_TABLE_HEXPAND);
+ table = etk_table_new(2, 10, ETK_TABLE_NOT_HOMOGENEOUS);
+ etk_table_attach(ETK_TABLE(table), image, 0, 0, 0, 0, ETK_TABLE_NONE, 0, 0);
+ etk_table_attach(ETK_TABLE(table), buttons[0], 1, 1, 0, 0,
ETK_TABLE_HEXPAND, 0, 0);
for (i = 0; i < 6; i++)
{
- etk_table_attach(ETK_TABLE(table), labels[i], 0, 0, 2 + i, 2 + i, 0, 0,
ETK_TABLE_HFILL);
+ etk_table_attach(ETK_TABLE(table), labels[i], 0, 0, 2 + i, 2 + i,
ETK_TABLE_HFILL, 0, 0);
etk_table_attach_default(ETK_TABLE(table), entries[i], 1, 1, 2 + i, 2 +
i);
}
- etk_table_attach(ETK_TABLE(table), labels[6], 0, 0, 8, 8, 0, 0,
ETK_TABLE_HFILL);
+ etk_table_attach(ETK_TABLE(table), labels[6], 0, 0, 8, 8, ETK_TABLE_HFILL,
0, 0);
etk_table_attach_default(ETK_TABLE(table), buttons[1], 1, 1, 8, 8);
- etk_table_attach(ETK_TABLE(table), labels[7], 0, 0, 9, 9, 0, 0,
ETK_TABLE_HFILL);
+ etk_table_attach(ETK_TABLE(table), labels[7], 0, 0, 9, 9, ETK_TABLE_HFILL,
0, 0);
etk_table_attach_default(ETK_TABLE(table), buttons[2], 1, 1, 9, 9);
return table;
}
-/* Creates the widget for the second page */
-static Etk_Widget *_etk_test_notebook_page2_widget_create()
+/* Creates the widgets for the second page */
+static Etk_Widget *_page2_widget_create(void)
{
Etk_Widget *alignment;
Etk_Widget *vbox;
@@ -147,13 +174,4 @@
etk_box_append(ETK_BOX(vbox), button_radio, ETK_BOX_START, ETK_BOX_NONE, 0);
return alignment;
-}
-
-/* Shows/hides the tab bar when the "hide tabs" button is toggled */
-static void _etk_test_notebook_hide_tabs_toggled_cb(Etk_Object *object, void
*data)
-{
- Etk_Bool state;
-
- state = etk_toggle_button_active_get(ETK_TOGGLE_BUTTON(object));
- etk_notebook_tabs_visible_set(ETK_NOTEBOOK(data), !state);
}
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_shadow_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_shadow_test.c 22 Mar 2007 19:36:50 -0000 1.4
+++ etk_shadow_test.c 25 Mar 2007 18:22:00 -0000 1.5
@@ -1,15 +1,23 @@
#include "etk_test.h"
+#include <limits.h>
#include "config.h"
#define NUM_COLS 3
#define NUM_PICTURES 6
-static void _etk_test_shadow_offset_x_changed_cb(Etk_Object *object, double
value, void *data);
-static void _etk_test_shadow_offset_y_changed_cb(Etk_Object *object, double
value, void *data);
-static void _etk_test_shadow_radius_changed_cb(Etk_Object *object, double
value, void *data);
-static void _etk_test_shadow_border_toggled_cb(Etk_Object *object, void *data);
+static void _shadow_offset_x_changed_cb(Etk_Object *object, double value, void
*data);
+static void _shadow_offset_y_changed_cb(Etk_Object *object, double value, void
*data);
+static void _shadow_radius_changed_cb(Etk_Object *object, double value, void
*data);
+static void _show_border_toggled_cb(Etk_Object *object, void *data);
+
+static Etk_Widget *_picture_shadows[NUM_PICTURES];
-static Etk_Widget *_etk_test_picture_shadows[NUM_PICTURES];
+
+/**************************
+ *
+ * Creation of the test-app window
+ *
+ **************************/
/* Creates the window for the shadow test */
void etk_test_shadow_window_create(void *data)
@@ -26,7 +34,7 @@
Etk_Widget *table;
Etk_Widget *image;
Etk_Widget *check;
- char image_path[4096];
+ char image_path[PATH_MAX];
int i;
if (win)
@@ -58,23 +66,23 @@
etk_box_append(ETK_BOX(vbox), alignment, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
/* Create the table containing the pictures */
- table = etk_table_new(NUM_COLS, (NUM_PICTURES + NUM_COLS - 1) / NUM_COLS,
ETK_TRUE);
+ table = etk_table_new(NUM_COLS, (NUM_PICTURES + NUM_COLS - 1) / NUM_COLS,
ETK_TABLE_HOMOGENEOUS);
etk_container_add(ETK_CONTAINER(alignment), table);
for (i = 0; i < NUM_PICTURES; i++)
{
- _etk_test_picture_shadows[i] = etk_shadow_new();
/* Here, we use a shadow container to make the image have a border and
cast a shadow */
- etk_shadow_border_set(ETK_SHADOW(_etk_test_picture_shadows[i]), 1);
- etk_shadow_shadow_set(ETK_SHADOW(_etk_test_picture_shadows[i]),
- ETK_SHADOW_OUTSIDE, ETK_SHADOW_ALL, 15, 3, 3, 200);
- etk_table_attach(ETK_TABLE(table), _etk_test_picture_shadows[i],
- i % NUM_COLS, i % NUM_COLS, i / NUM_COLS, i / NUM_COLS,
- 0, 0, ETK_TABLE_NONE);
+ _picture_shadows[i] = etk_shadow_new();
+ etk_shadow_border_set(ETK_SHADOW(_picture_shadows[i]), 1);
+ etk_shadow_shadow_set(ETK_SHADOW(_picture_shadows[i]),
+ ETK_SHADOW_OUTSIDE, ETK_SHADOW_ALL, 15, 3, 3, 200);
+ etk_table_attach(ETK_TABLE(table), _picture_shadows[i],
+ i % NUM_COLS, i % NUM_COLS, i / NUM_COLS, i / NUM_COLS,
+ ETK_TABLE_NONE, 0, 0);
- sprintf(image_path, PACKAGE_DATA_DIR "/images/picture%d.png", i + 1);
+ snprintf(image_path, PATH_MAX, PACKAGE_DATA_DIR "/images/picture%d.png",
i + 1);
image = etk_image_new_from_file(image_path, NULL);
- etk_container_add(ETK_CONTAINER(_etk_test_picture_shadows[i]), image);
+ etk_container_add(ETK_CONTAINER(_picture_shadows[i]), image);
}
@@ -82,10 +90,9 @@
* The "Settings" pane
**********************/
- /* We use a shadow container to make the paned separator cast a shadow on
the lower part */
+ /* We use a shadow container to make the paned's separator cast a shadow on
the lower part */
shadow = etk_shadow_new();
etk_shadow_shadow_set(ETK_SHADOW(shadow), ETK_SHADOW_INSIDE,
ETK_SHADOW_TOP, 15, 0, 3, 200);
- //etk_shadow_border_set(ETK_SHADOW(shadow), 1);
etk_container_border_width_set(ETK_CONTAINER(shadow), 5);
etk_paned_child2_set(ETK_PANED(vpaned), shadow, ETK_FALSE);
@@ -93,7 +100,6 @@
vbox = etk_vbox_new(ETK_FALSE, 0);
etk_container_add(ETK_CONTAINER(shadow), vbox);
- /* TODO: FIXME: why "Settings:" is not displayed? */
label = etk_label_new("<title>Shadow Settings:</title>");
etk_box_append(ETK_BOX(vbox), label, ETK_BOX_START, ETK_BOX_FILL, 0);
hbox = etk_hbox_new(ETK_FALSE, 0);
@@ -101,20 +107,22 @@
frame = etk_frame_new("Offsets");
etk_box_append(ETK_BOX(hbox), frame, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
- table = etk_table_new(2, 2, ETK_FALSE);
+ table = etk_table_new(2, 2, ETK_TABLE_VHOMOGENEOUS);
etk_container_add(ETK_CONTAINER(frame), table);
label = etk_label_new("X");
- etk_table_attach(ETK_TABLE(table), label, 0, 0, 0, 0, 0, 0,
ETK_TABLE_HFILL);
+ etk_table_attach(ETK_TABLE(table), label, 0, 0, 0, 0, ETK_TABLE_HFILL, 0,
0);
slider = etk_hslider_new(-15.0, 15.0, 3.0, 1.0, 5.0);
- etk_table_attach(ETK_TABLE(table), slider, 1, 1, 0, 0, 0, 0,
ETK_TABLE_HFILL | ETK_TABLE_HEXPAND);
- etk_signal_connect("value-changed", ETK_OBJECT(slider),
_etk_test_shadow_offset_x_changed_cb, NULL);
+ etk_slider_label_set(ETK_SLIDER(slider), "%.0f");
+ etk_table_attach(ETK_TABLE(table), slider, 1, 1, 0, 0, ETK_TABLE_HFILL |
ETK_TABLE_HEXPAND, 0, 0);
+ etk_signal_connect("value-changed", ETK_OBJECT(slider),
_shadow_offset_x_changed_cb, NULL);
label = etk_label_new("Y");
- etk_table_attach(ETK_TABLE(table), label, 0, 0, 1, 1, 0, 0,
ETK_TABLE_HFILL);
+ etk_table_attach(ETK_TABLE(table), label, 0, 0, 1, 1, ETK_TABLE_HFILL, 0,
0);
slider = etk_hslider_new(-15.0, 15.0, 3.0, 1.0, 5.0);
- etk_table_attach(ETK_TABLE(table), slider, 1, 1, 1, 1, 0, 0,
ETK_TABLE_HFILL | ETK_TABLE_HEXPAND);
- etk_signal_connect("value-changed", ETK_OBJECT(slider),
_etk_test_shadow_offset_y_changed_cb, NULL);
+ etk_slider_label_set(ETK_SLIDER(slider), "%.0f");
+ etk_table_attach(ETK_TABLE(table), slider, 1, 1, 1, 1, ETK_TABLE_HFILL |
ETK_TABLE_HEXPAND, 0, 0);
+ etk_signal_connect("value-changed", ETK_OBJECT(slider),
_shadow_offset_y_changed_cb, NULL);
etk_box_append(ETK_BOX(hbox), etk_vseparator_new(), ETK_BOX_START,
ETK_BOX_NONE, 3);
@@ -124,20 +132,27 @@
frame = etk_frame_new("Radius");
etk_box_append(ETK_BOX(vbox), frame, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
slider = etk_hslider_new(0.0, 100.0, 15.0, 1.0, 10.0);
+ etk_slider_label_set(ETK_SLIDER(slider), "%.0f");
etk_container_add(ETK_CONTAINER(frame), slider);
- etk_signal_connect("value-changed", ETK_OBJECT(slider),
_etk_test_shadow_radius_changed_cb, NULL);
+ etk_signal_connect("value-changed", ETK_OBJECT(slider),
_shadow_radius_changed_cb, NULL);
check = etk_check_button_new_with_label("Show the border");
etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(check), ETK_TRUE);
etk_box_append(ETK_BOX(vbox), check, ETK_BOX_START, ETK_BOX_NONE, 0);
- etk_signal_connect("toggled", ETK_OBJECT(check),
_etk_test_shadow_border_toggled_cb, NULL);
+ etk_signal_connect("toggled", ETK_OBJECT(check), _show_border_toggled_cb,
NULL);
etk_widget_show_all(win);
}
-/* Called when the x offset is changed */
-static void _etk_test_shadow_offset_x_changed_cb(Etk_Object *object, double
value, void *data)
+/**************************
+ *
+ * Callbacks
+ *
+ **************************/
+
+/* Called when the x-offset is changed */
+static void _shadow_offset_x_changed_cb(Etk_Object *object, double value, void
*data)
{
Etk_Shadow *shadow;
int radius;
@@ -147,13 +162,13 @@
for (i = 0; i < NUM_PICTURES; i++)
{
- shadow = ETK_SHADOW(_etk_test_picture_shadows[i]);
+ shadow = ETK_SHADOW(_picture_shadows[i]);
etk_shadow_shadow_get(shadow, NULL, NULL, &radius, NULL, &offset_y,
&opacity);
etk_shadow_shadow_set(shadow, ETK_SHADOW_OUTSIDE, ETK_SHADOW_ALL,
radius, value, offset_y, opacity);
}
}
-/* Called when the y offset is changed */
-static void _etk_test_shadow_offset_y_changed_cb(Etk_Object *object, double
value, void *data)
+/* Called when the y-offset is changed */
+static void _shadow_offset_y_changed_cb(Etk_Object *object, double value, void
*data)
{
Etk_Shadow *shadow;
int radius;
@@ -163,14 +178,14 @@
for (i = 0; i < NUM_PICTURES; i++)
{
- shadow = ETK_SHADOW(_etk_test_picture_shadows[i]);
+ shadow = ETK_SHADOW(_picture_shadows[i]);
etk_shadow_shadow_get(shadow, NULL, NULL, &radius, &offset_x, NULL,
&opacity);
etk_shadow_shadow_set(shadow, ETK_SHADOW_OUTSIDE, ETK_SHADOW_ALL,
radius, offset_x, value, opacity);
}
}
/* Called when the radius value is changed */
-static void _etk_test_shadow_radius_changed_cb(Etk_Object *object, double
value, void *data)
+static void _shadow_radius_changed_cb(Etk_Object *object, double value, void
*data)
{
Etk_Shadow *shadow;
int offset_x;
@@ -180,14 +195,14 @@
for (i = 0; i < NUM_PICTURES; i++)
{
- shadow = ETK_SHADOW(_etk_test_picture_shadows[i]);
+ shadow = ETK_SHADOW(_picture_shadows[i]);
etk_shadow_shadow_get(shadow, NULL, NULL, NULL, &offset_x, &offset_y,
&opacity);
etk_shadow_shadow_set(shadow, ETK_SHADOW_OUTSIDE, ETK_SHADOW_ALL, value,
offset_x, offset_y, opacity);
}
}
-/* Called when tge "Show the border" check button is toggled */
-static void _etk_test_shadow_border_toggled_cb(Etk_Object *object, void *data)
+/* Called when the "Show the border" check button is toggled */
+static void _show_border_toggled_cb(Etk_Object *object, void *data)
{
Etk_Toggle_Button *check;
Etk_Bool has_border;
@@ -198,5 +213,5 @@
has_border = etk_toggle_button_active_get(check);
for (i = 0; i < NUM_PICTURES; i++)
- etk_shadow_border_set(ETK_SHADOW(_etk_test_picture_shadows[i]),
has_border ? 1 : 0);
+ etk_shadow_border_set(ETK_SHADOW(_picture_shadows[i]), has_border ? 1 :
0);
}
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_slider_test.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- etk_slider_test.c 22 Mar 2007 19:36:50 -0000 1.15
+++ etk_slider_test.c 25 Mar 2007 18:22:00 -0000 1.16
@@ -44,9 +44,9 @@
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, 3, ETK_FALSE);
+ table = etk_table_new(2, 3, ETK_TABLE_HHOMOGENEOUS);
etk_container_add(ETK_CONTAINER(win), table);
- table2 = etk_table_new(2, 2, ETK_FALSE);
+ table2 = etk_table_new(2, 2, ETK_TABLE_NOT_HOMOGENEOUS);
etk_table_attach_default(ETK_TABLE(table), table2, 0, 1, 0, 0);
/* Create the main label */
@@ -58,22 +58,22 @@
/* Create the horizontal slider */
_hslider = etk_hslider_new(0.0, 255.0, 128.0, 1.0, 10.0);
etk_slider_label_set(ETK_SLIDER(_hslider), "%.0f");
- etk_table_attach(ETK_TABLE(table2), _hslider, 0, 0, 1, 1, 0, 0,
ETK_TABLE_HEXPAND | ETK_TABLE_HFILL);
+ etk_table_attach(ETK_TABLE(table2), _hslider, 0, 0, 1, 1, ETK_TABLE_HEXPAND
| ETK_TABLE_HFILL, 0, 0);
etk_signal_connect("value-changed", ETK_OBJECT(_hslider),
ETK_CALLBACK(_slider_value_changed_cb), NULL);
/* Create the vertical slider */
_vslider = etk_vslider_new(0.0, 255.0, 128.0, 1.0, 10.0);
etk_slider_label_set(ETK_SLIDER(_vslider), "%.0f");
- etk_table_attach(ETK_TABLE(table2), _vslider, 1, 1, 0, 0, 0, 0,
ETK_TABLE_VEXPAND | ETK_TABLE_VFILL);
+ etk_table_attach(ETK_TABLE(table2), _vslider, 1, 1, 0, 0, ETK_TABLE_VEXPAND
| ETK_TABLE_VFILL, 0, 0);
etk_signal_connect("value-changed", ETK_OBJECT(_vslider),
ETK_CALLBACK(_slider_value_changed_cb), NULL);
separator = etk_hseparator_new();
- etk_table_attach(ETK_TABLE(table), separator, 0, 1, 1, 1, 0, 0,
ETK_TABLE_HFILL);
+ etk_table_attach(ETK_TABLE(table), separator, 0, 1, 1, 1, ETK_TABLE_HFILL,
0, 0);
/* Create the settings frame for the horizontal slider */
frame = etk_frame_new("HSlider Properties");
- etk_table_attach(ETK_TABLE(table), frame, 0, 0, 2, 2, 0, 0,
ETK_TABLE_HEXPAND | ETK_TABLE_FILL);
+ etk_table_attach(ETK_TABLE(table), frame, 0, 0, 2, 2, ETK_TABLE_HEXPAND |
ETK_TABLE_FILL, 0, 0);
vbox = etk_vbox_new(ETK_TRUE, 0);
etk_container_add(ETK_CONTAINER(frame), vbox);
@@ -106,7 +106,7 @@
/* Create the settings frame for the vertical slider */
frame = etk_frame_new("VSlider Properties");
- etk_table_attach(ETK_TABLE(table), frame, 1, 1, 2, 2, 0, 0,
ETK_TABLE_HEXPAND | ETK_TABLE_FILL);
+ etk_table_attach(ETK_TABLE(table), frame, 1, 1, 2, 2, ETK_TABLE_HEXPAND |
ETK_TABLE_FILL, 0, 0);
vbox = etk_vbox_new(ETK_TRUE, 0);
etk_container_add(ETK_CONTAINER(frame), vbox);
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_table_test.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- etk_table_test.c 22 Mar 2007 19:36:50 -0000 1.13
+++ etk_table_test.c 25 Mar 2007 18:22:00 -0000 1.14
@@ -1,6 +1,12 @@
#include "etk_test.h"
#include "config.h"
+/**************************
+ *
+ * Creation of the test-app window
+ *
+ **************************/
+
/* Creates the window for the table test */
void etk_test_table_window_create(void *data)
{
@@ -24,7 +30,7 @@
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);
-
+ /* First we create the widgets to pack into the table */
image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png", NULL);
buttons[0] = etk_button_new_from_stock(ETK_STOCK_DOCUMENT_OPEN);
@@ -46,19 +52,20 @@
entries[i] = etk_entry_new();
- table = etk_table_new(2, 10, ETK_FALSE);
- etk_table_attach(ETK_TABLE(table), image, 0, 0, 0, 0, 0, 0, ETK_TABLE_NONE);
- etk_table_attach(ETK_TABLE(table), buttons[0], 1, 1, 0, 0, 0, 0,
ETK_TABLE_HEXPAND);
+ /* And then, we create the table and we pack the widgets into it */
+ table = etk_table_new(2, 10, ETK_TABLE_NOT_HOMOGENEOUS);
+ etk_table_attach(ETK_TABLE(table), image, 0, 0, 0, 0, ETK_TABLE_NONE, 0, 0);
+ etk_table_attach(ETK_TABLE(table), buttons[0], 1, 1, 0, 0,
ETK_TABLE_HEXPAND, 0, 0);
for (i = 0; i < 6; i++)
{
- etk_table_attach(ETK_TABLE(table), labels[i], 0, 0, 2 + i, 2 + i, 0, 0,
ETK_TABLE_HFILL);
+ etk_table_attach(ETK_TABLE(table), labels[i], 0, 0, 2 + i, 2 + i,
ETK_TABLE_HFILL, 0, 0);
etk_table_attach_default(ETK_TABLE(table), entries[i], 1, 1, 2 + i, 2 +
i);
}
- etk_table_attach(ETK_TABLE(table), labels[6], 0, 0, 8, 8, 0, 0,
ETK_TABLE_HFILL);
+ etk_table_attach(ETK_TABLE(table), labels[6], 0, 0, 8, 8, ETK_TABLE_HFILL,
0, 0);
etk_table_attach_default(ETK_TABLE(table), buttons[1], 1, 1, 8, 8);
- etk_table_attach(ETK_TABLE(table), labels[7], 0, 0, 9, 9, 0, 0,
ETK_TABLE_HFILL);
+ etk_table_attach(ETK_TABLE(table), labels[7], 0, 0, 9, 9, ETK_TABLE_HFILL,
0, 0);
etk_table_attach_default(ETK_TABLE(table), buttons[2], 1, 1, 9, 9);
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_test.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- etk_test.c 22 Mar 2007 19:36:51 -0000 1.34
+++ etk_test.c 25 Mar 2007 18:22:00 -0000 1.35
@@ -1,134 +1,143 @@
#include "etk_test.h"
-#define ETK_TEST_NUM_COLS 2
+#define NUM_COLS 2
typedef enum Etk_Test_Categories
{
- ETK_TEST_BASIC_WIDGET,
- ETK_TEST_ADVANCED_WIDGET,
- ETK_TEST_CONTAINER,
- ETK_TEST_DIALOG,
- ETK_TEST_MISC,
- ETK_TEST_NUM_CATEGORIES
+ BASIC_WIDGET,
+ ADVANCED_WIDGET,
+ CONTAINER,
+ DIALOG,
+ MISC,
+ NUM_CATEGORIES
} Etk_Test_Categories;
-typedef struct _Etk_Test_Example
+typedef struct Etk_Test_App
{
char *name;
void (*func)(void *data);
Etk_Test_Categories category;
-} Etk_Test_Example;
+} Etk_Test_App;
-static void _etk_test_main_window();
-static void _etk_test_main_quit_cb(void *data);
+static void _main_quit_cb(void *data);
+static void _main_window_create(void);
-static char *_etk_test_categories[ETK_TEST_NUM_CATEGORIES] =
+/* The different categories of test-apps */
+static char *_categories[NUM_CATEGORIES] =
{ "Basic Widgets", "Advanced Widgets", "Containers", "Dialogs", "Misc" };
-static Etk_Test_Example _etk_test_examples[] =
+/* The different test-apps */
+static Etk_Test_App _test_apps[] =
{
{
"Button",
etk_test_button_window_create,
- ETK_TEST_BASIC_WIDGET
+ BASIC_WIDGET
},
{
"Entry",
etk_test_entry_window_create,
- ETK_TEST_BASIC_WIDGET
+ BASIC_WIDGET
},
{
"Table",
etk_test_table_window_create,
- ETK_TEST_CONTAINER
+ CONTAINER
},
{
"Image",
etk_test_image_window_create,
- ETK_TEST_BASIC_WIDGET
+ BASIC_WIDGET
},
{
"Slider",
etk_test_slider_window_create,
- ETK_TEST_BASIC_WIDGET
+ BASIC_WIDGET
},
{
"Canvas",
etk_test_canvas_window_create,
- ETK_TEST_ADVANCED_WIDGET
+ ADVANCED_WIDGET
},
{
"Colorpicker",
etk_test_colorpicker_window_create,
- ETK_TEST_DIALOG
+ DIALOG
},
{
"Tree",
etk_test_tree_window_create,
- ETK_TEST_ADVANCED_WIDGET
+ ADVANCED_WIDGET
},
{
"Paned",
etk_test_paned_window_create,
- ETK_TEST_CONTAINER
+ CONTAINER
},
{
"Scrolled View",
etk_test_scrolled_view_window_create,
- ETK_TEST_CONTAINER
+ CONTAINER
},
{
"Menu",
etk_test_menu_window_create,
- ETK_TEST_ADVANCED_WIDGET
+ ADVANCED_WIDGET
},
{
"File Chooser",
etk_test_filechooser_window_create,
- ETK_TEST_DIALOG
+ DIALOG
},
{
"Notebook",
etk_test_notebook_window_create,
- ETK_TEST_CONTAINER
+ CONTAINER
},
{
"Progress Bar",
etk_test_progress_bar_window_create,
- ETK_TEST_BASIC_WIDGET
+ BASIC_WIDGET
},
{
"Drag and Drop",
etk_test_dnd_window_create,
- ETK_TEST_MISC
+ MISC
},
{
"Combobox",
etk_test_combobox_window_create,
- ETK_TEST_ADVANCED_WIDGET
+ ADVANCED_WIDGET
},
{
"Iconbox",
etk_test_iconbox_window_create,
- ETK_TEST_ADVANCED_WIDGET
+ ADVANCED_WIDGET
},
{
"Text View",
etk_test_text_view_window_create,
- ETK_TEST_ADVANCED_WIDGET
+ ADVANCED_WIDGET
},
{
"Embed Widget",
etk_test_embed_window_create,
- ETK_TEST_CONTAINER
+ CONTAINER
},
{
"Shadow",
etk_test_shadow_window_create,
- ETK_TEST_MISC
+ MISC
}
};
-static int _etk_test_num_examples = sizeof(_etk_test_examples) / sizeof
(_etk_test_examples[0]);
+static int _num_test_apps = sizeof(_test_apps) / sizeof (_test_apps[0]);
+
+
+/**************************
+ *
+ * Main
+ *
+ **************************/
int main(int argc, char *argv[])
{
@@ -137,62 +146,75 @@
fprintf(stderr, "Could not init Etk. Exiting...\n");
return 1;
};
- _etk_test_main_window();
+ _main_window_create();
etk_main();
etk_shutdown();
return 0;
}
+/**************************
+ *
+ * Creation of the main window
+ *
+ **************************/
+
/* Creates the main window */
-static void _etk_test_main_window()
+static void _main_window_create(void)
{
Etk_Widget *win;
Etk_Widget *vbox;
- Etk_Widget *tables[ETK_TEST_NUM_CATEGORIES];
+ Etk_Widget *tables[NUM_CATEGORIES];
Etk_Widget *button;
Etk_Widget *frame;
- int current_ids[ETK_TEST_NUM_CATEGORIES];
+ int current_ids[NUM_CATEGORIES];
int i, j, num_examples;
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), "Etk Test Application");
etk_container_border_width_set(ETK_CONTAINER(win), 5);
- etk_signal_connect_swapped("destroyed", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_main_quit_cb), NULL);
+ etk_signal_connect_swapped("destroyed", ETK_OBJECT(win),
ETK_CALLBACK(_main_quit_cb), NULL);
vbox = etk_vbox_new(ETK_FALSE, 0);
etk_container_add(ETK_CONTAINER(win), vbox);
- for (i = 0; i < ETK_TEST_NUM_CATEGORIES; i++)
+ /* Create a frame and a table for each category */
+ for (i = 0; i < NUM_CATEGORIES; i++)
{
current_ids[i] = 0;
- for (num_examples = 0, j = 0; j < _etk_test_num_examples; j++)
+ for (num_examples = 0, j = 0; j < _num_test_apps; j++)
{
- if (_etk_test_examples[j].category == i)
+ if (_test_apps[j].category == i)
num_examples++;
}
- frame = etk_frame_new(_etk_test_categories[i]);
+ frame = etk_frame_new(_categories[i]);
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);
+ tables[i] = etk_table_new(NUM_COLS, (num_examples + NUM_COLS - 1) /
NUM_COLS, ETK_TABLE_HOMOGENEOUS);
etk_container_add(ETK_CONTAINER(frame), tables[i]);
}
- for (i = 0; i < _etk_test_num_examples; i++)
+ /* For each test-apps, we add a button in the corresponding table */
+ for (i = 0; i < _num_test_apps; i++)
{
- button = etk_button_new_with_label(_etk_test_examples[i].name);
- etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_examples[i].func), NULL);
- j = current_ids[_etk_test_examples[i].category];
-
etk_table_attach_default(ETK_TABLE(tables[_etk_test_examples[i].category]),
button,
- j % ETK_TEST_NUM_COLS, j % ETK_TEST_NUM_COLS, j / ETK_TEST_NUM_COLS,
j / ETK_TEST_NUM_COLS);
- current_ids[_etk_test_examples[i].category]++;
+ button = etk_button_new_with_label(_test_apps[i].name);
+ etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_test_apps[i].func), NULL);
+ j = current_ids[_test_apps[i].category]++;
+ etk_table_attach_default(ETK_TABLE(tables[_test_apps[i].category]),
button,
+ j % NUM_COLS, j % NUM_COLS, j / NUM_COLS, j / NUM_COLS);
}
etk_widget_show_all(win);
}
-/* Called when the window is destroyed */
-static void _etk_test_main_quit_cb(void *data)
+/**************************
+ *
+ * Callbacks
+ *
+ **************************/
+
+/* Called when the main window is destroyed */
+static void _main_quit_cb(void *data)
{
etk_main_quit();
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
