Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_text.c ewl_text.h
Log Message:
- rename field as it conflicts with an Ewl_Widget field
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_text.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ewl_text.c 21 Aug 2005 06:08:53 -0000 1.19
+++ ewl_text.c 26 Aug 2005 21:56:23 -0000 1.20
@@ -135,7 +135,7 @@
t->selection =
EWL_TEXT_TRIGGER(ewl_text_trigger_new(EWL_TEXT_TRIGGER_TYPE_SELECTION));
ewl_text_trigger_start_pos_set(t->selection, 0);
ewl_text_trigger_length_set(t->selection, 0);
- t->selection->parent = t;
+ t->selection->text_parent = t;
ewl_callback_append(EWL_WIDGET(t->selection), EWL_CALLBACK_CONFIGURE,
ewl_text_selection_cb_configure, NULL);
ewl_container_child_append(EWL_CONTAINER(t), EWL_WIDGET(t->selection));
@@ -1915,7 +1915,7 @@
if (t->areas)
ecore_list_destroy(t->areas);
- t->parent = NULL;
+ t->text_parent = NULL;
t->areas = NULL;
FREE(t);
@@ -2417,7 +2417,7 @@
DRETURN(DLEVEL_STABLE);
}
- trigger->parent = t;
+ trigger->text_parent = t;
/* only need to check for overlappign if this is a trigger (not a
* selection) */
@@ -2472,7 +2472,7 @@
ecore_list_goto(t->triggers, trigger);
ecore_list_remove(t->triggers);
- trigger->parent = NULL;
+ trigger->text_parent = NULL;
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -4415,8 +4415,8 @@
trig = EWL_TEXT_TRIGGER(w);
- tb_length = evas_object_textblock_length_get(trig->parent->textblock);
- ewl_text_trigger_position(trig->parent, trig, tb_length, &cur_idx,
&cur_tb_idx);
+ tb_length =
evas_object_textblock_length_get(trig->text_parent->textblock);
+ ewl_text_trigger_position(trig->text_parent, trig, tb_length, &cur_idx,
&cur_tb_idx);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_text.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ewl_text.h 17 Aug 2005 16:52:57 -0000 1.10
+++ ewl_text.h 26 Aug 2005 21:56:23 -0000 1.11
@@ -192,7 +192,7 @@
unsigned int len; /**< Trigger length */
unsigned int base; /**< Used for the selection.
Start position */
- Ewl_Text *parent; /**< The parent text area */
+ Ewl_Text *text_parent; /**< The parent text area */
Ecore_List *areas; /**< The list of objects making
up the trigger */
};
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
