Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
ewl_combo.c ewl_entry.c ewl_entry.h ewl_fileselector.c
ewl_menu_base.c ewl_menu_base.h ewl_password.c ewl_scrollbar.c
ewl_scrollbar.h ewl_scrollpane.c ewl_spinner.c
Log Message:
Update the API for the entry.
Minor indentation changes.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_combo.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ewl_combo.c 23 Aug 2004 18:51:51 -0000 1.9
+++ ewl_combo.c 29 Aug 2004 02:47:39 -0000 1.10
@@ -39,14 +39,16 @@
* Initialize the defaults of the inherited fields.
*/
ewl_menu_base_init(EWL_MENU_BASE(combo), NULL, title);
+ ewl_object_fill_policy_set(EWL_OBJECT(combo), EWL_FLAG_FILL_HFILL |
+ EWL_FLAG_FILL_HSHRINK);
ewl_widget_appearance_set( EWL_WIDGET(combo), "combo" );
- if( EWL_MENU_ITEM(combo)->icon )
+ if (EWL_MENU_ITEM(combo)->icon)
ewl_widget_destroy(EWL_MENU_ITEM(combo)->icon);
EWL_MENU_ITEM(combo)->icon = NULL;
- if( EWL_MENU_ITEM(combo)->text )
+ if (EWL_MENU_ITEM(combo)->text)
ewl_widget_destroy(EWL_MENU_ITEM(combo)->text);
EWL_MENU_ITEM(combo)->text = NULL;
@@ -60,34 +62,37 @@
ewl_widget_show(combo->button);
combo->selected = ewl_entry_new(title);
- ewl_object_alignment_set(EWL_OBJECT(combo->selected), EWL_FLAG_ALIGN_CENTER);
+ ewl_object_fill_policy_set(EWL_OBJECT(combo->selected),
+ EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_HSHRINK);
+ ewl_object_alignment_set(EWL_OBJECT(combo->selected),
+ EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(combo), combo->selected);
ewl_widget_show(combo->selected);
ewl_callback_del(EWL_WIDGET(combo), EWL_CALLBACK_SELECT,
-
ewl_menu_base_expand_cb);
+ ewl_menu_base_expand_cb);
- ewl_container_callback_nointercept( EWL_CONTAINER(combo),
-
EWL_CALLBACK_CLICKED
);
- ewl_container_callback_nointercept( EWL_CONTAINER(combo),
-
EWL_CALLBACK_MOUSE_DOWN );
- ewl_container_callback_nointercept( EWL_CONTAINER(combo),
-
EWL_CALLBACK_MOUSE_UP
);
- ewl_container_callback_nointercept( EWL_CONTAINER(combo),
-
EWL_CALLBACK_MOUSE_MOVE );
- ewl_container_callback_nointercept( EWL_CONTAINER(combo),
-
EWL_CALLBACK_SELECT );
- ewl_container_callback_nointercept( EWL_CONTAINER(combo),
-
EWL_CALLBACK_DESELECT
);
+ ewl_container_callback_nointercept(EWL_CONTAINER(combo),
+ EWL_CALLBACK_CLICKED);
+ ewl_container_callback_nointercept(EWL_CONTAINER(combo),
+ EWL_CALLBACK_MOUSE_DOWN);
+ ewl_container_callback_nointercept(EWL_CONTAINER(combo),
+ EWL_CALLBACK_MOUSE_UP);
+ ewl_container_callback_nointercept(EWL_CONTAINER(combo),
+ EWL_CALLBACK_MOUSE_MOVE);
+ ewl_container_callback_nointercept(EWL_CONTAINER(combo),
+ EWL_CALLBACK_SELECT);
+ ewl_container_callback_nointercept(EWL_CONTAINER(combo),
+ EWL_CALLBACK_DESELECT);
- ewl_container_redirect_set( EWL_CONTAINER(combo), redirect );
+ ewl_container_redirect_set(EWL_CONTAINER(combo), redirect);
ewl_callback_append(combo->button, EWL_CALLBACK_MOUSE_DOWN,
-
ewl_combo_expand_cb, combo);
+ ewl_combo_expand_cb, combo);
ewl_callback_append(EWL_WIDGET(combo), EWL_CALLBACK_CONFIGURE,
-
ewl_combo_configure_cb, NULL);
+ ewl_combo_configure_cb, NULL);
ewl_callback_append(combo->selected, EWL_CALLBACK_VALUE_CHANGED,
-
ewl_combo_value_changed_cb, combo);
+ ewl_combo_value_changed_cb, combo);
/*
* Create the popup combo portion of the widget.
@@ -99,7 +104,7 @@
ewl_box_orientation_set(EWL_BOX(combo->base.popup),
EWL_ORIENTATION_VERTICAL);
ewl_object_fill_policy_set(EWL_OBJECT(combo->base.popup),
- EWL_FLAG_FILL_HFILL);
+ EWL_FLAG_FILL_NONE);
ewl_object_alignment_set(EWL_OBJECT(combo->base.popup),
EWL_FLAG_ALIGN_LEFT | EWL_FLAG_ALIGN_TOP);
@@ -116,8 +121,8 @@
{
DENTER_FUNCTION(DLEVEL_STABLE);
- if( combo->selected ) {
- ewl_entry_set_text(EWL_ENTRY(combo->selected), item);
+ if (combo->selected) {
+ ewl_entry_text_set(EWL_ENTRY(combo->selected), item);
ewl_callback_call_with_event_data(EWL_WIDGET(combo),
EWL_CALLBACK_VALUE_CHANGED,
item);
@@ -138,7 +143,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
if( combo->selected )
- val = ewl_entry_get_text( EWL_ENTRY(combo->selected) );
+ val = ewl_entry_text_get( EWL_ENTRY(combo->selected) );
DRETURN_PTR(val, DLEVEL_STABLE);
}
@@ -203,7 +208,7 @@
combo = EWL_COMBO(user_data);
ewl_callback_call_with_event_data(cw, EWL_CALLBACK_VALUE_CHANGED,
- ewl_entry_get_text(EWL_ENTRY(combo->selected)));
+ ewl_entry_text_get(EWL_ENTRY(combo->selected)));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_entry.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -3 -r1.100 -r1.101
--- ewl_entry.c 28 Aug 2004 07:33:40 -0000 1.100
+++ ewl_entry.c 29 Aug 2004 02:47:39 -0000 1.101
@@ -75,7 +75,7 @@
ewl_callback_append(w, EWL_CALLBACK_DESELECT, ewl_entry_deselect_cb,
NULL);
- ewl_entry_set_editable(e, TRUE);
+ ewl_entry_editable_set(e, TRUE);
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
@@ -88,7 +88,7 @@
*
* Change the text of the entry widget @a e to the string @a t.
*/
-void ewl_entry_set_text(Ewl_Entry * e, char *t)
+void ewl_entry_text_set(Ewl_Entry * e, char *t)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("e", e);
@@ -104,7 +104,7 @@
* @return Returns the entry text on success, NULL on failure.
* @brief Get the text from an entry widget
*/
-char *ewl_entry_get_text(Ewl_Entry * e)
+char *ewl_entry_text_get(Ewl_Entry * e)
{
Ewl_Widget *w;
@@ -123,7 +123,7 @@
* @brief Change the ability to edit the text in an entry
*/
void
-ewl_entry_set_editable(Ewl_Entry *e, unsigned int edit)
+ewl_entry_editable_set(Ewl_Entry *e, unsigned int edit)
{
Ewl_Widget *w;
@@ -288,22 +288,22 @@
e->in_select_mode = (ev->modifiers & EWL_KEY_MODIFIER_SHIFT);
if (!strcmp(ev->keyname, "Left"))
- ewl_entry_move_cursor_to_left(e);
+ ewl_entry_cursor_left_move(e);
else if (!strcmp(ev->keyname, "Right"))
- ewl_entry_move_cursor_to_right(e);
+ ewl_entry_cursor_right_move(e);
else if (!strcmp(ev->keyname, "Home"))
- ewl_entry_move_cursor_to_home(e);
+ ewl_entry_cursor_home_move(e);
else if (!strcmp(ev->keyname, "End"))
- ewl_entry_move_cursor_to_end(e);
+ ewl_entry_cursor_end_move(e);
else if (!strcmp(ev->keyname, "BackSpace"))
- ewl_entry_delete_to_left(e);
+ ewl_entry_left_delete(e);
else if (!strcmp(ev->keyname, "Delete"))
- ewl_entry_delete_to_right(e);
+ ewl_entry_right_delete(e);
else if (((!strcmp(ev->keyname, "w")) &&
(ev->modifiers & EWL_KEY_MODIFIER_CTRL)) ||
((!strcmp(ev->keyname, "W")) &&
(ev->modifiers & EWL_KEY_MODIFIER_CTRL)))
- ewl_entry_delete_to_word_begin(e);
+ ewl_entry_word_begin_delete(e);
else if (!strcmp(ev->keyname, "Return") || !strcmp(ev->keyname,
"KP_Return") || !strcmp(ev->keyname, "Enter")
|| !strcmp(ev->keyname, "KP_Enter")) {
@@ -313,7 +313,7 @@
FREE(evd);
}
else if (ev->keyname && strlen(ev->keyname) == 1) {
- ewl_entry_insert_text(e, ev->keyname);
+ ewl_entry_text_insert(e, ev->keyname);
}
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -460,7 +460,7 @@
if (ev->clicks == 2) {
bp = ewl_cursor_base_position_get(EWL_CURSOR(e->cursor));
- s = ewl_entry_get_text(e);
+ s = ewl_entry_text_get(e);
if (s[bp-1] != ' ') {
if (s[bp] != ' ') {
@@ -535,7 +535,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void ewl_entry_move_cursor_to_left(Ewl_Entry * e)
+void ewl_entry_cursor_left_move(Ewl_Entry * e)
{
int pos;
@@ -561,7 +561,7 @@
* Move the cursor to the previous word. This is internal, so the
* parameter is not checked.
*/
-void ewl_entry_move_cursor_to_previous_word(Ewl_Entry * e)
+void ewl_entry_cursor_previous_word_move(Ewl_Entry * e)
{
char *s;
int len = 0;
@@ -573,7 +573,7 @@
len = ewl_text_length_get(EWL_TEXT(e->text));
bp = ewl_cursor_base_position_get(EWL_CURSOR(e->cursor));
- s = ewl_entry_get_text(e);
+ s = ewl_entry_text_get(e);
if ((bp >1) && (s[bp] != ' ') && (s[bp-1] == ' '))
bp--;
@@ -595,7 +595,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void ewl_entry_move_cursor_to_right(Ewl_Entry * e)
+void ewl_entry_cursor_right_move(Ewl_Entry * e)
{
char *str;
int len = 0;
@@ -605,7 +605,7 @@
DCHECK_PARAM_PTR("e", e);
pos = ewl_cursor_end_position_get(EWL_CURSOR(e->cursor));
- str = ewl_entry_get_text(e);
+ str = ewl_entry_text_get(e);
len = strlen(str);
@@ -628,7 +628,7 @@
* Move the cursor to the next word. This is internal, so the
* parameter is not checked.
*/
-void ewl_entry_move_cursor_to_next_word(Ewl_Entry * e)
+void ewl_entry_cursor_next_word_move(Ewl_Entry * e)
{
char *s;
int len = 0;
@@ -640,7 +640,7 @@
len = ewl_text_length_get(EWL_TEXT(e->text));
bp = ewl_cursor_base_position_get(EWL_CURSOR(e->cursor));
- s = ewl_entry_get_text(e);
+ s = ewl_entry_text_get(e);
if (bp <= len)
{
@@ -663,7 +663,7 @@
* Position the cursor at the beginning of the widget. This is internal, so the
* parameter is not checked.
*/
-void ewl_entry_move_cursor_to_home(Ewl_Entry * e)
+void ewl_entry_cursor_home_move(Ewl_Entry * e)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -681,14 +681,14 @@
* Position the cursor at the end of the widget. This is internal, so the
* parameter is not checked.
*/
-void ewl_entry_move_cursor_to_end(Ewl_Entry * e)
+void ewl_entry_cursor_end_move(Ewl_Entry * e)
{
char *s;
int l = 0;
DENTER_FUNCTION(DLEVEL_STABLE);
- s = ewl_entry_get_text(e);
+ s = ewl_entry_text_get(e);
if (s) {
l = strlen(s);
@@ -705,7 +705,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void ewl_entry_insert_text(Ewl_Entry * e, char *s)
+void ewl_entry_text_insert(Ewl_Entry * e, char *s)
{
char *s2, *s3;
int l = 0, l2 = 0, sp = 0, ep = 0;
@@ -714,7 +714,7 @@
DCHECK_PARAM_PTR("e", e);
DCHECK_PARAM_PTR("s", s);
- s2 = ewl_entry_get_text(e);
+ s2 = ewl_entry_text_get(e);
l = strlen(s);
if (s2)
@@ -740,7 +740,7 @@
ep++;
if (s2) strcat(s3, &(s2[ep - 1]));
- ewl_entry_set_text(e, s3);
+ ewl_entry_text_set(e, s3);
ewl_cursor_base_set(EWL_CURSOR(e->cursor), ep);
IF_FREE(s2);
@@ -753,7 +753,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void ewl_entry_delete_to_left(Ewl_Entry * e)
+void ewl_entry_left_delete(Ewl_Entry * e)
{
char *s;
unsigned int sp, ep;
@@ -764,7 +764,7 @@
sp = ewl_cursor_start_position_get(EWL_CURSOR(e->cursor));
ep = ewl_cursor_end_position_get(EWL_CURSOR(e->cursor));
- s = ewl_entry_get_text(e);
+ s = ewl_entry_text_get(e);
if (!s)
DRETURN(DLEVEL_STABLE);
@@ -779,7 +779,7 @@
}
strcpy(&(s[sp - 2]), &(s[ep - 1]));
- ewl_entry_set_text(e, s);
+ ewl_entry_text_set(e, s);
sp--;
FREE(s);
@@ -790,7 +790,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void ewl_entry_delete_to_right(Ewl_Entry * e)
+void ewl_entry_right_delete(Ewl_Entry * e)
{
char *s;
int sp, ep;
@@ -801,7 +801,7 @@
sp = ewl_cursor_start_position_get(EWL_CURSOR(e->cursor));
ep = ewl_cursor_end_position_get(EWL_CURSOR(e->cursor));
- s = ewl_entry_get_text(e);
+ s = ewl_entry_text_get(e);
if (!s)
DRETURN(DLEVEL_STABLE);
@@ -809,7 +809,7 @@
DRETURN(DLEVEL_STABLE);
strcpy(&(s[sp - 1]), &(s[ep]));
- ewl_entry_set_text(e, s);
+ ewl_entry_text_set(e, s);
FREE(s);
@@ -820,7 +820,7 @@
}
void
-ewl_entry_delete_to_word_begin(Ewl_Entry * e)
+ewl_entry_word_begin_delete(Ewl_Entry * e)
{
char *s;
int bp, index;
@@ -828,7 +828,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("e", e);
- s = ewl_entry_get_text(e);
+ s = ewl_entry_text_get(e);
if (!s)
DRETURN(DLEVEL_STABLE);
@@ -841,7 +841,7 @@
while ((index-->0) && (s[index] != ' ')){}
index++;
strcpy(&(s[index]), &(s[bp]));
- ewl_entry_set_text(e, s);
+ ewl_entry_text_set(e, s);
FREE(s);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_entry.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- ewl_entry.h 28 Aug 2004 07:33:40 -0000 1.36
+++ ewl_entry.h 29 Aug 2004 02:47:39 -0000 1.37
@@ -45,20 +45,20 @@
Ewl_Widget *ewl_entry_new(char *text);
int ewl_entry_init(Ewl_Entry * e, char *text);
-void ewl_entry_set_text(Ewl_Entry * e, char *t);
-char *ewl_entry_get_text(Ewl_Entry * e);
-void ewl_entry_set_editable(Ewl_Entry *e, unsigned int edit);
+void ewl_entry_text_set(Ewl_Entry * e, char *t);
+char *ewl_entry_text_get(Ewl_Entry * e);
+void ewl_entry_editable_set(Ewl_Entry *e, unsigned int edit);
-void ewl_entry_move_cursor_to_left(Ewl_Entry * e);
-void ewl_entry_move_cursor_to_previous_word(Ewl_Entry * e);
-void ewl_entry_move_cursor_to_right(Ewl_Entry * e);
-void ewl_entry_move_cursor_to_next_word(Ewl_Entry * e);
-void ewl_entry_move_cursor_to_home(Ewl_Entry * e);
-void ewl_entry_move_cursor_to_end(Ewl_Entry * e);
-void ewl_entry_insert_text(Ewl_Entry * e, char *s);
-void ewl_entry_delete_to_left(Ewl_Entry * e);
-void ewl_entry_delete_to_right(Ewl_Entry * e);
-void ewl_entry_delete_to_word_begin(Ewl_Entry * e);
+void ewl_entry_cursor_left_move(Ewl_Entry * e);
+void ewl_entry_cursor_previous_word_move(Ewl_Entry * e);
+void ewl_entry_cursor_right_move(Ewl_Entry * e);
+void ewl_entry_cursor_next_word_move(Ewl_Entry * e);
+void ewl_entry_cursor_home_move(Ewl_Entry * e);
+void ewl_entry_cursor_end_move(Ewl_Entry * e);
+void ewl_entry_text_insert(Ewl_Entry * e, char *s);
+void ewl_entry_left_delete(Ewl_Entry * e);
+void ewl_entry_right_delete(Ewl_Entry * e);
+void ewl_entry_word_begin_delete(Ewl_Entry * e);
/*
* Internally used callbacks, override at your own risk.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_fileselector.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- ewl_fileselector.c 28 Aug 2004 06:26:33 -0000 1.44
+++ ewl_fileselector.c 29 Aug 2004 02:47:39 -0000 1.45
@@ -460,7 +460,7 @@
file = (char *) ewl_widget_data_get(EWL_WIDGET(w), "FILE");
fs->file = file;
- ewl_entry_set_text(EWL_ENTRY(fs->entry_file), file);
+ ewl_entry_text_set(EWL_ENTRY(fs->entry_file), file);
}
void ewl_fileselector_select_dir_cb(Ewl_Widget * w, void *ev_data, Ewl_Fileselector *
fs)
@@ -507,12 +507,12 @@
ewl_container_reset(EWL_CONTAINER(fs->list_dirs));
ewl_container_reset(EWL_CONTAINER(fs->list_files));
- ewl_entry_set_text(EWL_ENTRY(fs->entry_file), "");
+ ewl_entry_text_set(EWL_ENTRY(fs->entry_file), "");
/*
* Setup a regex for matching files.
*/
- filter = ewl_entry_get_text(EWL_ENTRY(fs->entry_filter));
+ filter = ewl_entry_text_get(EWL_ENTRY(fs->entry_filter));
if (path[strlen(path) - 1] == '/')
path2 = strdup(path);
@@ -525,7 +525,7 @@
fs->path = path2;
fs->file = NULL;
- ewl_entry_set_text(EWL_ENTRY(fs->entry_dir), path2);
+ ewl_entry_text_set(EWL_ENTRY(fs->entry_dir), path2);
files = ecore_list_new();
dirs = ecore_list_new();
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_menu_base.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- ewl_menu_base.c 23 Aug 2004 00:58:04 -0000 1.39
+++ ewl_menu_base.c 29 Aug 2004 02:47:39 -0000 1.40
@@ -25,7 +25,7 @@
ewl_menu_item_init(EWL_MENU_ITEM(menu), image, title);
ewl_widget_appearance_set(EWL_WIDGET(menu), "menu_base");
- ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_SELECT,
+ ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_MOUSE_DOWN,
ewl_menu_base_expand_cb, NULL);
ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_DESELECT,
@@ -94,13 +94,9 @@
/*
* Initialize the inherited container fields.
*/
- if (!ewl_container_init(EWL_CONTAINER(item), "menuitem"))
+ if (!ewl_box_init(EWL_BOX(item), EWL_ORIENTATION_HORIZONTAL))
DRETURN_INT(FALSE, DLEVEL_STABLE);
- ewl_container_show_notify_set(EWL_CONTAINER(item),
- ewl_menu_item_child_show_cb);
- ewl_container_resize_notify_set(EWL_CONTAINER(item),
- ewl_menu_item_child_resize_cb);
ewl_object_fill_policy_set(EWL_OBJECT(item), EWL_FLAG_FILL_HFILL);
ewl_callback_append(EWL_WIDGET(item), EWL_CALLBACK_CONFIGURE,
@@ -307,32 +303,6 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void ewl_menu_item_child_show_cb(Ewl_Container *parent, Ewl_Widget *child)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
-
- ewl_container_largest_prefer(parent, EWL_ORIENTATION_VERTICAL);
- ewl_object_preferred_inner_w_set(EWL_OBJECT(parent), PREFERRED_W(parent) +
- ewl_object_preferred_w_get(EWL_OBJECT(child)));
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-void
-ewl_menu_item_child_resize_cb(Ewl_Container *parent, Ewl_Widget *child,
- int size, Ewl_Orientation o)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
-
- if (o == EWL_ORIENTATION_VERTICAL)
- ewl_container_largest_prefer(parent, o);
- else
- ewl_object_preferred_inner_w_set(EWL_OBJECT(parent),
- PREFERRED_W(parent) + size);
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
void
ewl_menu_base_expand_cb(Ewl_Widget *w, void *ev_data, void *user_data)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_menu_base.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ewl_menu_base.h 23 Aug 2004 00:50:19 -0000 1.18
+++ ewl_menu_base.h 29 Aug 2004 02:47:39 -0000 1.19
@@ -28,7 +28,7 @@
*/
struct Ewl_Menu_Item
{
- Ewl_Container container; /**< Inherit from Ewl_Container */
+ Ewl_Box box; /**< Inherit from Ewl_Container */
Ewl_Widget *icon; /**< The image in this menu item */
Ewl_Widget *text; /**< The text label for this menu item */
Ewl_Widget *inmenu; /**< Set if inside a menu */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_password.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ewl_password.c 23 Aug 2004 00:18:59 -0000 1.9
+++ ewl_password.c 29 Aug 2004 02:47:39 -0000 1.10
@@ -91,7 +91,7 @@
memset(vis, e->obscure, len);
}
- ewl_entry_set_text(EWL_ENTRY(e), vis);
+ ewl_entry_text_set(EWL_ENTRY(e), vis);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -194,10 +194,10 @@
ev = ev_data;
if (!strcmp(ev->keyname, "BackSpace")) {
- tmp = ewl_entry_get_text(EWL_ENTRY(e));
+ tmp = ewl_entry_text_get(EWL_ENTRY(e));
if (tmp && (len = strlen(tmp))) {
tmp[len - 1] = '\0';
- ewl_entry_set_text(EWL_ENTRY(e), tmp);
+ ewl_entry_text_set(EWL_ENTRY(e), tmp);
e->real_text[len - 1] = '\0';
FREE(tmp);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_scrollbar.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- ewl_scrollbar.c 27 Aug 2004 05:59:44 -0000 1.36
+++ ewl_scrollbar.c 29 Aug 2004 02:47:39 -0000 1.37
@@ -2,11 +2,6 @@
#include <Ewl.h>
-void ewl_scrollbar_scroll_start_cb(Ewl_Widget * w, void *ev_data,
- void *user_data);
-void ewl_scrollbar_scroll_stop_cb(Ewl_Widget * w, void *ev_data,
- void *user_data);
-
static int ewl_scrollbar_timer(void *data);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_scrollbar.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ewl_scrollbar.h 18 Aug 2004 04:13:38 -0000 1.13
+++ ewl_scrollbar.h 29 Aug 2004 02:47:39 -0000 1.14
@@ -84,6 +84,14 @@
Ewl_ScrollBar_Flags f);
Ewl_ScrollBar_Flags ewl_scrollbar_flag_get(Ewl_Scrollbar * s);
+/*
+ * Internally used callbacks, override at your own risk.
+ */
+void ewl_scrollbar_scroll_start_cb(Ewl_Widget * w, void *ev_data,
+ void *user_data);
+void ewl_scrollbar_scroll_stop_cb(Ewl_Widget * w, void *ev_data,
+ void *user_data);
+
/**
* @}
*/
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_scrollpane.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- ewl_scrollpane.c 18 Aug 2004 04:13:38 -0000 1.46
+++ ewl_scrollpane.c 29 Aug 2004 02:47:39 -0000 1.47
@@ -297,20 +297,6 @@
content_h = CURRENT_H(w) - hs_height;
/*
- * Position the horizontal scrollbar.
- */
- ewl_object_geometry_request(EWL_OBJECT(s->hscrollbar),
- CURRENT_X(w), CURRENT_Y(w) + content_h,
- content_w, hs_height);
-
- /*
- * Position the vertical scrollbar.
- */
- ewl_object_geometry_request(EWL_OBJECT(s->vscrollbar),
- CURRENT_X(w) + content_w, CURRENT_Y(w),
- vs_width, content_h);
-
- /*
* A rare case where we need to know the preferred size over the
* minimum size.
*/
@@ -349,6 +335,20 @@
ewl_scrollbar_step_set(EWL_SCROLLBAR(s->vscrollbar), step);
/*
+ * Position the horizontal scrollbar.
+ */
+ ewl_object_geometry_request(EWL_OBJECT(s->hscrollbar),
+ CURRENT_X(w), CURRENT_Y(w) + content_h,
+ content_w, hs_height);
+
+ /*
+ * Position the vertical scrollbar.
+ */
+ ewl_object_geometry_request(EWL_OBJECT(s->vscrollbar),
+ CURRENT_X(w) + content_w, CURRENT_Y(w),
+ vs_width, content_h);
+
+ /*
* Now move the box into position. For the scrollpane to work we move
* the box relative to the scroll value.
*/
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_spinner.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- ewl_spinner.c 25 Aug 2004 15:36:22 -0000 1.59
+++ ewl_spinner.c 29 Aug 2004 02:47:39 -0000 1.60
@@ -400,21 +400,21 @@
else if (!strcmp(ev->keyname, "Down"))
ewl_spinner_decrease_value_cb(w, NULL, NULL);
else if (!strcmp(ev->keyname, "Left"))
- ewl_entry_move_cursor_to_left(e);
+ ewl_entry_cursor_left_move(e);
else if (!strcmp(ev->keyname, "Right"))
- ewl_entry_move_cursor_to_right(e);
+ ewl_entry_cursor_right_move(e);
else if (!strcmp(ev->keyname, "Home"))
- ewl_entry_move_cursor_to_home(e);
+ ewl_entry_cursor_home_move(e);
else if (!strcmp(ev->keyname, "End"))
- ewl_entry_move_cursor_to_end(e);
+ ewl_entry_cursor_end_move(e);
else if (!strcmp(ev->keyname, "BackSpace"))
- ewl_entry_delete_to_left(e);
+ ewl_entry_left_delete(e);
else if (!strcmp(ev->keyname, "Delete"))
- ewl_entry_delete_to_right(e);
+ ewl_entry_right_delete(e);
else if (ev->keyname && (isdigit(ev->keyname[0]) ||
ev->keyname[0] == '.' ||
ev->keyname[0] == '-'))
- ewl_entry_insert_text(e, ev->keyname);
+ ewl_entry_text_insert(e, ev->keyname);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -431,7 +431,7 @@
s = EWL_SPINNER(w->parent);
- str = ewl_entry_get_text(EWL_ENTRY(s->entry));
+ str = ewl_entry_text_get(EWL_ENTRY(s->entry));
if (str && strlen(str)) {
val = atof(str);
@@ -465,7 +465,7 @@
snprintf(format, 64, "%%.%df", s->digits);
snprintf(str, 64, format, s->value);
- ewl_entry_set_text(EWL_ENTRY(s->entry), str);
+ ewl_entry_text_set(EWL_ENTRY(s->entry), str);
if (oval != s->value) {
oval = s->value;
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
