Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
ewl_box.c ewl_button.c ewl_button_stock.c ewl_check.c
ewl_checkbutton.c ewl_colorpicker.c ewl_colorpicker.h
ewl_combo.c ewl_container.c ewl_dialog.c ewl_embed.c
ewl_filedialog.c ewl_fileselector.c ewl_floater.c ewl_grid.c
ewl_image.c ewl_imenu.c ewl_media.c ewl_menu.c ewl_menu_base.c
ewl_notebook.c ewl_radiobutton.c ewl_scrollbar.c
ewl_scrollpane.c ewl_seeker.c ewl_selectionbar.c
ewl_selectionbook.c ewl_spinner.c ewl_table.c ewl_text.c
ewl_tooltip.c ewl_tree.c ewl_widget.c ewl_widget.h
ewl_window.c
Log Message:
More API breakage. Last time it was ewl_object_* this time it's ewl_widget_*.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_box.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -3 -r1.67 -r1.68
--- ewl_box.c 12 Aug 2004 16:20:41 -0000 1.67
+++ ewl_box.c 13 Aug 2004 00:41:12 -0000 1.68
@@ -167,9 +167,9 @@
b->orientation = o;
if (o == EWL_ORIENTATION_HORIZONTAL)
- ewl_widget_set_appearance(w, "hbox");
+ ewl_widget_appearance_set(w, "hbox");
else
- ewl_widget_set_appearance(w, "vbox");
+ ewl_widget_appearance_set(w, "vbox");
ewl_widget_configure(w);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_button.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- ewl_button.c 12 Aug 2004 16:20:42 -0000 1.54
+++ ewl_button.c 13 Aug 2004 00:41:12 -0000 1.55
@@ -40,7 +40,7 @@
if (!ewl_box_init(EWL_BOX(b), EWL_ORIENTATION_HORIZONTAL))
DRETURN_INT(FALSE, DLEVEL_STABLE);
- ewl_widget_set_appearance(w, "button");
+ ewl_widget_appearance_set(w, "button");
/*
* Create and setup the label for the button if it's desired.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_button_stock.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_button_stock.c 12 Aug 2004 16:20:42 -0000 1.6
+++ ewl_button_stock.c 13 Aug 2004 00:41:12 -0000 1.7
@@ -107,9 +107,9 @@
if (test)
{
b->image_object = ewl_image_new(NULL, NULL);
- ewl_widget_set_appearance (b->image_object, stock_id);
+ ewl_widget_appearance_set(b->image_object, stock_id);
}
-/* ewl_widget_set_appearance (b->image_object, stock_id); */
+/* ewl_widget_appearance_set(b->image_object, stock_id); */
if (b->image_object)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_check.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ewl_check.c 12 Aug 2004 16:20:42 -0000 1.13
+++ ewl_check.c 13 Aug 2004 00:41:12 -0000 1.14
@@ -117,9 +117,9 @@
cb = EWL_CHECK(w);
if (cb->checked)
- ewl_widget_set_state(w, "checked");
+ ewl_widget_state_set(w, "checked");
else
- ewl_widget_set_state(w, "default");
+ ewl_widget_state_set(w, "default");
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_checkbutton.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- ewl_checkbutton.c 12 Aug 2004 16:20:42 -0000 1.40
+++ ewl_checkbutton.c 13 Aug 2004 00:41:12 -0000 1.41
@@ -41,7 +41,7 @@
w = EWL_WIDGET(cb);
ewl_button_init(b, label);
- ewl_widget_set_appearance(w, "checkbutton");
+ ewl_widget_appearance_set(w, "checkbutton");
ewl_object_fill_policy_set(EWL_OBJECT(w), EWL_FLAG_FILL_NONE);
ewl_callback_append(w, EWL_CALLBACK_CLICKED,
@@ -53,7 +53,7 @@
* Add the check box first.
*/
cb->check = ewl_check_new();
- ewl_widget_set_internal(cb->check, TRUE);
+ ewl_widget_internal_set(cb->check, TRUE);
ewl_callback_del(cb->check, EWL_CALLBACK_CLICKED, ewl_check_clicked_cb);
ewl_container_prepend_child(EWL_CONTAINER(cb), cb->check);
ewl_widget_show(cb->check);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_colorpicker.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_colorpicker.c 12 Aug 2004 16:20:42 -0000 1.4
+++ ewl_colorpicker.c 13 Aug 2004 00:41:12 -0000 1.5
@@ -1,5 +1,9 @@
#include <Ewl.h>
+/**
+ * @return Returns NULL on failure, otherwise a newly allocated color picker.
+ * @brief Allocate and initialize a new color picker widget.
+ */
Ewl_Widget *ewl_colorpicker_new()
{
Ewl_ColorPicker *cp;
@@ -15,6 +19,11 @@
DRETURN_PTR(cp, DLEVEL_STABLE);
}
+/**
+ * @param cp: the color picker to initialize
+ * @return Returns TRUE on success, FALSE on failure.
+ * @brief Initialize a color picker to starting values.
+ */
int ewl_colorpicker_init(Ewl_ColorPicker *cp)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -23,7 +32,7 @@
if (!ewl_box_init(EWL_BOX(cp), EWL_ORIENTATION_HORIZONTAL))
DRETURN_INT(FALSE, DLEVEL_STABLE);
- ewl_widget_set_appearance(EWL_WIDGET(cp), "colorpicker");
+ ewl_widget_appearance_set(EWL_WIDGET(cp), "colorpicker");
ewl_box_set_spacing(EWL_BOX(cp), 20);
/*
@@ -44,11 +53,11 @@
EWL_PICK_MODE_HSV_HUE);
ewl_spectrum_dimensions_set(EWL_SPECTRUM(cp->range), 1);
ewl_callback_append(cp->range, EWL_CALLBACK_MOUSE_DOWN,
- ewl_colorpicker_down_cb, cp);
+ ewl_colorpicker_range_down_cb, cp);
ewl_callback_append(cp->range, EWL_CALLBACK_MOUSE_UP,
- ewl_colorpicker_up_cb, cp);
+ ewl_colorpicker_range_up_cb, cp);
ewl_callback_append(cp->range, EWL_CALLBACK_MOUSE_MOVE,
- ewl_colorpicker_move_cb, cp);
+ ewl_colorpicker_range_move_cb, cp);
ewl_object_preferred_inner_size_set(EWL_OBJECT(cp->range), 20, 200);
ewl_object_fill_policy_set(EWL_OBJECT(cp->range), EWL_FLAG_FILL_VFILL);
ewl_container_append_child(EWL_CONTAINER(cp), cp->range);
@@ -57,7 +66,7 @@
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
-void ewl_colorpicker_move_cb(Ewl_Widget *w, void *ev_data, void *user_data)
+void ewl_colorpicker_range_move_cb(Ewl_Widget *w, void *ev_data, void *user_data)
{
int r, g, b, a;
Ewl_ColorPicker *cp = user_data;
@@ -75,7 +84,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void ewl_colorpicker_down_cb(Ewl_Widget *w, void *ev_data, void *user_data)
+void ewl_colorpicker_range_down_cb(Ewl_Widget *w, void *ev_data, void *user_data)
{
int r, g, b, a;
Ewl_ColorPicker *cp = user_data;
@@ -92,7 +101,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void ewl_colorpicker_up_cb(Ewl_Widget *w, void *ev_data, void *user_data)
+void ewl_colorpicker_range_up_cb(Ewl_Widget *w, void *ev_data, void *user_data)
{
Ewl_ColorPicker *cp = user_data;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_colorpicker.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_colorpicker.h 11 Aug 2004 04:29:06 -0000 1.2
+++ ewl_colorpicker.h 13 Aug 2004 00:41:12 -0000 1.3
@@ -17,8 +17,8 @@
/*
* Internal callbacks, override at your own risk.
*/
-void ewl_colorpicker_down_cb(Ewl_Widget *w, void *ev_data, void *user_data);
-void ewl_colorpicker_up_cb(Ewl_Widget *w, void *ev_data, void *user_data);
-void ewl_colorpicker_move_cb(Ewl_Widget *w, void *ev_data, void *user_data);
+void ewl_colorpicker_range_down_cb(Ewl_Widget *w, void *ev_data, void *user_data);
+void ewl_colorpicker_range_up_cb(Ewl_Widget *w, void *ev_data, void *user_data);
+void ewl_colorpicker_range_move_cb(Ewl_Widget *w, void *ev_data, void *user_data);
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_combo.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_combo.c 12 Aug 2004 16:20:42 -0000 1.4
+++ ewl_combo.c 13 Aug 2004 00:41:12 -0000 1.5
@@ -40,7 +40,7 @@
*/
ewl_menu_base_init(EWL_MENU_BASE(combo), NULL, title);
- ewl_widget_set_appearance( EWL_WIDGET(combo), "combo" );
+ ewl_widget_appearance_set( EWL_WIDGET(combo), "combo" );
if( EWL_MENU_ITEM(combo)->icon )
ewl_widget_destroy(EWL_MENU_ITEM(combo)->icon);
@@ -54,7 +54,7 @@
ewl_container_set_redirect( EWL_CONTAINER(combo), NULL );
combo->button = ewl_button_new(NULL);
- ewl_widget_set_appearance(combo->button, "button_decrement");
+ ewl_widget_appearance_set(combo->button, "button_decrement");
ewl_object_alignment_set(EWL_OBJECT(combo->button), EWL_FLAG_ALIGN_RIGHT);
ewl_container_append_child(EWL_CONTAINER(combo), combo->button);
ewl_widget_show(combo->button);
@@ -93,9 +93,9 @@
* Create the popup combo portion of the widget.
*/
combo->base.popup = ewl_floater_new(EWL_WIDGET(combo));
- ewl_widget_set_internal(combo->base.popup, TRUE);
- ewl_widget_set_layer(combo->base.popup, 1000);
- ewl_widget_set_appearance(EWL_WIDGET(combo->base.popup), "imenu");
+ ewl_widget_internal_set(combo->base.popup, TRUE);
+ ewl_widget_layer_set(combo->base.popup, 1000);
+ ewl_widget_appearance_set(EWL_WIDGET(combo->base.popup), "imenu");
ewl_box_set_orientation(EWL_BOX(combo->base.popup),
EWL_ORIENTATION_VERTICAL);
ewl_object_fill_policy_set(EWL_OBJECT(combo->base.popup),
@@ -159,7 +159,7 @@
ewl_combo_set_selected(combo, item);
ewl_widget_hide(menu->popup);
- ewl_widget_set_appearance(combo->button, "button_decrement");
+ ewl_widget_appearance_set(combo->button, "button_decrement");
ewl_callback_del(EWL_MENU_BASE(combo)->popbox, EWL_CALLBACK_FOCUS_OUT,
ewl_combo_collapse_cb);
ewl_callback_del(combo->button, EWL_CALLBACK_MOUSE_DOWN,
@@ -219,7 +219,7 @@
combo = EWL_COMBO(user_data);
- ewl_widget_set_appearance(combo->button, "button_increment");
+ ewl_widget_appearance_set(combo->button, "button_increment");
ewl_menu_base_expand_cb(EWL_WIDGET(combo), ev_data, NULL);
@@ -266,7 +266,7 @@
ewl_widget_hide(menu->popup);
- ewl_widget_set_appearance(combo->button, "button_decrement");
+ ewl_widget_appearance_set(combo->button, "button_decrement");
ewl_callback_del(EWL_MENU_BASE(combo)->popbox, EWL_CALLBACK_FOCUS_OUT,
ewl_combo_collapse_cb);
ewl_callback_del(combo->button, EWL_CALLBACK_MOUSE_DOWN,
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_container.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- ewl_container.c 12 Aug 2004 16:20:42 -0000 1.72
+++ ewl_container.c 13 Aug 2004 00:41:12 -0000 1.73
@@ -25,7 +25,7 @@
if (!ewl_widget_init(w, "container"))
DRETURN_INT(0, DLEVEL_STABLE);
- ewl_widget_set_appearance(w, appearance);
+ ewl_widget_appearance_set(w, appearance);
ewl_object_recursive_set(EWL_OBJECT(w), TRUE);
/*
@@ -175,7 +175,7 @@
evas_object_show(pc->clip_box);
ecore_list_append(pc->children, child);
- ewl_widget_set_parent(child, EWL_WIDGET(pc));
+ ewl_widget_parent_set(child, EWL_WIDGET(pc));
ewl_container_call_child_add(pc, child);
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -208,7 +208,7 @@
evas_object_show(pc->clip_box);
ecore_list_prepend(pc->children, child);
- ewl_widget_set_parent(child, EWL_WIDGET(pc));
+ ewl_widget_parent_set(child, EWL_WIDGET(pc));
ewl_container_call_child_add(pc, child);
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -245,7 +245,7 @@
ecore_list_goto_index(pc->children, index);
ecore_list_insert(pc->children, child);
- ewl_widget_set_parent(child, EWL_WIDGET(pc));
+ ewl_widget_parent_set(child, EWL_WIDGET(pc));
ewl_container_call_child_add(pc, child);
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -279,7 +279,7 @@
* First remove reference to the parent if necessary.
*/
if (EWL_CONTAINER(child->parent) == pc)
- ewl_widget_set_parent(child, NULL);
+ ewl_widget_parent_set(child, NULL);
if (!pc->children)
DRETURN(DLEVEL_STABLE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_dialog.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_dialog.c 12 Aug 2004 16:20:42 -0000 1.4
+++ ewl_dialog.c 13 Aug 2004 00:41:13 -0000 1.5
@@ -42,7 +42,7 @@
if (!ewl_window_init(EWL_WINDOW(dialog)))
DRETURN_INT(FALSE, DLEVEL_STABLE);
- ewl_widget_set_appearance (w, "window");
+ ewl_widget_appearance_set(w, "window");
dialog->position = pos;
@@ -280,9 +280,9 @@
ewl_object_fill_policy_set (EWL_OBJECT (button),
EWL_FLAG_FILL_VFILL || EWL_FLAG_FILL_SHRINK);
- ewl_widget_set_data (button, "RESPONSE_ID", (void *)response_id);
+ ewl_widget_data_set(button, "RESPONSE_ID", (void *)response_id);
- ewl_widget_show (button);
+ ewl_widget_show(button);
DRETURN_PTR(button, DLEVEL_STABLE);
}
@@ -313,7 +313,7 @@
ewl_object_fill_policy_set (EWL_OBJECT (button),
EWL_FLAG_FILL_VFILL || EWL_FLAG_FILL_SHRINK);
- ewl_widget_set_data (button, "RESPONSE_ID", (void *)response_id);
+ ewl_widget_data_set (button, "RESPONSE_ID", (void *)response_id);
ewl_widget_show (button);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_embed.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- ewl_embed.c 12 Aug 2004 16:20:42 -0000 1.42
+++ ewl_embed.c 13 Aug 2004 00:41:13 -0000 1.43
@@ -88,7 +88,7 @@
*/
if (!ewl_overlay_init(EWL_OVERLAY(w)))
DRETURN_INT(FALSE, DLEVEL_STABLE);
- ewl_widget_set_appearance(EWL_WIDGET(w), "embed");
+ ewl_widget_appearance_set(EWL_WIDGET(w), "embed");
ewl_object_fill_policy_set(EWL_OBJECT(w), EWL_FLAG_FILL_NONE);
ewl_object_toplevel_set(EWL_OBJECT(w), EWL_FLAG_PROPERTY_TOPLEVEL);
@@ -688,7 +688,7 @@
}
if (w)
- ewl_widget_send_focus(w);
+ ewl_widget_focus_send(w);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -856,7 +856,7 @@
emb = evas_object_smart_data_get(obj);
if (emb)
- ewl_widget_set_layer(EWL_WIDGET(emb), l);
+ ewl_widget_layer_set(EWL_WIDGET(emb), l);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -872,7 +872,7 @@
emb = evas_object_smart_data_get(obj);
if (emb)
- ewl_widget_set_layer(EWL_WIDGET(emb), l);
+ ewl_widget_layer_set(EWL_WIDGET(emb), l);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -888,7 +888,7 @@
emb = evas_object_smart_data_get(obj);
if (emb) {
l = evas_object_layer_get(obj);
- ewl_widget_set_layer(EWL_WIDGET(emb), l);
+ ewl_widget_layer_set(EWL_WIDGET(emb), l);
}
DLEAVE_FUNCTION(DLEVEL_STABLE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_filedialog.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- ewl_filedialog.c 12 Aug 2004 16:20:43 -0000 1.36
+++ ewl_filedialog.c 13 Aug 2004 00:41:13 -0000 1.37
@@ -47,28 +47,28 @@
ewl_box_init(EWL_BOX(w), EWL_ORIENTATION_VERTICAL);
ewl_object_fill_policy_set(EWL_OBJECT(w), EWL_FLAG_FILL_SHRINK |
EWL_FLAG_FILL_FILL);
- ewl_widget_set_appearance (EWL_WIDGET (w), "filedialog");
+ ewl_widget_appearance_set(EWL_WIDGET (w), "filedialog");
fd->type = type;
/*
* Setup the internally used layout and display widgets.
*/
vbox = ewl_vbox_new ();
- ewl_widget_set_internal(vbox, TRUE);
+ ewl_widget_internal_set(vbox, TRUE);
ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_SHRINK |
EWL_FLAG_FILL_FILL);
ewl_container_append_child(EWL_CONTAINER(fd), vbox);
ewl_widget_show (vbox);
fd->path_label = ewl_text_new ("");
- ewl_widget_set_internal(fd->path_label, TRUE);
+ ewl_widget_internal_set(fd->path_label, TRUE);
ewl_container_append_child(EWL_CONTAINER(vbox), fd->path_label);
ewl_object_padding_set(EWL_OBJECT(fd->path_label), 2, 2, 2, 2);
ewl_widget_show (fd->path_label);
hbox = ewl_hbox_new();
ewl_box_set_homogeneous(EWL_BOX(hbox), FALSE);
- ewl_widget_set_internal(hbox, TRUE);
+ ewl_widget_internal_set(hbox, TRUE);
ewl_container_append_child(EWL_CONTAINER(vbox), hbox);
ewl_widget_show (hbox);
@@ -78,7 +78,7 @@
*/
/*
fd->decor_box = ewl_vbox_new();
- ewl_widget_set_internal(fd->decor_box, TRUE);
+ ewl_widget_internal_set(fd->decor_box, TRUE);
ewl_object_fill_policy_set(EWL_OBJECT(fd->decor_box),
EWL_FLAG_FILL_VFILL);
ewl_box_set_spacing(EWL_BOX(fd->decor_box), 4);
@@ -92,7 +92,7 @@
* Display the lists of directories and files.
*/
fd->selector = ewl_fileselector_new();
- ewl_widget_set_internal(fd->selector, TRUE);
+ ewl_widget_internal_set(fd->selector, TRUE);
ewl_container_append_child(EWL_CONTAINER(hbox), fd->selector);
ewl_callback_append (EWL_WIDGET (fd->selector),
EWL_CALLBACK_VALUE_CHANGED,
@@ -104,7 +104,7 @@
* accepting or canceling the selection.
*/
fd->button_box = ewl_hbox_new();
- ewl_widget_set_internal(fd->button_box, TRUE);
+ ewl_widget_internal_set(fd->button_box, TRUE);
ewl_object_fill_policy_set(EWL_OBJECT(fd->button_box),
EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_HSHRINK);
ewl_box_set_spacing(EWL_BOX(fd->button_box), 4);
@@ -114,7 +114,7 @@
ewl_widget_show(fd->button_box);
fd->entry = ewl_entry_new ("");
- ewl_widget_set_internal(fd->entry, TRUE);
+ ewl_widget_internal_set(fd->entry, TRUE);
ewl_container_append_child(EWL_CONTAINER(fd->button_box), fd->entry);
ewl_callback_append (fd->entry, EWL_CALLBACK_VALUE_CHANGED,
ewl_filedialog_change_path_cb, fd);
@@ -125,7 +125,7 @@
fd->ok = ewl_button_new("Open");
else
fd->ok = ewl_button_new("Save");
- ewl_widget_set_internal(fd->ok, TRUE);
+ ewl_widget_internal_set(fd->ok, TRUE);
ewl_object_fill_policy_set(EWL_OBJECT(fd->ok), EWL_FLAG_FILL_NONE);
ewl_callback_append(fd->ok, EWL_CALLBACK_CLICKED, ewl_filedialog_ok_cb,
fd);
@@ -133,7 +133,7 @@
ewl_widget_show(fd->ok);
fd->cancel = ewl_button_new("Cancel");
- ewl_widget_set_internal(fd->cancel, TRUE);
+ ewl_widget_internal_set(fd->cancel, TRUE);
ewl_object_fill_policy_set(EWL_OBJECT(fd->cancel), EWL_FLAG_FILL_NONE);
ewl_callback_append(fd->cancel, EWL_CALLBACK_CLICKED,
ewl_filedialog_cancel_cb, fd);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_fileselector.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- ewl_fileselector.c 12 Aug 2004 16:20:43 -0000 1.39
+++ ewl_fileselector.c 13 Aug 2004 00:41:13 -0000 1.40
@@ -95,7 +95,7 @@
w = EWL_WIDGET(fs);
ewl_box_init(EWL_BOX(w), EWL_ORIENTATION_HORIZONTAL);
- ewl_widget_set_appearance(w, "fileselector");
+ ewl_widget_appearance_set(w, "fileselector");
ewl_box_set_homogeneous(EWL_BOX(w), TRUE);
ewl_object_fill_policy_set(EWL_OBJECT(w), EWL_FLAG_FILL_SHRINK |
EWL_FLAG_FILL_FILL);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_floater.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ewl_floater.c 12 Aug 2004 16:20:43 -0000 1.18
+++ ewl_floater.c 13 Aug 2004 00:41:13 -0000 1.19
@@ -50,7 +50,7 @@
*/
ewl_box_init(EWL_BOX(w), EWL_ORIENTATION_VERTICAL);
ewl_object_fill_policy_set(EWL_OBJECT(w), EWL_FLAG_FILL_NORMAL);
- ewl_widget_set_appearance(w, "floater");
+ ewl_widget_appearance_set(w, "floater");
f->follows = parent;
/*
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_grid.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- ewl_grid.c 12 Aug 2004 16:20:43 -0000 1.20
+++ ewl_grid.c 13 Aug 2004 00:41:13 -0000 1.21
@@ -194,7 +194,7 @@
child->end_row = end_row;
/* store the child info in the child widget */
- ewl_widget_set_data(w, (void *) g, child);
+ ewl_widget_data_set(w, (void *) g, child);
ewl_container_append_child(EWL_CONTAINER(g), w);
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -379,7 +379,7 @@
ecore_list_goto_first(EWL_CONTAINER(w)->children);
while ((child = ecore_list_next(EWL_CONTAINER(w)->children)) != NULL) {
- c = (Ewl_Grid_Child *) ewl_widget_get_data(child, (void *) g);
+ c = (Ewl_Grid_Child *) ewl_widget_data_get(child, (void *) g);
/* calculate child widgets width */
for (i = c->start_col - 1; i < c->end_col; i++)
@@ -506,7 +506,7 @@
g = EWL_GRID(p);
- cdata = ewl_widget_get_data(c, (void *) g);
+ cdata = ewl_widget_data_get(c, (void *) g);
/*
* If no data exists, we should add some defaults.
@@ -518,7 +518,7 @@
cdata->start_col = cdata->end_col = 1;
cdata->start_row = cdata->end_row = 1;
- ewl_widget_set_data(c, g, cdata);
+ ewl_widget_data_set(c, g, cdata);
}
/*
@@ -604,7 +604,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
g = EWL_GRID(p);
- cdata = ewl_widget_get_data(child, (void *) g);
+ cdata = ewl_widget_data_get(child, (void *) g);
/*
* Setup a couple orientation specific variables.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_image.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- ewl_image.c 12 Aug 2004 16:20:43 -0000 1.48
+++ ewl_image.c 13 Aug 2004 00:41:13 -0000 1.49
@@ -278,7 +278,7 @@
evas_object_image_file_set(i->image, i->path, i->key);
}
- evas_object_layer_set(i->image, ewl_widget_get_layer_sum(w));
+ evas_object_layer_set(i->image, ewl_widget_layer_sum_get(w));
if (w->fx_clip_box)
evas_object_clip_set(i->image, w->fx_clip_box);
evas_object_image_size_get(i->image, &i->ow, &i->oh);
@@ -327,7 +327,7 @@
if (!i->image)
return;
- evas_object_layer_set(i->image, ewl_widget_get_layer_sum(w));
+ evas_object_layer_set(i->image, ewl_widget_layer_sum_get(w));
}
void ewl_image_configure_cb(Ewl_Widget * w, void *ev_data, void *user_data)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_imenu.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ewl_imenu.c 12 Aug 2004 16:20:44 -0000 1.19
+++ ewl_imenu.c 13 Aug 2004 00:41:13 -0000 1.20
@@ -50,9 +50,9 @@
* Create the popup menu portion of the widget.
*/
menu->base.popup = ewl_floater_new(EWL_WIDGET(menu));
- ewl_widget_set_internal(menu->base.popup, TRUE);
- ewl_widget_set_layer(menu->base.popup, 1000);
- ewl_widget_set_appearance(EWL_WIDGET(menu->base.popup), "imenu");
+ ewl_widget_internal_set(menu->base.popup, TRUE);
+ ewl_widget_layer_set(menu->base.popup, 1000);
+ ewl_widget_appearance_set(EWL_WIDGET(menu->base.popup), "imenu");
ewl_box_set_orientation(EWL_BOX(menu->base.popup),
EWL_ORIENTATION_VERTICAL);
ewl_object_fill_policy_set(EWL_OBJECT(menu->base.popup),
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_media.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ewl_media.c 12 Aug 2004 16:20:44 -0000 1.11
+++ ewl_media.c 13 Aug 2004 00:41:13 -0000 1.12
@@ -365,7 +365,7 @@
if (m->video) {
evas_object_move(m->video, CURRENT_X(w), CURRENT_Y(w));
evas_object_resize(m->video, CURRENT_W(w), CURRENT_H(w));
- evas_object_layer_set(m->video, ewl_widget_get_layer_sum(w));
+ evas_object_layer_set(m->video, ewl_widget_layer_sum_get(w));
evas_object_smart_callback_add(m->video, "frame_decode",
ewl_media_update_timer_cb, m);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_menu.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ewl_menu.c 12 Aug 2004 16:20:44 -0000 1.19
+++ ewl_menu.c 13 Aug 2004 00:41:13 -0000 1.20
@@ -51,9 +51,9 @@
*/
menu->base.popup = ewl_window_new();
ewl_window_set_borderless(EWL_WINDOW(menu->base.popup));
- ewl_widget_set_internal(menu->base.popup, TRUE);
- ewl_widget_set_layer(menu->base.popup, 1000);
- ewl_widget_set_appearance(EWL_WIDGET(menu->base.popup), "menu");
+ ewl_widget_internal_set(menu->base.popup, TRUE);
+ ewl_widget_layer_set(menu->base.popup, 1000);
+ ewl_widget_appearance_set(EWL_WIDGET(menu->base.popup), "menu");
ewl_box_set_orientation(EWL_BOX(menu->base.popup),
EWL_ORIENTATION_VERTICAL);
ewl_object_fill_policy_set(EWL_OBJECT(menu->base.popup),
@@ -74,7 +74,7 @@
emb = ewl_embed_find_by_widget(w);
- if (ewl_widget_is_type(EWL_WIDGET(emb), "window"))
+ if (ewl_widget_type_is(EWL_WIDGET(emb), "window"))
ewl_window_get_position(EWL_WINDOW(emb), &x, &y);
else {
x = CURRENT_X(w);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_menu_base.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- ewl_menu_base.c 12 Aug 2004 16:20:44 -0000 1.34
+++ ewl_menu_base.c 13 Aug 2004 00:41:13 -0000 1.35
@@ -48,7 +48,7 @@
*/
ewl_container_set_redirect(EWL_CONTAINER(menu),
EWL_CONTAINER(menu->popbox));
- ewl_widget_set_internal(menu->popbox, TRUE);
+ ewl_widget_internal_set(menu->popbox, TRUE);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -214,7 +214,7 @@
char *
ewl_menu_item_get_image( Ewl_Menu_Item *item )
{
- if (item->icon && ewl_widget_is_type(item->icon, "image"))
+ if (item->icon && ewl_widget_type_is(item->icon, "image"))
DRETURN_PTR(ewl_image_get_file(EWL_IMAGE(item->icon)), DLEVEL_STABLE);
DRETURN_PTR(NULL, DLEVEL_STABLE);
}
@@ -227,7 +227,7 @@
void
ewl_menu_item_set_image( Ewl_Menu_Item *item, char *image )
{
- if (item->icon && ewl_widget_is_type(item->icon, "image"))
+ if (item->icon && ewl_widget_type_is(item->icon, "image"))
ewl_image_set_file(EWL_IMAGE(item->icon), image, NULL);
else {
ewl_menu_item_create_image( item, image,
@@ -370,7 +370,7 @@
* Give all the items in the submenu a reference to this popup.
*/
while ((child = ecore_list_next(pb->children))) {
- if (ewl_widget_is_type(child, "menuitem")) {
+ if (ewl_widget_type_is(child, "menuitem")) {
item = EWL_MENU_ITEM(child);
item->inmenu = menu->popup;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_notebook.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- ewl_notebook.c 12 Aug 2004 16:20:44 -0000 1.47
+++ ewl_notebook.c 13 Aug 2004 00:41:13 -0000 1.48
@@ -62,7 +62,7 @@
*/
n->tab_box = ewl_hbox_new();
if (n->tab_box) {
- ewl_widget_set_internal(n->tab_box, TRUE);
+ ewl_widget_internal_set(n->tab_box, TRUE);
ewl_object_fill_policy_set(EWL_OBJECT(n->tab_box),
EWL_FLAG_FILL_NONE);
ewl_object_alignment_set(EWL_OBJECT(n->tab_box),
@@ -112,7 +112,7 @@
ewl_container_append_child(EWL_CONTAINER(n->tab_box), b);
ewl_container_append_child(EWL_CONTAINER(w), p);
- ewl_widget_set_data(p, n, b);
+ ewl_widget_data_set(p, n, b);
if (!n->visible_page)
n->visible_page = p;
@@ -149,7 +149,7 @@
ewl_container_prepend_child(EWL_CONTAINER(n->tab_box), b);
ewl_container_prepend_child(EWL_CONTAINER(w), p);
- ewl_widget_set_data(p, n, b);
+ ewl_widget_data_set(p, n, b);
if (!n->visible_page)
n->visible_page = p;
@@ -189,7 +189,7 @@
ewl_container_insert_child(EWL_CONTAINER(n->tab_box), b, pos);
ewl_container_insert_child(EWL_CONTAINER(w), p, pos);
- ewl_widget_set_data(p, n, b);
+ ewl_widget_data_set(p, n, b);
if (!n->visible_page)
n->visible_page = p;
@@ -224,7 +224,7 @@
if (page) {
ewl_container_remove_child(c, page);
- tab = ewl_widget_get_data(page, n);
+ tab = ewl_widget_data_get(page, n);
if (tab)
ewl_widget_destroy(tab);
if (page == n->visible_page) {
@@ -269,7 +269,7 @@
if (page) {
ewl_container_remove_child(c, page);
- tab = ewl_widget_get_data(page, n);
+ tab = ewl_widget_data_get(page, n);
if (tab)
ewl_widget_destroy(tab);
if (page == n->visible_page) {
@@ -314,7 +314,7 @@
if (page) {
ewl_container_remove_child(c, page);
- tab = ewl_widget_get_data(page, n);
+ tab = ewl_widget_data_get(page, n);
if (tab)
ewl_widget_destroy(tab);
if (page == n->visible_page) {
@@ -368,7 +368,7 @@
* to be freed.
*/
ewl_container_remove_child(c, page);
- tab = ewl_widget_get_data(page, n);
+ tab = ewl_widget_data_get(page, n);
if (tab)
ewl_widget_destroy(tab);
ewl_widget_destroy(page);
@@ -505,7 +505,7 @@
break;
}
- ewl_widget_set_appearance(w, file);
+ ewl_widget_appearance_set(w, file);
ewl_widget_configure(w);
DLEAVE_FUNCTION(DLEVEL_STABLE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_radiobutton.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- ewl_radiobutton.c 24 Mar 2004 04:11:09 -0000 1.32
+++ ewl_radiobutton.c 13 Aug 2004 00:41:13 -0000 1.33
@@ -75,8 +75,8 @@
w = EWL_WIDGET(rb);
ewl_checkbutton_init(cb, label);
- ewl_widget_set_appearance(w, "radiobutton");
- ewl_widget_set_appearance(cb->check, "radio");
+ ewl_widget_appearance_set(w, "radiobutton");
+ ewl_widget_appearance_set(cb->check, "radio");
ewl_callback_append(w, EWL_CALLBACK_CLICKED, ewl_radiobutton_clicked_cb,
NULL);
ewl_callback_append(w, EWL_CALLBACK_DESTROY, ewl_radiobutton_destroy_cb,
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_scrollbar.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- ewl_scrollbar.c 12 Aug 2004 16:20:44 -0000 1.30
+++ ewl_scrollbar.c 13 Aug 2004 00:41:13 -0000 1.31
@@ -54,7 +54,7 @@
* Create the basic widgets that are contained in the scrollbar.
*/
s->button_decrement = ewl_button_new(NULL);
- ewl_widget_set_internal(s->button_decrement, TRUE);
+ ewl_widget_internal_set(s->button_decrement, TRUE);
ewl_object_alignment_set(EWL_OBJECT(s->button_decrement),
EWL_FLAG_ALIGN_CENTER);
ewl_object_fill_policy_set(EWL_OBJECT(s->button_decrement),
@@ -65,7 +65,7 @@
* Create the increment button.
*/
s->button_increment = ewl_button_new(NULL);
- ewl_widget_set_internal(s->button_increment, TRUE);
+ ewl_widget_internal_set(s->button_increment, TRUE);
ewl_object_alignment_set(EWL_OBJECT(s->button_increment),
EWL_FLAG_ALIGN_CENTER);
ewl_object_fill_policy_set(EWL_OBJECT(s->button_increment),
@@ -76,7 +76,7 @@
* Setup the seeker portion
*/
s->seeker = ewl_seeker_new(orientation);
- ewl_widget_set_internal(s->seeker, TRUE);
+ ewl_widget_internal_set(s->seeker, TRUE);
ewl_widget_show(s->seeker);
/*
@@ -142,8 +142,8 @@
/*
* Set the appearance strings for the parts of the scrollbar
*/
- ewl_widget_set_appearance(s->button_decrement, "button_decrement");
- ewl_widget_set_appearance(s->button_increment, "button_increment");
+ ewl_widget_appearance_set(s->button_decrement, "button_decrement");
+ ewl_widget_appearance_set(s->button_increment, "button_increment");
/*
* Set the alignment of the buttons to the seeker.
@@ -195,7 +195,7 @@
* Set the default value to the beginning of the seeker.
*/
ewl_seeker_set_value(EWL_SEEKER(s->seeker), 0);
- ewl_widget_set_appearance(w, "hscrollbar");
+ ewl_widget_appearance_set(w, "hscrollbar");
ewl_object_fill_policy_set(EWL_OBJECT(s),
EWL_FLAG_FILL_HFILL);
}
@@ -239,7 +239,7 @@
* Set the default value to the beginning of the seeker.
*/
ewl_seeker_set_value(EWL_SEEKER(s->seeker), 0);
- ewl_widget_set_appearance(w, "vscrollbar");
+ ewl_widget_appearance_set(w, "vscrollbar");
ewl_object_fill_policy_set(EWL_OBJECT(s),
EWL_FLAG_FILL_VFILL);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_scrollpane.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- ewl_scrollpane.c 12 Aug 2004 16:20:44 -0000 1.43
+++ ewl_scrollpane.c 13 Aug 2004 00:41:13 -0000 1.44
@@ -72,10 +72,10 @@
ewl_container_append_child(EWL_CONTAINER(s), s->hscrollbar);
ewl_container_append_child(EWL_CONTAINER(s), s->vscrollbar);
- ewl_widget_set_internal(s->overlay, TRUE);
- ewl_widget_set_internal(s->box, TRUE);
- ewl_widget_set_internal(s->hscrollbar, TRUE);
- ewl_widget_set_internal(s->vscrollbar, TRUE);
+ ewl_widget_internal_set(s->overlay, TRUE);
+ ewl_widget_internal_set(s->box, TRUE);
+ ewl_widget_internal_set(s->hscrollbar, TRUE);
+ ewl_widget_internal_set(s->vscrollbar, TRUE);
ewl_widget_show(s->overlay);
ewl_widget_show(s->box);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_seeker.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- ewl_seeker.c 12 Aug 2004 16:20:44 -0000 1.58
+++ ewl_seeker.c 13 Aug 2004 00:41:13 -0000 1.59
@@ -66,7 +66,7 @@
* Create and add the button portion of the seeker
*/
s->button = ewl_button_new(NULL);
- ewl_widget_set_internal(s->button, TRUE);
+ ewl_widget_internal_set(s->button, TRUE);
ewl_container_append_child(EWL_CONTAINER(s), s->button);
ewl_widget_show(s->button);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_selectionbar.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ewl_selectionbar.c 12 Aug 2004 16:20:45 -0000 1.21
+++ ewl_selectionbar.c 13 Aug 2004 00:41:13 -0000 1.22
@@ -85,7 +85,7 @@
/* ewl_callback_append(s->scroller.top, EWL_CALLBACK_MOUSE_MOVE,
ewl_selectionbar_mouse_move_child, s);
*/
- ewl_widget_set_appearance(s->scroller.top, "/selectionbar/scroller/top");
+ ewl_widget_appearance_set(s->scroller.top, "/selectionbar/scroller/top");
s->scroller.bottom = ewl_vbox_new();
@@ -95,7 +95,7 @@
/* ewl_callback_append(s->scroller.bottom, EWL_CALLBACK_MOUSE_MOVE,
ewl_selectionbar_mouse_move_child, s);
*/
- ewl_widget_set_appearance(s->scroller.bottom, "/selectionbar/scroller/bottom");
+ ewl_widget_appearance_set(s->scroller.bottom, "/selectionbar/scroller/bottom");
ewl_container_add_notify(EWL_CONTAINER(w),
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_selectionbook.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ewl_selectionbook.c 12 Aug 2004 16:20:45 -0000 1.14
+++ ewl_selectionbook.c 13 Aug 2004 00:41:13 -0000 1.15
@@ -89,7 +89,7 @@
ewl_callback_append(p->tab, EWL_CALLBACK_CLICKED,
ewl_selectionbook_page_switch_cb, s);
- ewl_widget_set_data(tab, (void *) s, (void *) p);
+ ewl_widget_data_set(tab, (void *) s, (void *) p);
if (!s->current_page) {
s->current_page = p;
@@ -289,7 +289,7 @@
//ewl_widget_hide(p->page);
}
- s->current_page = (Ewl_SbookPage *) ewl_widget_get_data(w, (void *) s);
+ s->current_page = (Ewl_SbookPage *) ewl_widget_data_get(w, (void *) s);
p = s->current_page;
ewl_callback_del(p->tab, EWL_CALLBACK_CLICKED,
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_spinner.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- ewl_spinner.c 12 Aug 2004 16:20:45 -0000 1.54
+++ ewl_spinner.c 13 Aug 2004 00:41:13 -0000 1.55
@@ -59,14 +59,14 @@
s->button_increase = ewl_button_new(NULL);
ewl_container_append_child(EWL_CONTAINER(s), s->button_increase);
- ewl_widget_set_appearance(s->button_increase, "button_increment");
+ ewl_widget_appearance_set(s->button_increase, "button_increment");
ewl_object_fill_policy_set(EWL_OBJECT(s->button_increase),
EWL_FLAG_FILL_NONE);
ewl_widget_show(s->button_increase);
s->button_decrease = ewl_button_new(NULL);
ewl_container_append_child(EWL_CONTAINER(s), s->button_decrease);
- ewl_widget_set_appearance(s->button_decrease, "button_decrement");
+ ewl_widget_appearance_set(s->button_decrease, "button_decrement");
ewl_object_fill_policy_set(EWL_OBJECT(s->button_decrease),
EWL_FLAG_FILL_NONE);
ewl_widget_show(s->button_decrease);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_table.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- ewl_table.c 12 Aug 2004 16:20:45 -0000 1.45
+++ ewl_table.c 13 Aug 2004 00:41:13 -0000 1.46
@@ -166,7 +166,7 @@
while ((child = ecore_list_next(children)) != NULL)
{
if (child == EWL_WIDGET(cell)) {
- g_child = (Ewl_Grid_Child *) ewl_widget_get_data(child,
+ g_child = (Ewl_Grid_Child *) ewl_widget_data_get(child,
(void *) t->grid);
if (start_col)
@@ -221,7 +221,7 @@
ecore_list_goto_first(children);
while ((child = ecore_list_next(children)) != NULL) {
- gc = (Ewl_Grid_Child *) ewl_widget_get_data(child,
+ gc = (Ewl_Grid_Child *) ewl_widget_data_get(child,
(void *) t->grid);
if (start_col >= gc->start_col && end_col <= gc->end_col &&
@@ -389,7 +389,7 @@
ecore_list_goto_first(children);
while ((child = ecore_list_next(children)) != NULL) {
- gc = (Ewl_Grid_Child *) ewl_widget_get_data(child,
+ gc = (Ewl_Grid_Child *) ewl_widget_data_get(child,
(void *) t->grid);
if (t->selected.start_c == gc->start_col &&
@@ -421,7 +421,7 @@
t = EWL_TABLE(user_data);
- gc = (Ewl_Grid_Child *) ewl_widget_get_data(w, (void *) t->grid);
+ gc = (Ewl_Grid_Child *) ewl_widget_data_get(w, (void *) t->grid);
t->selected.start_r = gc->start_row;
t->selected.start_c = gc->start_col;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_text.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -3 -r1.75 -r1.76
--- ewl_text.c 12 Aug 2004 16:20:45 -0000 1.75
+++ ewl_text.c 13 Aug 2004 00:41:13 -0000 1.76
@@ -638,7 +638,7 @@
ta = EWL_TEXT(w);
if (ta->etox)
- evas_object_layer_set(ta->etox, ewl_widget_get_layer_sum(w));
+ evas_object_layer_set(ta->etox, ewl_widget_layer_sum_get(w));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -657,7 +657,7 @@
*/
if (ta->etox) {
evas_object_move(ta->etox, CURRENT_X(w), CURRENT_Y(w));
- evas_object_layer_set(ta->etox, ewl_widget_get_layer_sum(w));
+ evas_object_layer_set(ta->etox, ewl_widget_layer_sum_get(w));
}
DLEAVE_FUNCTION(DLEVEL_STABLE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_tooltip.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ewl_tooltip.c 12 Aug 2004 16:20:46 -0000 1.12
+++ ewl_tooltip.c 13 Aug 2004 00:41:14 -0000 1.13
@@ -39,9 +39,9 @@
w = EWL_WIDGET (t);
ewl_box_init(EWL_BOX(w), EWL_ORIENTATION_VERTICAL);
- ewl_widget_set_appearance (EWL_WIDGET (w), "tooltip");
+ ewl_widget_appearance_set(EWL_WIDGET (w), "tooltip");
ewl_object_fill_policy_set(EWL_OBJECT(w), EWL_FLAG_FILL_NONE);
- ewl_widget_set_layer(w, 2000);
+ ewl_widget_layer_set(w, 2000);
t->text = ewl_text_new ("test tooltip");
ewl_object_alignment_set (EWL_OBJECT(t->text),
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_tree.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- ewl_tree.c 12 Aug 2004 16:20:46 -0000 1.48
+++ ewl_tree.c 13 Aug 2004 00:41:14 -0000 1.49
@@ -195,7 +195,7 @@
break;
}
- ewl_widget_set_internal(cell, TRUE);
+ ewl_widget_internal_set(cell, TRUE);
ewl_container_append_child(EWL_CONTAINER(row), cell);
ewl_object_fill_policy_set(EWL_OBJECT(cell),
EWL_FLAG_FILL_HFILL |
@@ -552,7 +552,7 @@
node->expanded = EWL_TREE_NODE_COLLAPSED;
- ewl_widget_set_state(EWL_WIDGET(node), "collapsed");
+ ewl_widget_state_set(EWL_WIDGET(node), "collapsed");
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -592,7 +592,7 @@
ecore_list_destroy(tmp);
- ewl_widget_set_state(EWL_WIDGET(node), "expanded");
+ ewl_widget_state_set(EWL_WIDGET(node), "expanded");
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_widget.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -3 -r1.116 -r1.117
--- ewl_widget.c 12 Aug 2004 16:20:46 -0000 1.116
+++ ewl_widget.c 13 Aug 2004 00:41:14 -0000 1.117
@@ -6,10 +6,10 @@
Ewl_Widget *last_focused = NULL;
Ewl_Widget *dnd_widget = NULL;
-static void ewl_widget_rebuild_appearance(Ewl_Widget *w);
-static void ewl_widget_get_theme_padding(Ewl_Widget *w, int *l, int *r,
+static void ewl_widget_appearance_rebuild(Ewl_Widget *w);
+static void ewl_widget_theme_padding_get(Ewl_Widget *w, int *l, int *r,
int *t, int *b);
-static void ewl_widget_get_theme_insets(Ewl_Widget *w, int *l, int *r,
+static void ewl_widget_theme_insets_get(Ewl_Widget *w, int *l, int *r,
int *t, int *b);
/**
@@ -74,7 +74,7 @@
ewl_widget_mouse_move_cb, NULL);
w->inheritance = strdup(":widget:");
- ewl_widget_set_appearance(w, appearance);
+ ewl_widget_appearance_set(w, appearance);
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
@@ -320,7 +320,7 @@
* Assigns a key / value pair with k as the key and v as the value to the
* specified widget w.
*/
-void ewl_widget_set_data(Ewl_Widget * w, void *k, void *v)
+void ewl_widget_data_set(Ewl_Widget * w, void *k, void *v)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -343,7 +343,7 @@
*
* Removes a key / value pair with k as the key from the specified widget w.
*/
-void ewl_widget_del_data(Ewl_Widget * w, void *k)
+void ewl_widget_data_del(Ewl_Widget * w, void *k)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -364,7 +364,7 @@
*
* Retrieves a key / value pair with k as the key from the specified widget w.
*/
-void *ewl_widget_get_data(Ewl_Widget * w, void *k)
+void *ewl_widget_data_get(Ewl_Widget * w, void *k)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("w", w, NULL);
@@ -385,7 +385,7 @@
* Changes the key associated with the widgets appearance and calls the theme
* update callback to initiate the change.
*/
-void ewl_widget_set_appearance(Ewl_Widget * w, char *appearance)
+void ewl_widget_appearance_set(Ewl_Widget * w, char *appearance)
{
int il = 0, al;
char *current;
@@ -439,7 +439,7 @@
* Regenerate the entire path of widgets in the heirarchy, and
* recreate the visible components of the widget if necessary.
*/
- ewl_widget_rebuild_appearance(w);
+ ewl_widget_appearance_rebuild(w);
if (REALIZED(w)) {
ewl_widget_unrealize(w);
ewl_widget_realize(w);
@@ -454,7 +454,7 @@
* failure.
* @brief Retrieve the appearance key of the widget
*/
-char *ewl_widget_get_appearance(Ewl_Widget * w)
+char *ewl_widget_appearance_get(Ewl_Widget * w)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -473,7 +473,7 @@
* Changes the appearance of the widget depending on the state string passed by
* the state parameter.
*/
-void ewl_widget_set_state(Ewl_Widget * w, char *state)
+void ewl_widget_state_set(Ewl_Widget * w, char *state)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -500,7 +500,7 @@
* Changes the parent of the widget w, to the container p. The reparent
* callback is triggered to notify children of w of the change in parent.
*/
-void ewl_widget_set_parent(Ewl_Widget * w, Ewl_Widget * p)
+void ewl_widget_parent_set(Ewl_Widget * w, Ewl_Widget * p)
{
Ewl_Widget *tmp;
Ewl_Container *op;
@@ -617,7 +617,7 @@
* Changes the current layer of @a w relative to it's parent. The default
* value is 5.
*/
-void ewl_widget_set_layer(Ewl_Widget *w, int layer)
+void ewl_widget_layer_set(Ewl_Widget *w, int layer)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -644,7 +644,7 @@
* @return Returns a widgets current layer relative to it's parent.
* @brief Retrieve a widgets layer relative to it's parent.
*/
-int ewl_widget_get_layer(Ewl_Widget *w)
+int ewl_widget_layer_get(Ewl_Widget *w)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("w", w, 0);
@@ -657,7 +657,7 @@
* @return Returns the absolute layer the widget is placed on.
* @brief Sums the layers of a widgets parents to determine it's absolute layer.
*/
-int ewl_widget_get_layer_sum(Ewl_Widget *w)
+int ewl_widget_layer_sum_get(Ewl_Widget *w)
{
int sum = 0;
@@ -687,7 +687,7 @@
* The embed versions should only be accessed internally if you understand
* their ramifications.
*/
-void ewl_widget_push_tab_order(Ewl_Widget *w)
+void ewl_widget_tab_order_push(Ewl_Widget *w)
{
Ewl_Embed *e;
@@ -705,7 +705,7 @@
* @return Returns no value.
* @brief Prints to stdout the tree of widgets that are parents of a widget.
*/
-void ewl_widget_print_tree(Ewl_Widget *w)
+void ewl_widget_tree_print(Ewl_Widget *w)
{
int i = 0;
@@ -749,7 +749,7 @@
* functions to access the contents of complex widgets w/o fear of damaging
* internal layout structure.
*/
-void ewl_widget_set_internal(Ewl_Widget *w, unsigned int val)
+void ewl_widget_internal_set(Ewl_Widget *w, unsigned int val)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -770,7 +770,7 @@
* @return Returns TRUE if @a w inherited the type @a t, otherwise FALSE.
* @brief Determine if the widget @a w has inherited from the type @a t.
*/
-unsigned int ewl_widget_is_type(Ewl_Widget *widget, char *type)
+unsigned int ewl_widget_type_is(Ewl_Widget *widget, char *type)
{
int found = FALSE;
char tmp[PATH_MAX];
@@ -791,7 +791,7 @@
* @return Returns TRUE if the widget is marked internal, otherwise FALSE.
* @brief Checks the widget for the internal flag.
*/
-unsigned int ewl_widget_is_internal(Ewl_Widget *w)
+unsigned int ewl_widget_internal_is(Ewl_Widget *w)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -808,7 +808,7 @@
* @return Returns no value.
* @brief Marks whether the widget should be clipped at it's boundaries.
*/
-void ewl_widget_set_clipped(Ewl_Widget *w, unsigned int val)
+void ewl_widget_clipped_set(Ewl_Widget *w, unsigned int val)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -847,7 +847,7 @@
* @return Returns TRUE if the widget clips, otherwise FALSE.
* @brief Checks if a widget clips it's theme object.
*/
-unsigned int ewl_widget_is_clipped(Ewl_Widget *w)
+unsigned int ewl_widget_clipped_is(Ewl_Widget *w)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -863,7 +863,7 @@
* @return Returns no value.
* @brief Changes the keyboard focus to the widget @a w.
*/
-void ewl_widget_send_focus(Ewl_Widget *w)
+void ewl_widget_focus_send(Ewl_Widget *w)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -876,14 +876,14 @@
* @return Returns the currnetly focused widget.
* @brief Retrieve the currently focused widget.
*/
-Ewl_Widget *ewl_widget_get_focused()
+Ewl_Widget *ewl_widget_focused_get()
{
DENTER_FUNCTION(DLEVEL_STABLE);
DRETURN_PTR(last_key, DLEVEL_STABLE);
}
-static void ewl_widget_rebuild_appearance(Ewl_Widget *w)
+static void ewl_widget_appearance_rebuild(Ewl_Widget *w)
{
char *base;
char path[PATH_MAX];
@@ -1013,7 +1013,7 @@
if (w->fx_clip_box) {
int sum;
- sum = ewl_widget_get_layer_sum(w);
+ sum = ewl_widget_layer_sum_get(w);
if (sum > ewl_embed_get_max_layer(emb))
ewl_embed_set_max_layer(emb, sum);
evas_object_layer_set(w->fx_clip_box, sum);
@@ -1032,8 +1032,8 @@
* will be used to calculate any added at runtime.
*/
if (w->theme_object) {
- ewl_widget_get_theme_insets(w, &i_l, &i_r, &i_t, &i_b);
- ewl_widget_get_theme_padding(w, &p_l, &p_r, &p_t, &p_b);
+ ewl_widget_theme_insets_get(w, &i_l, &i_r, &i_t, &i_b);
+ ewl_widget_theme_padding_get(w, &p_l, &p_r, &p_t, &p_b);
}
ewl_object_insets_get(EWL_OBJECT(w), &l, &r, &t, &b);
@@ -1080,7 +1080,7 @@
if (w->theme_object) {
evas_object_layer_set(w->theme_object,
- ewl_widget_get_layer_sum(w));
+ ewl_widget_layer_sum_get(w));
if (w->fx_clip_box)
evas_object_clip_set(w->theme_object, w->fx_clip_box);
evas_object_show(w->theme_object);
@@ -1089,11 +1089,11 @@
* Set the insets based on cached information from the
* ebit, this can be overwritten later.
*/
- ewl_widget_get_theme_insets(w, &l, &r, &t, &b);
+ ewl_widget_theme_insets_get(w, &l, &r, &t, &b);
ewl_object_insets_set(EWL_OBJECT(w), l + i_l, r + i_r, t + i_t,
b + i_b);
- ewl_widget_get_theme_padding(w, &l, &r, &t, &b);
+ ewl_widget_theme_padding_get(w, &l, &r, &t, &b);
ewl_object_padding_set(EWL_OBJECT(w), l + p_l, r + p_r, t + p_t,
b + p_b);
@@ -1223,7 +1223,7 @@
pc = EWL_CONTAINER(w->parent);
- ewl_widget_rebuild_appearance(w);
+ ewl_widget_appearance_rebuild(w);
/*
* If the new parent is on a different evas, we must re-realize it.
@@ -1246,7 +1246,7 @@
evas_object_clip_set(w->fx_clip_box,
pc->clip_box);
- layer = ewl_widget_get_layer_sum(EWL_WIDGET(pc)) +
+ layer = ewl_widget_layer_sum_get(EWL_WIDGET(pc)) +
LAYER(w);
if (w->fx_clip_box)
evas_object_layer_set(w->fx_clip_box, layer);
@@ -1267,7 +1267,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- ewl_widget_set_state(w, "default");
+ ewl_widget_state_set(w, "default");
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -1277,7 +1277,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- ewl_widget_set_state(w, "disabled");
+ ewl_widget_state_set(w, "disabled");
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -1290,9 +1290,9 @@
DRETURN(DLEVEL_STABLE);
if (ewl_object_state_has(EWL_OBJECT(w), EWL_FLAG_STATE_PRESSED))
- ewl_widget_set_state(w, "mouse,down,0");
+ ewl_widget_state_set(w, "mouse,down,0");
else
- ewl_widget_set_state(w, "mouse,in");
+ ewl_widget_state_set(w, "mouse,in");
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -1304,7 +1304,7 @@
if (ewl_object_state_has(EWL_OBJECT(w), EWL_FLAG_STATE_DISABLED))
DRETURN(DLEVEL_STABLE);
- ewl_widget_set_state(w, "mouse,out");
+ ewl_widget_state_set(w, "mouse,out");
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -1319,7 +1319,7 @@
DRETURN(DLEVEL_STABLE);
snprintf(state, 14, "mouse,down,%i", e->button);
- ewl_widget_set_state(w, state);
+ ewl_widget_state_set(w, state);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -1334,14 +1334,14 @@
DRETURN(DLEVEL_STABLE);
snprintf(state, 14, "mouse,up,%i", e->button);
- ewl_widget_set_state(w, state);
+ ewl_widget_state_set(w, state);
if (ewl_object_state_has(EWL_OBJECT(w), EWL_FLAG_STATE_HILITED)) {
- ewl_widget_set_state(w, "mouse,in");
+ ewl_widget_state_set(w, "mouse,in");
ewl_callback_call_with_event_data(w, EWL_CALLBACK_CLICKED,
ev_data);
} else
- ewl_widget_set_state(w, "mouse,out");
+ ewl_widget_state_set(w, "mouse,out");
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -1356,7 +1356,7 @@
}
static void
-ewl_widget_get_theme_padding(Ewl_Widget *w, int *l, int *r, int *t, int *b)
+ewl_widget_theme_padding_get(Ewl_Widget *w, int *l, int *r, int *t, int *b)
{
const char *key;
@@ -1389,7 +1389,7 @@
}
static void
-ewl_widget_get_theme_insets(Ewl_Widget *w, int *l, int *r, int *t, int *b)
+ewl_widget_theme_insets_get(Ewl_Widget *w, int *l, int *r, int *t, int *b)
{
const char *key;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_widget.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- ewl_widget.h 24 Mar 2004 05:20:19 -0000 1.44
+++ ewl_widget.h 13 Aug 2004 00:41:14 -0000 1.45
@@ -97,38 +97,38 @@
/*
* Attach a key/value pair to a widget.
*/
-void ewl_widget_set_data(Ewl_Widget * w, void *k, void *v);
+void ewl_widget_data_set(Ewl_Widget * w, void *k, void *v);
/*
* Remove a key value pair from a widget.
*/
-void ewl_widget_del_data(Ewl_Widget * w, void *k);
+void ewl_widget_data_del(Ewl_Widget * w, void *k);
/*
* Retrieve a key value pair from a widget.
*/
-void *ewl_widget_get_data(Ewl_Widget * w, void *k);
+void *ewl_widget_data_get(Ewl_Widget * w, void *k);
/*
* Change the appearance of a widget based on a state string.
*/
-void ewl_widget_set_state(Ewl_Widget * w, char *state);
+void ewl_widget_state_set(Ewl_Widget * w, char *state);
/*
* Change the appearance string used for determining the correct theme data.
*/
-void ewl_widget_set_appearance(Ewl_Widget * w, char *appearance);
+void ewl_widget_appearance_set(Ewl_Widget * w, char *appearance);
/*
* Retrieve the appearance string of a widget.
*/
-char *ewl_widget_get_appearance(Ewl_Widget * w);
-unsigned int ewl_widget_is_type(Ewl_Widget *widget, char *type);
+char *ewl_widget_appearance_get(Ewl_Widget * w);
+unsigned int ewl_widget_type_is(Ewl_Widget *widget, char *type);
/*
* Change the parent of a widget.
*/
-void ewl_widget_set_parent(Ewl_Widget * w, Ewl_Widget * p);
+void ewl_widget_parent_set(Ewl_Widget * w, Ewl_Widget * p);
/*
* Activate a widget.
@@ -146,19 +146,19 @@
void ewl_widget_print_tree(Ewl_Widget *w);
void ewl_widget_print(Ewl_Widget *w);
-int ewl_widget_get_layer_sum(Ewl_Widget *w);
-void ewl_widget_set_layer(Ewl_Widget *w, int layer);
-int ewl_widget_get_layer(Ewl_Widget *w);
-
-void ewl_widget_set_internal(Ewl_Widget *w, unsigned int val);
-unsigned int ewl_widget_is_internal(Ewl_Widget *w);
-
-void ewl_widget_set_clipped(Ewl_Widget *w, unsigned int val);
-unsigned int ewl_widget_is_clipped(Ewl_Widget *w);
-
-void ewl_widget_send_focus(Ewl_Widget *w);
-Ewl_Widget *ewl_widget_get_focused(void);
-void ewl_widget_push_tab_order(Ewl_Widget *w);
+int ewl_widget_layer_sum_get(Ewl_Widget *w);
+void ewl_widget_layer_set(Ewl_Widget *w, int layer);
+int ewl_widget_layer_get(Ewl_Widget *w);
+
+void ewl_widget_internal_set(Ewl_Widget *w, unsigned int val);
+unsigned int ewl_widget_internal_is(Ewl_Widget *w);
+
+void ewl_widget_clipped_set(Ewl_Widget *w, unsigned int val);
+unsigned int ewl_widget_clipped_is(Ewl_Widget *w);
+
+void ewl_widget_focus_send(Ewl_Widget *w);
+Ewl_Widget *ewl_widget_focused_get(void);
+void ewl_widget_tab_order_push(Ewl_Widget *w);
/**
* @def LAYER(w)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_window.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -3 -r1.84 -r1.85
--- ewl_window.c 12 Aug 2004 16:20:46 -0000 1.84
+++ ewl_window.c 13 Aug 2004 00:41:14 -0000 1.85
@@ -299,7 +299,7 @@
* Initialize the fields of the inherited container class
*/
ewl_embed_init(EWL_EMBED(w));
- ewl_widget_set_appearance(EWL_WIDGET(w), "window");
+ ewl_widget_appearance_set(EWL_WIDGET(w), "window");
ewl_object_fill_policy_set(EWL_OBJECT(w), EWL_FLAG_FILL_FILL);
w->title = strdup("EWL");
w->name = strdup("EWL");
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
